diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e5f9f3baf..48b66bc1d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -12,8 +12,8 @@ jobs: runs-on: windows-latest outputs: nbgv: ${{ steps.nbgv.outputs.SemVer2 }} - steps: - + steps: + - name: Checkout uses: actions/checkout@v6 with: @@ -29,6 +29,7 @@ jobs: 8.0.x 9.0.x 10.0.x + global-json-file: global.json cache: true cache-dependency-path: | **/Directory.Packages.props @@ -54,13 +55,13 @@ jobs: - name: NuGet Restore run: dotnet restore DynamicData.sln working-directory: src - + - name: Build run: dotnet build --no-restore --configuration Release DynamicData.sln working-directory: src - name: Run Tests - run: dotnet test --no-restore --configuration Release DynamicData.sln + run: dotnet test --solution DynamicData.sln --no-build --configuration Release --max-parallel-test-modules 4 --maximum-parallel-tests 8 working-directory: src - name: Pack diff --git a/.github/workflows/pr-test-coverage.yml b/.github/workflows/pr-test-coverage.yml index 264c31fa0..778b1d6d9 100644 --- a/.github/workflows/pr-test-coverage.yml +++ b/.github/workflows/pr-test-coverage.yml @@ -13,7 +13,7 @@ jobs: matrix: configuration: [Release] # future support for more coverage - runs-on: windows-latest + runs-on: windows-latest if: github.event.workflow_run.conclusion == 'success' steps: - name: Checkout @@ -32,10 +32,13 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: | + dotnet-version: | 6.0.x 7.0.x 8.0.x + 9.0.x + 10.0.x + global-json-file: global.json - name: Cache SonarCloud packages uses: actions/cache@v5 @@ -54,11 +57,21 @@ jobs: - name: Run coverage tests run: | - dotnet sonarscanner begin /k:"reactivemarbles_DynamicData" /o:"reactivemarbles" /d:sonar.token="${{ env.SONAR_TOKEN }}" /d:sonar.cs.opencover.reportsPaths=./**/coverage.opencover.xml /d:sonar.host.url="https://sonarcloud.io" + dotnet sonarscanner begin /k:"reactivemarbles_DynamicData" /o:"reactivemarbles" /d:sonar.token="${{ env.SONAR_TOKEN }}" /d:sonar.cs.vscoveragexml.reportsPaths=./TestResults/coverage/*.xml /d:sonar.host.url="https://sonarcloud.io" + if ($LASTEXITCODE -ne 0) { throw "Sonar scanner initialization failed." } dotnet build --no-restore --no-incremental --configuration ${{ matrix.configuration }} -p:ContinuousIntegrationBuild=false DynamicData.sln - dotnet test --no-build --configuration ${{ matrix.configuration }} --collect:"XPlat Code Coverage" --settings coverlet.xml + if ($LASTEXITCODE -ne 0) { throw "Coverage build failed." } + dotnet test --solution DynamicData.sln --no-build --configuration ${{ matrix.configuration }} --max-parallel-test-modules 4 --maximum-parallel-tests 8 --coverage --coverage-settings coverage.config --coverage-output-format xml --results-directory TestResults/coverage + if ($LASTEXITCODE -ne 0) { throw "Coverage tests failed." } dotnet sonarscanner end /d:sonar.token="${{ env.SONAR_TOKEN }}" env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} working-directory: src + + - name: Upload coverage reports + if: always() + uses: actions/upload-artifact@v4.6.2 + with: + name: coverage + path: src/TestResults/coverage/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50f8371d1..757d23324 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: outputs: nbgv: ${{ steps.nbgv.outputs.SemVer2 }} steps: - + - name: Checkout uses: actions/checkout@v6 with: @@ -48,6 +48,7 @@ jobs: 8.0.x 9.0.x 10.0.x + global-json-file: global.json cache: true cache-dependency-path: | **/Directory.Packages.props @@ -113,7 +114,7 @@ jobs: working-directory: src - name: Run Tests - run: dotnet test --no-restore --configuration Release DynamicData.sln + run: dotnet test --solution DynamicData.sln --no-restore --configuration Release working-directory: src - name: Pack diff --git a/.gitignore b/.gitignore index cc0cf38bc..d4768f880 100644 --- a/.gitignore +++ b/.gitignore @@ -369,3 +369,5 @@ src/*.Tests/API/ApiApprovalTests.*.received.txt # JetBrains .idea/ + +.dotnet-home/ \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..19b6f3396 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,43 @@ +# Building and testing + +Install the .NET SDK version recorded in `global.json`. This branch uses .NET 11 +RC1 (`11.0.100-rc.1.26425.128`) for local builds and CI. The SDK selection is +exact so an installed preview or a newer SDK cannot silently change the build. +`allowPrerelease` must be enabled because .NET classifies release candidates as +prerelease SDKs; the version pin selects the RC explicitly. + +From the repository root: + +```powershell +dotnet restore src/DynamicData.sln +dotnet build src/DynamicData.sln --configuration Release --no-restore +dotnet test --solution src/DynamicData.sln --configuration Release --no-build +``` + +`DynamicData` is the lean ReactiveUI.Primitives package. `DynamicData.Reactive` +compiles the shared sources with `REACTIVE_SHIM` and preserves the System.Reactive +API conventions. Changes to shared operators must preserve both variants. + +Tests use TUnit and Microsoft.Testing.Platform. Use native, awaited TUnit assertions +and virtual time or explicit synchronization for asynchronous behavior. Collect +coverage for the shipping assemblies, including their auto-properties, with: + +```powershell +dotnet test --solution src/DynamicData.sln --configuration Release --no-build --coverage --coverage-settings src/coverage.config --coverage-output-format cobertura +``` + +The coverage configuration selects the two shipping assemblies. It does not +exclude obsolete operators or uncovered source files. + +Performance changes should include a benchmark for the affected operation and +regression tests covering observable values, completion, errors, and disposal. +Run the cache snapshot comparison with: + +```powershell +dotnet run --project src/DynamicData.Benchmarks --configuration Release -- --filter '*ToCollection*' +``` + +Public API tests compare generated signatures against the framework-specific files +in `src/DynamicData.Tests/API`. A mismatch writes a `.received.txt` file next to the +reviewed `.verified.txt` baseline. Review the API diff before updating a baseline; +do not accept generated changes just to make the test pass. diff --git a/NonProduction/DynamicData.Profile/DynamicData.Profile.csproj b/NonProduction/DynamicData.Profile/DynamicData.Profile.csproj index 504b3165c..8e7cb5536 100644 --- a/NonProduction/DynamicData.Profile/DynamicData.Profile.csproj +++ b/NonProduction/DynamicData.Profile/DynamicData.Profile.csproj @@ -14,7 +14,6 @@ - diff --git a/README.md b/README.md index 3b916a7da..7ca2a8e10 100644 --- a/README.md +++ b/README.md @@ -313,9 +313,17 @@ var myPeopleObservable = myPeople.Connect(); var countObservable = myPeopleObservable.Count(); var maxObservable = myPeopleObservable.Max(p => p.Age); var minObservable = myPeopleObservable.Min(p => p.Age); -var stdDevObservable = myPeopleObservable.StdDev(p => p.Age); +var stdDevObservable = myPeopleObservable.StdDev(p => p.Age, 0); var avgObservable = myPeopleObservable.Avg(p => p.Age); ``` +`StdDev` computes the sample standard deviation: `sqrt(M2 / (count - 1))`, +where `M2` is the sum of squared differences from the mean. For example, values +`2, 4, 6` produce `2`. It returns the supplied fallback when fewer than two +values remain. This corrects the earlier formula, which divided by `count - 1` +after taking the square root. Integral and decimal selectors use decimal +accumulators, whose central moments must fit in the decimal range; floating-point +selectors retain double-precision rounding limits. + More aggregating operators will be added soon. #### Logical Operators diff --git a/global.json b/global.json new file mode 100644 index 000000000..13c274d29 --- /dev/null +++ b/global.json @@ -0,0 +1,10 @@ +{ + "sdk": { + "version": "11.0.100-rc.1.26425.128", + "rollForward": "disable", + "allowPrerelease": true + }, + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7d002a3bb..94c96f6a6 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ true - $(NoWarn);1591;1701;1702;1705;VSX1000;CA1510 + $(NoWarn);1701;1702;1705;VSX1000;CA1510 AnyCPU enable latest @@ -22,14 +22,15 @@ logo.png README.md true - + - true + true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - CS8600;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8623;CS8624;CS8625;CS8626;CS8627;CS8628;CS8629;CS8630;CS8634;CS8766;CS8767 + CS8600;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8623;CS8624;CS8625;CS8626;CS8627;CS8628;CS8629;CS8630;CS8634;CS8766;CS8767 + enable @@ -38,33 +39,54 @@ false + false + + $(WarningsAsErrors);CS4014;CS8785;TUnit0030 + + + + $(MSBuildThisFileDirectory) + + + + + true + true + true + + + + $(Features);runtime-async=on + + - + - - - $(MSBuildThisFileDirectory) - - - - - - + + + - - + + + + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index d341fbbbd..0a63b1424 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -6,7 +6,7 @@ - $([System.Text.RegularExpressions.Regex]::Replace(%(Filename), '\.[^\.]+$', '.cs')) + $([System.Text.RegularExpressions.Regex]::Replace('%(Filename)', '\.[^\.]+$', '.cs')) @@ -14,11 +14,18 @@ $(DefineConstants);P_LINQ;SUPPORTS_BINDINGLIST - - $(DefineConstants);NETSTANDARD;P_LINQ;SUPPORTS_BINDINGLIST;SUPPORTS_ASYNC_DISPOSABLE + + $(DefineConstants);NETSTANDARD;P_LINQ;SUPPORTS_BINDINGLIST;SUPPORTS_ASYNC_DISPOSABLE;SUPPORTS_DICTIONARY_MUTATION_DURING_ENUMERATION - - $(DefineConstants);SUPPORTS_DICTIONARY_MUTATION_DURING_ENUMERATION - + + + + + + diff --git a/src/DynamicData.Benchmarks/Cache/DeliveryQueueBenchmarks.cs b/src/DynamicData.Benchmarks/Cache/DeliveryQueueBenchmarks.cs index f5e397006..35795043a 100644 --- a/src/DynamicData.Benchmarks/Cache/DeliveryQueueBenchmarks.cs +++ b/src/DynamicData.Benchmarks/Cache/DeliveryQueueBenchmarks.cs @@ -2,16 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Threading; -using System.Threading.Tasks; - -using BenchmarkDotNet.Attributes; - -using DynamicData.Binding; - namespace DynamicData.Benchmarks.Cache; /// diff --git a/src/DynamicData.Benchmarks/Cache/DisposeMany_Cache.cs b/src/DynamicData.Benchmarks/Cache/DisposeMany_Cache.cs index 1e4f83e65..fc1b34c15 100644 --- a/src/DynamicData.Benchmarks/Cache/DisposeMany_Cache.cs +++ b/src/DynamicData.Benchmarks/Cache/DisposeMany_Cache.cs @@ -2,10 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.Cache { [MemoryDiagnoser] diff --git a/src/DynamicData.Benchmarks/Cache/EditDiff.cs b/src/DynamicData.Benchmarks/Cache/EditDiff.cs index a6b4fd53d..a3f408df8 100644 --- a/src/DynamicData.Benchmarks/Cache/EditDiff.cs +++ b/src/DynamicData.Benchmarks/Cache/EditDiff.cs @@ -1,12 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; - -using BenchmarkDotNet.Attributes; - -using DynamicData.Kernel; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -49,7 +40,7 @@ public void OptionalAddsAndRemoves(int maxItems) .Range(0, MaxItems) .Select(n => (n % 2) == 0 ? new Person(n, "Name") - : Optional.None()) + : Optional.None) .ToObservable() .EditDiff(p => p.Id) .Subscribe(); diff --git a/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForSource.cs b/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForSource.cs index 3c437f89f..ff3e3699f 100644 --- a/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForSource.cs +++ b/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForSource.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Immutable; -using System.Linq; - -using BenchmarkDotNet.Attributes; - -using Bogus; +using Bogus; namespace DynamicData.Benchmarks.Cache; diff --git a/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForStream.cs b/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForStream.cs index a13cefbf0..f7703de96 100644 --- a/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForStream.cs +++ b/src/DynamicData.Benchmarks/Cache/ExpireAfter_Cache_ForStream.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Immutable; -using System.Linq; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - using Bogus; namespace DynamicData.Benchmarks.Cache; @@ -113,7 +106,7 @@ public ExpireAfter_Cache_ForStream() [Benchmark] public void RandomizedEditsAndExpirations() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .ExpireAfter( diff --git a/src/DynamicData.Benchmarks/Cache/FilterImmutable.cs b/src/DynamicData.Benchmarks/Cache/FilterImmutable.cs index 6bde5da17..1faf82f25 100644 --- a/src/DynamicData.Benchmarks/Cache/FilterImmutable.cs +++ b/src/DynamicData.Benchmarks/Cache/FilterImmutable.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -58,7 +52,7 @@ public FilterImmutable() [Benchmark] public void Adds() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .FilterImmutable(static item => item.IsIncluded) @@ -73,7 +67,7 @@ public void Adds() [Benchmark] public void AddsAndReplacements() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .FilterImmutable(static item => item.IsIncluded) @@ -91,7 +85,7 @@ public void AddsAndReplacements() [Benchmark] public void AddsAndRemoves() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .FilterImmutable(static item => item.IsIncluded) @@ -109,7 +103,7 @@ public void AddsAndRemoves() [Benchmark] public void AddsReplacementsAndRemoves() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .FilterImmutable(static item => item.IsIncluded) diff --git a/src/DynamicData.Benchmarks/Cache/Filter_Cache_WithPredicateState.cs b/src/DynamicData.Benchmarks/Cache/Filter_Cache_WithPredicateState.cs index 0404b7c54..e5bc6797e 100644 --- a/src/DynamicData.Benchmarks/Cache/Filter_Cache_WithPredicateState.cs +++ b/src/DynamicData.Benchmarks/Cache/Filter_Cache_WithPredicateState.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Immutable; -using System.Linq; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - using Bogus; namespace DynamicData.Benchmarks.Cache; @@ -99,7 +92,6 @@ public Filter_Cache_WithPredicateState() } _changeSets = changeSets.MoveToImmutable(); - var predicateStates = ImmutableArray.CreateBuilder(initialCapacity: 5_000); while (predicateStates.Count < predicateStates.Capacity) predicateStates.Add(randomizer.Int()); @@ -109,8 +101,8 @@ public Filter_Cache_WithPredicateState() [Benchmark(Baseline = true)] public void RandomizedEditsAndStateChanges() { - using var source = new Subject>(); - using var predicateState = new Subject(); + using var source = new Signal>(); + using var predicateState = new Signal(); using var subscription = source .Filter( diff --git a/src/DynamicData.Benchmarks/Cache/SortAndBindChange.cs b/src/DynamicData.Benchmarks/Cache/SortAndBindChange.cs index 484e544e1..cbf4340bb 100644 --- a/src/DynamicData.Benchmarks/Cache/SortAndBindChange.cs +++ b/src/DynamicData.Benchmarks/Cache/SortAndBindChange.cs @@ -1,11 +1,3 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Subjects; -using BenchmarkDotNet.Attributes; -using DynamicData.Binding; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -19,11 +11,10 @@ private record Item(string Name, int Id, int Ranking); .Ascending(i => i.Ranking) .ThenByAscending(i => i.Name); - - Subject> _newSubject = new(); - Subject> _newSubjectOptimised = new(); - Subject> _oldSubject = new(); - Subject> _oldSubjectOptimised = new(); + Signal> _newSubject = new(); + Signal> _newSubjectOptimised = new(); + Signal> _oldSubject = new(); + Signal> _oldSubjectOptimised = new(); private IDisposable? _cleanUp; @@ -32,22 +23,18 @@ private record Item(string Name, int Id, int Ranking); private ReadOnlyObservableCollection? _oldList; private ReadOnlyObservableCollection? _oldListOptimised; - - [Params(10, 100, 1_000, 10_000, 50_000)] public int Count { get; set; } - [GlobalSetup] public void SetUp() { - _oldSubject = new Subject>(); - _oldSubjectOptimised = new Subject>(); - _newSubject = new Subject>(); - _newSubjectOptimised = new Subject>(); - + _oldSubject = new Signal>(); + _oldSubjectOptimised = new Signal>(); + _newSubject = new Signal>(); + _newSubjectOptimised = new Signal>(); - _cleanUp = new CompositeDisposable + _cleanUp = new CompositeDisposable ( _newSubject.SortAndBind(out var newList, _comparer).Subscribe(), _newSubjectOptimised.SortAndBind(out var optimisedList, _comparer, new SortAndBindOptions @@ -65,8 +52,6 @@ public void SetUp() _oldList = oldList; _oldListOptimised = oldOptimisedList; - - var changeSet = new ChangeSet(Count); foreach (var i in Enumerable.Range(1, Count)) { @@ -84,7 +69,6 @@ public void SetUp() [Benchmark(Baseline = true)] public void Old() => RunTest(_oldSubject, _oldList!); - [Benchmark] public void OldOptimized() => RunTest(_oldSubjectOptimised, _oldListOptimised!); @@ -94,8 +78,7 @@ public void SetUp() [Benchmark] public void NewOptimized() => RunTest(_newSubjectOptimised, _newListOptimised!); - - void RunTest(Subject> subject, ReadOnlyObservableCollection list) + void RunTest(Signal> subject, ReadOnlyObservableCollection list) { var original = list[Count / 2]; var updated = original with { Ranking = _random.Next(1, 1000) }; @@ -106,6 +89,5 @@ void RunTest(Subject> subject, ReadOnlyObservableCollectio }); } - public void Dispose() => _cleanUp?.Dispose(); -} \ No newline at end of file +} diff --git a/src/DynamicData.Benchmarks/Cache/SortAndBindInitial.cs b/src/DynamicData.Benchmarks/Cache/SortAndBindInitial.cs index a27b082bd..8d13605c0 100644 --- a/src/DynamicData.Benchmarks/Cache/SortAndBindInitial.cs +++ b/src/DynamicData.Benchmarks/Cache/SortAndBindInitial.cs @@ -1,10 +1,3 @@ -using BenchmarkDotNet.Attributes; -using System; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Subjects; -using DynamicData.Binding; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -17,27 +10,24 @@ private record Item(string Name, int Id, int Ranking); private readonly SortExpressionComparer _comparer = SortExpressionComparer.Ascending(i => i.Ranking).ThenByAscending(i => i.Name); - - Subject> _newSubject = new(); - Subject> _newSubjectOptimised = new(); - Subject> _oldSubject = new(); - Subject> _oldSubjectOptimised = new(); + Signal> _newSubject = new(); + Signal> _newSubjectOptimised = new(); + Signal> _oldSubject = new(); + Signal> _oldSubjectOptimised = new(); private IDisposable? _cleanUp; private ChangeSet? _changeSet; - [Params(10, 100, 1_000, 10_000, 50_000)] public int Count { get; set; } - [GlobalSetup] public void SetUp() { - _oldSubject = new Subject>(); - _oldSubjectOptimised = new Subject>(); - _newSubject = new Subject>(); - _newSubjectOptimised = new Subject>(); + _oldSubject = new Signal>(); + _oldSubjectOptimised = new Signal>(); + _newSubject = new Signal>(); + _newSubjectOptimised = new Signal>(); var changeSet = new ChangeSet(Count); foreach (var i in Enumerable.Range(1, Count)) @@ -63,7 +53,6 @@ public void SetUp() ); } - [Benchmark(Baseline = true)] public void Old() => _oldSubject.OnNext(_changeSet!); @@ -76,6 +65,5 @@ public void SetUp() [Benchmark] public void NewOptimized() => _newSubjectOptimised.OnNext(_changeSet!); - public void Dispose() => _cleanUp?.Dispose(); -} \ No newline at end of file +} diff --git a/src/DynamicData.Benchmarks/Cache/SourceCache.cs b/src/DynamicData.Benchmarks/Cache/SourceCache.cs index f2157221d..567f88803 100644 --- a/src/DynamicData.Benchmarks/Cache/SourceCache.cs +++ b/src/DynamicData.Benchmarks/Cache/SourceCache.cs @@ -2,11 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Linq; - -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Jobs; - namespace DynamicData.Benchmarks.Cache { public class BenchmarkItem diff --git a/src/DynamicData.Benchmarks/Cache/StatelessFiltering.cs b/src/DynamicData.Benchmarks/Cache/StatelessFiltering.cs index b4a806afb..34161c08f 100644 --- a/src/DynamicData.Benchmarks/Cache/StatelessFiltering.cs +++ b/src/DynamicData.Benchmarks/Cache/StatelessFiltering.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -53,7 +47,7 @@ public StatelessFiltering() [Benchmark(Baseline = true)] public void Filter() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .Filter(static item => item.IsIncluded) @@ -67,7 +61,7 @@ public void Filter() [Benchmark] public void FilterImmutable() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .FilterImmutable(static item => item.IsIncluded) diff --git a/src/DynamicData.Benchmarks/Cache/StatelessTransforming.cs b/src/DynamicData.Benchmarks/Cache/StatelessTransforming.cs index 9328dd956..a0179332e 100644 --- a/src/DynamicData.Benchmarks/Cache/StatelessTransforming.cs +++ b/src/DynamicData.Benchmarks/Cache/StatelessTransforming.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -54,7 +47,7 @@ public StatelessTransforming() [Benchmark(Baseline = true)] public void Transform() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .Transform(static item => item.Name) @@ -68,7 +61,7 @@ public void Transform() [Benchmark] public void TransformImmutable() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .TransformImmutable(static item => item.Name) diff --git a/src/DynamicData.Benchmarks/Cache/Sum_Cache.cs b/src/DynamicData.Benchmarks/Cache/Sum_Cache.cs index 008192d9b..d0ada2daf 100644 --- a/src/DynamicData.Benchmarks/Cache/Sum_Cache.cs +++ b/src/DynamicData.Benchmarks/Cache/Sum_Cache.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Reactive.Subjects; using BenchmarkDotNet.Attributes; @@ -110,7 +109,7 @@ private static IChangeSet BuildSeed(Item[] items) private static void Run(IChangeSet? seed, IReadOnlyList> changeSets) { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .Sum(static item => item.Value) diff --git a/src/DynamicData.Benchmarks/Cache/ToCollection.cs b/src/DynamicData.Benchmarks/Cache/ToCollection.cs new file mode 100644 index 000000000..bddb23b0b --- /dev/null +++ b/src/DynamicData.Benchmarks/Cache/ToCollection.cs @@ -0,0 +1,58 @@ +// Copyright (c) 2011-2026 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +using DynamicData.Kernel; + +namespace DynamicData.Benchmarks.Cache; + +[MemoryDiagnoser] +public class ToCollection +{ + private IChangeSet[] _changes = null!; + + [Params(1, 100)] + public int Count { get; set; } + + [GlobalSetup] + public void Setup() + { + var cache = new ChangeAwareCache(); + _changes = new IChangeSet[Count]; + for (var i = 0; i < Count; i++) + { + cache.AddOrUpdate(i, i); + _changes[i] = cache.CaptureChanges(); + } + } + + [Benchmark(Baseline = true)] + public int QueryProjection() + { + using var source = new Signal>(); + var count = 0; + using var subscription = source + .QueryWhenChanged(query => new ReadOnlyCollectionLight(query.Items)) + .Subscribe(items => count += items.Count); + foreach (var change in _changes) + { + source.OnNext(change); + } + + return count; + } + + [Benchmark] + public int DirectSnapshot() + { + using var source = new Signal>(); + var count = 0; + using var subscription = source.ToCollection().Subscribe(items => count += items.Count); + foreach (var change in _changes) + { + source.OnNext(change); + } + + return count; + } +} diff --git a/src/DynamicData.Benchmarks/Cache/ToObservableChangeSet_Cache.cs b/src/DynamicData.Benchmarks/Cache/ToObservableChangeSet_Cache.cs index eca407d03..d90164cf7 100644 --- a/src/DynamicData.Benchmarks/Cache/ToObservableChangeSet_Cache.cs +++ b/src/DynamicData.Benchmarks/Cache/ToObservableChangeSet_Cache.cs @@ -1,11 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Columns; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -51,7 +43,7 @@ static ToObservableChangeSet_Cache() [Arguments(1_000, 1_000)] public void AddsUpdatesAndFinalization(int itemCount, int sizeLimit) { - using var source = new Subject(); + using var source = new Signal(); using var subscription = source .ToObservableChangeSet( diff --git a/src/DynamicData.Benchmarks/Cache/TransformImmutable.cs b/src/DynamicData.Benchmarks/Cache/TransformImmutable.cs index 3bbd28d8f..d6d6a29b7 100644 --- a/src/DynamicData.Benchmarks/Cache/TransformImmutable.cs +++ b/src/DynamicData.Benchmarks/Cache/TransformImmutable.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] @@ -59,7 +52,7 @@ public TransformImmutable() [Benchmark] public void Adds() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .TransformImmutable(static item => item.Name) @@ -74,7 +67,7 @@ public void Adds() [Benchmark] public void AddsAndReplacements() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .TransformImmutable(static item => item.Name) @@ -92,7 +85,7 @@ public void AddsAndReplacements() [Benchmark] public void AddsAndRemoves() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .TransformImmutable(static item => item.Name) @@ -110,7 +103,7 @@ public void AddsAndRemoves() [Benchmark] public void AddsReplacementsAndRemoves() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .TransformImmutable(static item => item.Name) diff --git a/src/DynamicData.Benchmarks/Cache/TransformMany.cs b/src/DynamicData.Benchmarks/Cache/TransformMany.cs index 5b91eaa41..5de8d8524 100644 --- a/src/DynamicData.Benchmarks/Cache/TransformMany.cs +++ b/src/DynamicData.Benchmarks/Cache/TransformMany.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.Cache; [MemoryDiagnoser] diff --git a/src/DynamicData.Benchmarks/DynamicData.Benchmarks.csproj b/src/DynamicData.Benchmarks/DynamicData.Benchmarks.csproj index 451ac4697..9a3ad1e6a 100644 --- a/src/DynamicData.Benchmarks/DynamicData.Benchmarks.csproj +++ b/src/DynamicData.Benchmarks/DynamicData.Benchmarks.csproj @@ -1,28 +1,46 @@ - + - - Exe - net9.0 - AnyCPU - false - ;1591;1701;1702;1705;CA1822;CA1001 - + + Exe + net10.0 + AnyCPU + false + ;1701;1702;1705;CA1822;CA1001 + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/DynamicData.Benchmarks/List/DisposeMany_List.cs b/src/DynamicData.Benchmarks/List/DisposeMany_List.cs index 53cbe5d5e..100d8dbf6 100644 --- a/src/DynamicData.Benchmarks/List/DisposeMany_List.cs +++ b/src/DynamicData.Benchmarks/List/DisposeMany_List.cs @@ -1,12 +1,7 @@ -// Copyright (c) 2011-2019 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2019 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Reactive.Disposables; - -using BenchmarkDotNet.Attributes; - namespace DynamicData.Benchmarks.List { [MemoryDiagnoser] diff --git a/src/DynamicData.Benchmarks/List/ExpireAfter_List.cs b/src/DynamicData.Benchmarks/List/ExpireAfter_List.cs index ec9a39316..1a68f00d4 100644 --- a/src/DynamicData.Benchmarks/List/ExpireAfter_List.cs +++ b/src/DynamicData.Benchmarks/List/ExpireAfter_List.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Immutable; -using System.Linq; - -using BenchmarkDotNet.Attributes; - -using Bogus; +using Bogus; namespace DynamicData.Benchmarks.List; diff --git a/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedBoundedEdits.cs b/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedBoundedEdits.cs index 6e4ab39ee..d20b7bb30 100644 --- a/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedBoundedEdits.cs +++ b/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedBoundedEdits.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Linq; -using System.Reactive.Subjects; using System.Reflection; -using BenchmarkDotNet.Attributes; using Bogus; @@ -44,7 +38,7 @@ public Filter_List_Static_RandomizedBoundedEdits() [Benchmark(Baseline = true)] public void CurrentImplementation() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .Filter(Item.FilterByIsIncluded) diff --git a/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedUnboundedEdits.cs b/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedUnboundedEdits.cs index e9065ef17..8691e2d22 100644 --- a/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedUnboundedEdits.cs +++ b/src/DynamicData.Benchmarks/List/Filter_List_Static_RandomizedUnboundedEdits.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Linq; -using System.Reactive.Subjects; using System.Reflection; -using BenchmarkDotNet.Attributes; using Bogus; @@ -42,7 +36,7 @@ public Filter_List_Static_RandomizedUnboundedEdits() [Benchmark(Baseline = true)] public void CurrentImplementation() { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .Filter(Item.FilterByIsIncluded) diff --git a/src/DynamicData.Benchmarks/List/Filter_List_WithPredicateState.cs b/src/DynamicData.Benchmarks/List/Filter_List_WithPredicateState.cs index 3707767be..846e20006 100644 --- a/src/DynamicData.Benchmarks/List/Filter_List_WithPredicateState.cs +++ b/src/DynamicData.Benchmarks/List/Filter_List_WithPredicateState.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Immutable; -using System.Linq; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; - using Bogus; namespace DynamicData.Benchmarks.List; @@ -34,8 +27,8 @@ public Filter_List_WithPredicateState() [Benchmark(Baseline = true)] public void RandomizedEditsAndStateChanges() { - using var source = new Subject>(); - using var predicateState = new Subject(); + using var source = new Signal>(); + using var predicateState = new Signal(); using var subscription = source .Filter( diff --git a/src/DynamicData.Benchmarks/List/GroupAdd.cs b/src/DynamicData.Benchmarks/List/GroupAdd.cs index 92572496e..0037925eb 100644 --- a/src/DynamicData.Benchmarks/List/GroupAdd.cs +++ b/src/DynamicData.Benchmarks/List/GroupAdd.cs @@ -2,12 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Linq; - -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Jobs; - namespace DynamicData.Benchmarks.List { [SimpleJob(RuntimeMoniker.NetCoreApp31)] diff --git a/src/DynamicData.Benchmarks/List/GroupRemove.cs b/src/DynamicData.Benchmarks/List/GroupRemove.cs index d4ba95e05..dee140d07 100644 --- a/src/DynamicData.Benchmarks/List/GroupRemove.cs +++ b/src/DynamicData.Benchmarks/List/GroupRemove.cs @@ -2,12 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Linq; - -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Jobs; - namespace DynamicData.Benchmarks.List { [SimpleJob(RuntimeMoniker.NetCoreApp31)] diff --git a/src/DynamicData.Benchmarks/List/SourceList.cs b/src/DynamicData.Benchmarks/List/SourceList.cs index 6556d6ecf..1c29970e5 100644 --- a/src/DynamicData.Benchmarks/List/SourceList.cs +++ b/src/DynamicData.Benchmarks/List/SourceList.cs @@ -2,11 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Linq; - -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Jobs; - namespace DynamicData.Benchmarks.List { [SimpleJob(RuntimeMoniker.NetCoreApp31)] diff --git a/src/DynamicData.Benchmarks/List/Sum_List.cs b/src/DynamicData.Benchmarks/List/Sum_List.cs index 87a90c97e..fd7ba6359 100644 --- a/src/DynamicData.Benchmarks/List/Sum_List.cs +++ b/src/DynamicData.Benchmarks/List/Sum_List.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Reactive.Subjects; using BenchmarkDotNet.Attributes; @@ -107,7 +106,7 @@ private static IChangeSet BuildSeed(Item[] items) private static void Run(IChangeSet? seed, IReadOnlyList> changeSets) { - using var source = new Subject>(); + using var source = new Signal>(); using var subscription = source .Sum(static item => item.Value) diff --git a/src/DynamicData.Benchmarks/List/ToObservableChangeSet_List.cs b/src/DynamicData.Benchmarks/List/ToObservableChangeSet_List.cs index 0908c20f9..799ed91d4 100644 --- a/src/DynamicData.Benchmarks/List/ToObservableChangeSet_List.cs +++ b/src/DynamicData.Benchmarks/List/ToObservableChangeSet_List.cs @@ -1,9 +1,3 @@ -using System; -using System.Reactive.Subjects; - -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Columns; - namespace DynamicData.Benchmarks.List; [MemoryDiagnoser] @@ -30,7 +24,7 @@ public class ToObservableChangeSet_List [Arguments(1_000, 1_000)] public void AddsUpdatesAndFinalization(int itemCount, int sizeLimit) { - using var source = new Subject(); + using var source = new Signal(); using var subscription = source .ToObservableChangeSet(limitSizeTo: sizeLimit) diff --git a/src/DynamicData.Benchmarks/Program.cs b/src/DynamicData.Benchmarks/Program.cs index 5bf5d888f..225fd0ee2 100644 --- a/src/DynamicData.Benchmarks/Program.cs +++ b/src/DynamicData.Benchmarks/Program.cs @@ -2,7 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.IO; using System.Runtime.CompilerServices; using BenchmarkDotNet.Configs; diff --git a/src/DynamicData.Reactive.Tests/DynamicData.Reactive.Tests.csproj b/src/DynamicData.Reactive.Tests/DynamicData.Reactive.Tests.csproj new file mode 100644 index 000000000..fd8e95f88 --- /dev/null +++ b/src/DynamicData.Reactive.Tests/DynamicData.Reactive.Tests.csproj @@ -0,0 +1,54 @@ + + + Exe + net10.0;net11.0 + $(DefineConstants);REACTIVE_TESTS + $(NoWarn);CS0618;CA1801;CA1812;CA1816;CA1062;CA1063;CS8767;CS8602;CS8618;IDE1006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/DynamicData.Reactive/DynamicData.Reactive.csproj b/src/DynamicData.Reactive/DynamicData.Reactive.csproj new file mode 100644 index 000000000..30fc1b1f0 --- /dev/null +++ b/src/DynamicData.Reactive/DynamicData.Reactive.csproj @@ -0,0 +1,64 @@ + + + + Dynamic Data + + Bring the power of Rx to collections using Dynamic Data. + Dynamic Data is a comprehensive caching and data manipulation solution which introduces domain centric observable collections. + Linq extensions enable dynamic filtering, sorting, grouping, transforms, binding, pagination, data virtualisation, expiration, disposal management plus more. + + net462;net472;net48;net481;net8.0;net9.0;net10.0;net11.0 + true + $(DefineConstants);REACTIVE_SHIM + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ObservableCacheEx.cs + + + + + + + + + + + + + + + + + + diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataReactiveTests.DotNet10_0.verified.txt b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataReactiveTests.DotNet10_0.verified.txt new file mode 100644 index 000000000..7cd598b70 --- /dev/null +++ b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataReactiveTests.DotNet10_0.verified.txt @@ -0,0 +1,3079 @@ +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Benchmarks")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Reactive.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")] +namespace DynamicData.Reactive.Aggregation +{ + public readonly struct AggregateItem : System.IEquatable> + { + public AggregateItem(DynamicData.Reactive.Aggregation.AggregateType Type, TObject Item) { } + public TObject Item { get; init; } + public DynamicData.Reactive.Aggregation.AggregateType Type { get; init; } + public override int GetHashCode() { } + } + public enum AggregateType + { + Add = 0, + Remove = 1, + } + public static class AggregationEx + { + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + } + public static class AvgEx + { + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + } + public static class CountEx + { + public static System.IObservable Count(this System.IObservable> source) { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + } + public interface IAggregateChangeSet : System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable { } + public static class MaxEx + { + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + } + public static class StdDevEx + { + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal fallbackValue) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where TObject : notnull + where TKey : notnull { } + } + public static class SumEx + { + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Reactive.Alias +{ + public static class ObservableCacheAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> SelectTree(this System.IObservable> source, System.Func pivotOn) + where TObject : class + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func filter) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicate) + where T : notnull { } + } +} +namespace DynamicData.Reactive.Binding +{ + public abstract class AbstractNotifyPropertyChanged : System.ComponentModel.INotifyPropertyChanged + { + protected AbstractNotifyPropertyChanged() { } + public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; + protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, System.Collections.Generic.IEqualityComparer? comparer, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T> : DynamicData.Reactive.IChangeSetAdaptor + where T : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.Reactive.IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes) { } + } + public static class BindingListEx + { + public static System.IObservable> ObserveCollectionChanges(this System.ComponentModel.IBindingList source) { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.ComponentModel.BindingList source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.ComponentModel.IBindingList, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.ComponentModel.BindingList source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public struct BindingOptions : System.IEquatable + { + public const bool DefaultResetOnFirstTimeLoad = true; + public const int DefaultResetThreshold = 25; + public const bool DefaultUseReplaceForUpdates = true; + public BindingOptions(int ResetThreshold, bool UseReplaceForUpdates = true, bool ResetOnFirstTimeLoad = true) { } + public bool ResetOnFirstTimeLoad { get; set; } + public int ResetThreshold { get; set; } + public bool UseReplaceForUpdates { get; set; } + public static DynamicData.Reactive.Binding.BindingOptions NeverFireReset(bool useReplaceForUpdates = true) { } + } + public interface IEvaluateAware + { + void Evaluate(); + } + public interface IIndexAware + { + int Index { get; set; } + } + public interface INotifyCollectionChangedSuspender + { + System.IDisposable SuspendCount(); + System.IDisposable SuspendNotifications(); + } + public interface IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.IChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection); + } + public interface IObservableCollection : DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + void Load(System.Collections.Generic.IEnumerable items); + void Move(int oldIndex, int newIndex); + } + public static class IObservableListEx + { + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.Reactive.IObservableList observableList) + where TObject : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.Reactive.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.Reactive.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + } + public interface ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.ISortedChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection); + } + public static class NotifyPropertyChangedEx + { + public static System.IObservable WhenAnyPropertyChanged(this TObject source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Func resultSelector, System.Func? p1Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Linq.Expressions.Expression> p6, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null, System.Func? p6Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + } + public class ObservableCollectionAdaptor : DynamicData.Reactive.IChangeSetAdaptor + where T : notnull + { + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.IObservableCollection collection) { } + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.IObservableCollection collection, DynamicData.Reactive.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.IObservableCollection collection, int refreshThreshold, bool allowReplace = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes) { } + } + public class ObservableCollectionAdaptor : DynamicData.Reactive.Binding.IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(int refreshThreshold = 25, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection) { } + } + public static class ObservableCollectionEx + { + public static System.IObservable> ObserveCollectionChanges(this System.Collections.Specialized.INotifyCollectionChanged source) { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public class ObservableCollectionExtended : System.Collections.ObjectModel.ObservableCollection, DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, DynamicData.Reactive.Binding.IObservableCollection, DynamicData.Reactive.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + public ObservableCollectionExtended() { } + public ObservableCollectionExtended(System.Collections.Generic.IEnumerable collection) { } + public ObservableCollectionExtended(System.Collections.Generic.List list) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public void Load(System.Collections.Generic.IEnumerable items) { } + protected override void OnCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { } + protected override void OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs e) { } + public void RemoveRange(int index, int count) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + } + public sealed class PropertyValue : System.IEquatable> + { + public PropertyValue(TObject sender, TValue value) { } + public PropertyValue(TObject Sender, TValue? Value, bool UnobtainableValue) { } + public TObject Sender { get; init; } + public bool UnobtainableValue { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct SortAndBindOptions : System.IEquatable + { + public SortAndBindOptions() { } + public int InitialCapacity { get; init; } + public bool ResetOnFirstTimeLoad { get; init; } + public int ResetThreshold { get; init; } + public System.Reactive.Concurrency.IScheduler? Scheduler { get; init; } + public bool UseBinarySearch { get; init; } + public bool UseReplaceForUpdates { get; init; } + } + public enum SortDirection + { + Ascending = 0, + Descending = 1, + } + public class SortExpressionComparer : System.Collections.Generic.List>, System.Collections.Generic.IComparer + { + public SortExpressionComparer() { } + public int Compare(T? x, T? y) { } + public DynamicData.Reactive.Binding.SortExpressionComparer ThenByAscending(System.Func expression) { } + public DynamicData.Reactive.Binding.SortExpressionComparer ThenByDescending(System.Func expression) { } + public static DynamicData.Reactive.Binding.SortExpressionComparer Ascending(System.Func expression) { } + public static DynamicData.Reactive.Binding.SortExpressionComparer Descending(System.Func expression) { } + } + public class SortExpression + { + public SortExpression(System.Func expression, DynamicData.Reactive.Binding.SortDirection direction = 0) { } + public DynamicData.Reactive.Binding.SortDirection Direction { get; } + public System.Func Expression { get; } + } + public class SortedBindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.Reactive.ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedBindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.Reactive.ISortedChangeSet changes) { } + } + public class SortedObservableCollectionAdaptor : DynamicData.Reactive.Binding.ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedObservableCollectionAdaptor() { } + public SortedObservableCollectionAdaptor(DynamicData.Reactive.Binding.BindingOptions options) { } + public SortedObservableCollectionAdaptor(int refreshThreshold, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.Reactive.ISortedChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection) { } + } +} +namespace DynamicData.Reactive.Cache.Internal +{ + public enum CombineOperator + { + And = 0, + Or = 1, + Xor = 2, + Except = 3, + } + [System.Serializable] + public class KeySelectorException : System.Exception + { + public KeySelectorException() { } + public KeySelectorException(string message) { } + public KeySelectorException(string message, System.Exception innerException) { } + } + [System.Diagnostics.DebuggerDisplay("LockFreeObservableCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Ite" + + "ms)")] + public sealed class LockFreeObservableCache : DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public LockFreeObservableCache() { } + public LockFreeObservableCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> editAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IObservable> Watch(TKey key) { } + } +} +namespace DynamicData.Reactive +{ + public sealed class ChangeAwareCache : DynamicData.Reactive.ICache, DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + public ChangeAwareCache() { } + public ChangeAwareCache(System.Collections.Generic.Dictionary data) { } + public ChangeAwareCache(int capacity) { } + public int Count { get; } + public System.Collections.Generic.IEnumerable Items { get; } + public System.Collections.Generic.IEnumerable> KeyValues { get; } + public System.Collections.Generic.IEnumerable Keys { get; } + public void Add(TObject item, TKey key) { } + public void AddOrUpdate(TObject item, TKey key) { } + public DynamicData.Reactive.ChangeSet CaptureChanges() { } + public void Clear() { } + public void Clone(DynamicData.Reactive.IChangeSet changes) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public void Refresh() { } + public void Refresh(System.Collections.Generic.IEnumerable keys) { } + public void Refresh(TKey key) { } + public void Remove(System.Collections.Generic.IEnumerable keys) { } + public void Remove(TKey key) { } + } + public class ChangeAwareList : DynamicData.Reactive.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + where T : notnull + { + public ChangeAwareList(System.Collections.Generic.IEnumerable items) { } + public ChangeAwareList(int capacity = -1) { } + public ChangeAwareList(DynamicData.Reactive.ChangeAwareList list, bool copyChanges) { } + public int Capacity { get; set; } + public int Count { get; } + public bool IsReadOnly { get; } + public T this[int index] { get; set; } + public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public DynamicData.Reactive.IChangeSet CaptureChanges() { } + public virtual void Clear() { } + public virtual bool Contains(T item) { } + public void CopyTo(T[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public int IndexOf(T item) { } + public int IndexOf(T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public void Insert(int index, T item) { } + protected virtual void InsertItem(int index, T item) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public virtual void Move(T item, int destination) { } + public virtual void Move(int original, int destination) { } + protected virtual void OnInsertItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnRemoveItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnSetItem(int index, T newItem, T oldItem) { } + public bool Refresh(T item) { } + public void Refresh(T item, int index) { } + public void RefreshAt(int index) { } + public bool Remove(T item) { } + public void RemoveAt(int index) { } + protected void RemoveItem(int index) { } + protected virtual void RemoveItem(int index, T item) { } + public void RemoveRange(int index, int count) { } + protected virtual void SetItem(int index, T item) { } + } + public enum ChangeReason + { + Add = 0, + Update = 1, + Remove = 2, + Refresh = 3, + Moved = 4, + } + public static class ChangeSetEx + { + public static System.Collections.Generic.IEnumerable> Flatten(this DynamicData.Reactive.IChangeSet source) + where T : notnull { } + public static DynamicData.Reactive.ChangeType GetChangeType(this DynamicData.Reactive.ListChangeReason source) { } + public static DynamicData.Reactive.IChangeSet Transform(this DynamicData.Reactive.IChangeSet source, System.Func transformer) + where TSource : notnull + where TDestination : notnull { } + public static System.Collections.Generic.IEnumerable> YieldWithoutIndex(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + public static readonly DynamicData.Reactive.IChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> items) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Replaced { get; } + public int TotalChanges { get; } + public override string ToString() { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public static readonly DynamicData.Reactive.ChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Updates { get; } + public override string ToString() { } + } + public sealed class ChangeSet : DynamicData.Reactive.ChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public ChangeSet(TContext context) { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection, TContext context) { } + public ChangeSet(int capacity, TContext context) { } + public TContext Context { get; } + } + public enum ChangeType + { + Item = 0, + Range = 1, + } + public sealed class Change : System.IEquatable> + where T : notnull + { + public Change(DynamicData.Reactive.ListChangeReason reason, System.Collections.Generic.IEnumerable items, int index = -1) { } + public Change(DynamicData.Reactive.ListChangeReason reason, T current, int index = -1) { } + public Change(T current, int currentIndex, int previousIndex) { } + public Change(DynamicData.Reactive.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public DynamicData.Reactive.ItemChange Item { get; } + public DynamicData.Reactive.RangeChange Range { get; } + public DynamicData.Reactive.ListChangeReason Reason { get; } + public DynamicData.Reactive.ChangeType Type { get; } + public bool Equals(DynamicData.Reactive.Change? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Reactive.Change left, DynamicData.Reactive.Change right) { } + public static bool operator ==(DynamicData.Reactive.Change left, DynamicData.Reactive.Change right) { } + } + public readonly struct Change : System.IEquatable> + where TObject : notnull + where TKey : notnull + { + public Change(DynamicData.Reactive.ChangeReason reason, TKey key, TObject current, int index = -1) { } + public Change(TKey key, TObject current, int currentIndex, int previousIndex) { } + public Change(DynamicData.Reactive.ChangeReason reason, TKey key, TObject current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public TObject Current { get; } + public int CurrentIndex { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.Reactive.ChangeReason Reason { get; } + public bool Equals(DynamicData.Reactive.Change other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.Reactive.Change left, in DynamicData.Reactive.Change right) { } + public static bool operator ==(in DynamicData.Reactive.Change left, in DynamicData.Reactive.Change right) { } + } + public static class DynamicDataOptions + { + public static DynamicData.Reactive.Binding.BindingOptions Binding { get; set; } + public static DynamicData.Reactive.Binding.SortAndBindOptions SortAndBind { get; set; } + } + public static class EnumerableEx + { + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, bool completable = false) + where TObject : notnull { } + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, System.Func keySelector, bool completable = false) + where TObject : notnull + where TKey : notnull { } + } + public interface ICacheUpdater : DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable> keyValuePairs); + void AddOrUpdate(System.Collections.Generic.KeyValuePair item); + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.Reactive.IChangeSet changes); + TKey GetKey(TObject item); + System.Collections.Generic.IEnumerable> GetKeyValues(System.Collections.Generic.IEnumerable items); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable> items); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(System.Collections.Generic.KeyValuePair item); + void Remove(TKey key); + void RemoveKey(TKey key); + void RemoveKeys(System.Collections.Generic.IEnumerable key); + [System.Obsolete("Use Clone()")] + void Update(DynamicData.Reactive.IChangeSet changes); + } + public interface ICache : DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.Reactive.IChangeSet changes); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(TKey key); + } + public interface IChangeSet + { + int Adds { get; } + int Capacity { get; set; } + int Count { get; } + int Moves { get; } + int Refreshes { get; } + int Removes { get; } + } + public interface IChangeSetAdaptor + where T : notnull + { + void Adapt(DynamicData.Reactive.IChangeSet changes); + } + public interface IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.IChangeSet changes); + } + public interface IChangeSet : DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + { + int Replaced { get; } + int TotalChanges { get; } + } + public interface IChangeSet : DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + int Updates { get; } + } + public interface IChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + TContext Context { get; } + } + public interface IConnectableCache + where TObject : notnull + where TKey : notnull + { + System.IObservable CountChanged { get; } + System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true); + System.IObservable> Preview(System.Func? predicate = null); + System.IObservable> Watch(TKey key); + } + public interface IDistinctChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull { } + public interface IExtendedList : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + { + void AddRange(System.Collections.Generic.IEnumerable collection); + void InsertRange(System.Collections.Generic.IEnumerable collection, int index); + void Move(int original, int destination); + void RemoveRange(int index, int count); + } + public interface IGroupChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IGroup + where TObject : notnull + { + TGroup GroupKey { get; } + DynamicData.Reactive.IObservableList List { get; } + } + public interface IGroup : DynamicData.Reactive.IKey + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.IObservableCache Cache { get; } + } + public interface IGrouping + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IImmutableGroupChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IIntermediateCache : DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + void Edit(System.Action> updateAction); + } + public interface IKeyValueCollection : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyList>, System.Collections.IEnumerable + { + System.Collections.Generic.IComparer> Comparer { get; } + DynamicData.Reactive.SortOptimisations Optimisations { get; } + DynamicData.Reactive.SortReason SortReason { get; } + } + public interface IKeyValue : DynamicData.Reactive.IKey + { + TObject Value { get; } + } + public interface IKey + { + T Key { get; } + } + public interface IObservableCache : DynamicData.Reactive.IConnectableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + int Count { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + System.Collections.Generic.IReadOnlyList Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IObservableList : System.IDisposable + where T : notnull + { + int Count { get; } + System.IObservable CountChanged { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.IObservable> Connect(System.Func? predicate = null); + System.IObservable> Preview(System.Func? predicate = null); + } + public interface IPageChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.Reactive.Operators.IPageResponse Response { get; } + } + public interface IPageRequest + { + int Page { get; } + int Size { get; } + } + public interface IPagedChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.Operators.IPageResponse Response { get; } + } + public interface IQuery + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.ISortedChangeSet changes); + } + public interface ISortedChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.IKeyValueCollection SortedItems { get; } + } + public interface ISourceCache : DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.Func KeySelector { get; } + void Edit(System.Action> updateAction); + } + public interface ISourceList : DynamicData.Reactive.IObservableList, System.IDisposable + where T : notnull + { + void Edit(System.Action> updateAction); + } + public interface ISourceUpdater : DynamicData.Reactive.ICacheUpdater, DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable items); + void AddOrUpdate(TObject item); + void AddOrUpdate(System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer comparer); + void AddOrUpdate(TObject item, System.Collections.Generic.IEqualityComparer comparer); + void Load(System.Collections.Generic.IEnumerable items); + void Refresh(System.Collections.Generic.IEnumerable items); + void Refresh(TObject item); + void Remove(System.Collections.Generic.IEnumerable items); + void Remove(TObject item); + } + public interface IVirtualChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.Reactive.IVirtualResponse Response { get; } + } + public interface IVirtualChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.IVirtualResponse Response { get; } + } + public interface IVirtualRequest + { + int Size { get; } + int StartIndex { get; } + } + public interface IVirtualResponse + { + int Size { get; } + int StartIndex { get; } + int TotalSize { get; } + } + public sealed class IndexedItem : System.IEquatable> + { + public IndexedItem(TObject value, TKey key, int index) { } + public int Index { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.Reactive.IndexedItem? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + [System.Diagnostics.DebuggerDisplay("IntermediateCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class IntermediateCache : DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IIntermediateCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public IntermediateCache() { } + public IntermediateCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public readonly struct ItemChange : System.IEquatable> + where T : notnull + { + public static readonly DynamicData.Reactive.ItemChange Empty; + public ItemChange(DynamicData.Reactive.ListChangeReason reason, T current, int currentIndex) { } + public ItemChange(DynamicData.Reactive.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public T Current { get; } + public int CurrentIndex { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.Reactive.ListChangeReason Reason { get; } + public bool Equals(DynamicData.Reactive.ItemChange other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.Reactive.ItemChange left, in DynamicData.Reactive.ItemChange right) { } + public static bool operator ==(in DynamicData.Reactive.ItemChange left, in DynamicData.Reactive.ItemChange right) { } + } + public enum ListChangeReason + { + Add = 0, + AddRange = 1, + Replace = 2, + Remove = 3, + RemoveRange = 4, + Refresh = 5, + Moved = 6, + Clear = 7, + } + public static class ListEx + { + public static void Add(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddOrInsertRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value, System.Collections.Generic.IComparer comparer) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TSearch value, System.Func comparer) { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.Reactive.IChangeSet changes) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.Reactive.IChangeSet changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable> changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item) { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public static ReactiveUI.Primitives.Optional> IndexOfOptional(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer? equalityComparer = null) { } + public static void Remove(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void RemoveMany(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable itemsToRemove) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith, System.Collections.Generic.IEqualityComparer comparer) { } + public static void ReplaceOrAdd(this System.Collections.Generic.IList source, T original, T replaceWith) { } + } + public enum ListFilterPolicy + { + ClearAndReplace = 0, + CalculateDiff = 1, + } + [System.Serializable] + public class MissingKeyException : System.Exception + { + public MissingKeyException() { } + public MissingKeyException(string message) { } + public MissingKeyException(string message, System.Exception innerException) { } + } + public class Node : System.IDisposable, System.IEquatable> + where TObject : class + where TKey : notnull + { + public Node(TObject item, TKey key) { } + public Node(TObject item, TKey key, in ReactiveUI.Primitives.Optional> parent) { } + public DynamicData.Reactive.IObservableCache, TKey> Children { get; } + public int Depth { get; } + public bool IsRoot { get; } + public TObject Item { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional> Parent { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + public bool Equals(DynamicData.Reactive.Node? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Reactive.Node left, DynamicData.Reactive.Node right) { } + public static bool operator ==(DynamicData.Reactive.Node? left, DynamicData.Reactive.Node? right) { } + } + public static class ObservableCacheEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.Reactive.IChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.Reactive.ISortedChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.IIntermediateCache source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, TObject item, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.IObservableCache AsObservableCache(this DynamicData.Reactive.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.IObservableCache AsObservableCache(this System.IObservable> source, bool applyLocking = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AsyncDisposeMany(this System.IObservable> source, System.Action> disposalsCompletedAccessor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Batch(this System.IObservable> source, System.TimeSpan timeSpan, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.IObservable? timer, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, System.TimeSpan? timeOut = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.IObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, int refreshThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.ISortedObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Reactive.Binding.IObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Reactive.Binding.ISortedObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static void Clear(this DynamicData.Reactive.Cache.Internal.LockFreeObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.Reactive.IIntermediateCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.Reactive.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.ICollection target) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This was an experiment that did not work. Use Transform instead")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.Reactive.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static void EditDiff(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void EditDiff(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Func areItemsEqual) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EnsureUniqueKeys(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.Reactive.Concurrency.IScheduler scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> ExpireAfter(this DynamicData.Reactive.ISourceCache source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval, System.Reactive.Concurrency.IScheduler scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterImmutable(this System.IObservable> source, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This can cause unhandled exception issues so do not use")] + public static System.IObservable FinallySafe(this System.IObservable source, System.Action finallyAction) { } + public static System.IObservable> Flatten(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelector, System.IObservable> resultGroupSource) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable regrouper) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> IgnoreSameReferenceUpdate(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IgnoreUpdateWhen(this System.IObservable> source, System.Func ignoreFunction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IncludeUpdateWhen(this System.IObservable> source, System.Func includeFunction) + where TObject : notnull + where TKey : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, [System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] System.Func, TLeft, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InvokeEvaluate(this System.IObservable> source) + where TObject : DynamicData.Reactive.Binding.IEvaluateAware + where TKey : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LimitSizeTo(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> LimitSizeTo(this DynamicData.Reactive.ISourceCache source, int sizeLimit, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MonitorStatus(this System.IObservable source) { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OfType(this System.IObservable> source, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndPage as it\'s more efficient")] + public static System.IObservable> Page(this System.IObservable> source, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.Reactive.ISourceCache source, System.IObservable> observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.Reactive.ISourceCache source, System.IObservable observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.Cache.Internal.LockFreeObservableCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.IIntermediateCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.ISourceCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source, System.Func> itemChangedTrigger) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.Reactive.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.Reactive.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.IIntermediateCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.IIntermediateCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RemoveKey(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKey(this DynamicData.Reactive.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKeys(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable resorter, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, System.IObservable resorter, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests, DynamicData.Reactive.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests, DynamicData.Reactive.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests, DynamicData.Reactive.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests, DynamicData.Reactive.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortBy(this System.IObservable> source, System.Func expression, DynamicData.Reactive.Binding.SortDirection sortOrder = 0, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item) + where TObject : DynamicData.Reactive.IKey + where TKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, bool initialOptionalWhenMissing, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Reactive.Binding.SortDirection sortOrder = 0) + where TObject : notnull + where TKey : notnull + where TSortKey : notnull { } + [System.Obsolete("Use Overload with comparer as it\'s more efficient")] + public static System.IObservable> Top(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> Top(this System.IObservable> source, System.Collections.Generic.IComparer comparer, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformImmutable(this System.IObservable> source, System.Func transformFactory) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> TransformToTree(this System.IObservable> source, System.Func pivotOn, System.IObservable, bool>>? predicateChanged = null) + where TObject : class + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TreatMovesAsRemoveAdd(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable> UpdateIndex(this System.IObservable> source) + where TObject : DynamicData.Reactive.Binding.IIndexAware + where TKey : notnull { } + [System.Obsolete("Use SortAndVirtualize as it\'s more efficient")] + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Watch(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this DynamicData.Reactive.IObservableCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.Reactive.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.Reactive.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableChangeSet + { + public static System.IObservable> Create(System.Func, System.Action> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Action> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.Reactive.IChangeSetAdaptor adaptor) + where T : notnull { } + public static System.IObservable> AddKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static DynamicData.Reactive.IObservableList AsObservableList(this DynamicData.Reactive.ISourceList source) + where T : notnull { } + public static DynamicData.Reactive.IObservableList AsObservableList(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection targetCollection, DynamicData.Reactive.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection targetCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Cast(this System.IObservable> source) + where TDestination : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> CastToObject(this System.IObservable> source) + where T : class { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.IList target) + where T : notnull { } + [System.Obsolete("Prefer Cast as it is does the same thing but is semantically correct")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.Reactive.IObservableList source) + where T : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TValue : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> ExpireAfter(this DynamicData.Reactive.ISourceList source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicate, DynamicData.Reactive.ListFilterPolicy filterPolicy = 1) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, DynamicData.Reactive.ListFilterPolicy filterPolicy = 1, bool suppressEmptyChangeSets = true) + where T : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> objectFilterObservable, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull { } + [System.Obsolete("Use AutoRefresh(), followed by Filter() instead")] + public static System.IObservable> FilterOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.Func predicate, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where T : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable> ForEachItemChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable>> GroupOn(this System.IObservable> source, System.Func groupSelector, System.IObservable? regrouper = null) + where TObject : notnull + where TGroup : notnull { } + public static System.IObservable>> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TGroupKey : notnull { } + public static System.IObservable> LimitSizeTo(this DynamicData.Reactive.ISourceList source, int sizeLimit, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.Reactive.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.Reactive.IObservableList>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.Reactive.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where T : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where T : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where T : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> Page(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.ISourceList destination) + where T : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where T : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> RemoveIndex(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Reverse(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerChanged, DynamicData.Reactive.SortOptions options = 0, System.IObservable? resort = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.SortOptions options = 0, System.IObservable? resort = null, System.IObservable>? comparerChanged = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where T : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where T : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func expireAfter, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func expireAfter, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func? expireAfter, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func? expireAfter, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Reactive.Binding.SortDirection sortOrder = 0) + where TObject : notnull { } + public static System.IObservable> Top(this System.IObservable> source, int numberOfItems) + where T : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, int, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.Reactive.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.Reactive.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + } + public class PageContext : System.IEquatable> + { + public PageContext(DynamicData.Reactive.Operators.IPageResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.Reactive.SortAndPageOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.Reactive.SortAndPageOptions Options { get; init; } + public DynamicData.Reactive.Operators.IPageResponse Response { get; init; } + } + public sealed class PageRequest : DynamicData.Reactive.IPageRequest, System.IEquatable + { + public static readonly DynamicData.Reactive.IPageRequest Default; + public static readonly DynamicData.Reactive.IPageRequest Empty; + public PageRequest() { } + public PageRequest(int page, int size) { } + public int Page { get; } + public int Size { get; } + public static System.Collections.Generic.IEqualityComparer DefaultComparer { get; } + public bool Equals(DynamicData.Reactive.IPageRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class RangeChange : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public RangeChange(System.Collections.Generic.IEnumerable items, int index = -1) { } + public int Count { get; } + public int Index { get; } + public static DynamicData.Reactive.RangeChange Empty { get; } + public void Add(T item) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public void Insert(int index, T item) { } + public void SetStartingIndex(int index) { } + public override string ToString() { } + } + public readonly struct SortAndPageOptions : System.IEquatable + { + public SortAndPageOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + public readonly struct SortAndVirtualizeOptions : System.IEquatable + { + public SortAndVirtualizeOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + [System.Serializable] + public class SortException : System.Exception + { + public SortException() { } + public SortException(string message) { } + public SortException(string message, System.Exception innerException) { } + } + [System.Flags] + public enum SortOptimisations + { + None = 0, + ComparesImmutableValuesOnly = 1, + IgnoreEvaluates = 2, + [System.Obsolete("This is no longer being used. Use one of the other options instead.")] + InsertAtEndThenSort = 3, + } + public enum SortOptions + { + None = 0, + UseBinarySearch = 1, + } + public enum SortReason + { + InitialLoad = 0, + ComparerChanged = 1, + DataChanged = 2, + Reorder = 3, + Reset = 4, + } + public static class SourceCacheEx + { + public static System.IObservable> Cast(this DynamicData.Reactive.IObservableCache source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class SourceCache : DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, DynamicData.Reactive.ISourceCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SourceCache(System.Func keySelector) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Func KeySelector { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public static class SourceListEditConvenienceEx + { + public static void Add(this DynamicData.Reactive.ISourceList source, T item) + where T : notnull { } + public static void AddRange(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable items) + where T : notnull { } + public static void Clear(this DynamicData.Reactive.ISourceList source) + where T : notnull { } + public static void EditDiff(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where T : notnull { } + public static void Insert(this DynamicData.Reactive.ISourceList source, int index, T item) + where T : notnull { } + public static void InsertRange(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable items, int index) + where T : notnull { } + public static void Move(this DynamicData.Reactive.ISourceList source, int original, int destination) + where T : notnull { } + public static bool Remove(this DynamicData.Reactive.ISourceList source, T item) + where T : notnull { } + public static void RemoveAt(this DynamicData.Reactive.ISourceList source, int index) + where T : notnull { } + public static void RemoveMany(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable itemsToRemove) + where T : notnull { } + public static void RemoveRange(this DynamicData.Reactive.ISourceList source, int index, int count) + where T : notnull { } + public static void Replace(this DynamicData.Reactive.ISourceList source, T original, T destination) + where T : notnull { } + public static void ReplaceAt(this DynamicData.Reactive.ISourceList source, int index, T item) + where T : notnull { } + } + public static class SourceListEx + { + public static System.IObservable> Cast(this DynamicData.Reactive.ISourceList source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceList<{typeof(T).Name}> ({Count} Items)")] + public sealed class SourceList : DynamicData.Reactive.IObservableList, DynamicData.Reactive.ISourceList, System.IDisposable + where T : notnull + { + public SourceList(System.IObservable>? source = null) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.IObservable> Connect(System.Func? predicate = null) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + } + public struct TransformAsyncOptions : System.IEquatable + { + public static readonly DynamicData.Reactive.TransformAsyncOptions Default; + public TransformAsyncOptions(int? MaximumConcurrency, bool TransformOnRefresh) { } + public int? MaximumConcurrency { get; set; } + public bool TransformOnRefresh { get; set; } + } + [System.Serializable] + public class UnspecifiedIndexException : System.Exception + { + public UnspecifiedIndexException() { } + public UnspecifiedIndexException(string message) { } + public UnspecifiedIndexException(string message, System.Exception innerException) { } + } + public class VirtualContext : System.IEquatable> + { + public VirtualContext(DynamicData.Reactive.IVirtualResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.Reactive.SortAndVirtualizeOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.Reactive.SortAndVirtualizeOptions Options { get; init; } + public DynamicData.Reactive.IVirtualResponse Response { get; init; } + } + public class VirtualRequest : DynamicData.Reactive.IVirtualRequest, System.IEquatable + { + public static readonly DynamicData.Reactive.VirtualRequest Default; + public VirtualRequest() { } + public VirtualRequest(int startIndex, int size) { } + public int Size { get; } + public int StartIndex { get; } + public static System.Collections.Generic.IEqualityComparer StartIndexSizeComparer { get; } + public bool Equals(DynamicData.Reactive.IVirtualRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } +} +namespace DynamicData.Reactive.Diagnostics +{ + public class ChangeStatistics : System.IEquatable + { + public ChangeStatistics() { } + public ChangeStatistics(int Index, int Adds, int Updates, int Removes, int Refreshes, int Moves, int Count) { } + public int Adds { get; init; } + public int Count { get; init; } + public int Index { get; init; } + public System.DateTime LastUpdated { get; } + public int Moves { get; init; } + public int Refreshes { get; init; } + public int Removes { get; init; } + public int Updates { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public class ChangeSummary + { + public static readonly DynamicData.Reactive.Diagnostics.ChangeSummary Empty; + public ChangeSummary(int index, DynamicData.Reactive.Diagnostics.ChangeStatistics latest, DynamicData.Reactive.Diagnostics.ChangeStatistics overall) { } + public DynamicData.Reactive.Diagnostics.ChangeStatistics Latest { get; } + public DynamicData.Reactive.Diagnostics.ChangeStatistics Overall { get; } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public static class DiagnosticOperators + { + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull { } + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Reactive.Experimental +{ + public static class ExperimentalEx + { + public static DynamicData.Reactive.Experimental.IWatcher AsWatcher(this System.IObservable> source, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + } + public interface IWatcher : System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.IObservable> Watch(TKey key); + } +} +namespace DynamicData.Reactive.Kernel +{ + public enum ConnectionStatus + { + Pending = 0, + Loaded = 1, + Errored = 2, + Completed = 3, + } + public static class EnumerableEx + { + public static T[] AsArray(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.List AsList(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.IEnumerable Duplicates(this System.Collections.Generic.IEnumerable source, System.Func valueSelector) { } + public static System.Collections.Generic.IEnumerable> IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind) { } + public static System.Collections.Generic.IEnumerable IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind, System.Func resultSelector) { } + } + public sealed class Error : DynamicData.Reactive.IKeyValue, DynamicData.Reactive.IKey, System.IEquatable> + where TKey : notnull + { + public Error(System.Exception? exception, TObject value, TKey key) { } + public System.Exception? Exception { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.Reactive.Kernel.Error? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Reactive.Kernel.Error left, DynamicData.Reactive.Kernel.Error right) { } + public static bool operator ==(DynamicData.Reactive.Kernel.Error left, DynamicData.Reactive.Kernel.Error right) { } + } + public static class InternalEx + { + public static System.IObservable RetryWithBackOff(this System.IObservable source, System.Func backOffStrategy) + where TException : System.Exception { } + public static System.IDisposable ScheduleRecurringAction(this System.Reactive.Concurrency.IScheduler scheduler, System.Func interval, System.Action action) { } + public static System.IDisposable ScheduleRecurringAction(this System.Reactive.Concurrency.IScheduler scheduler, System.TimeSpan interval, System.Action action) { } + } + public readonly struct ItemWithIndex : System.IEquatable> + { + public ItemWithIndex(T Item, int Index) { } + public int Index { get; init; } + public T Item { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct ItemWithValue : System.IEquatable> + { + public ItemWithValue(TObject Item, TValue Value) { } + public TObject Item { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class OptionElse + { + public void Else(System.Action action) { } + } + public static class OptionExtensions + { + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static TDestination? ConvertOr(this in ReactiveUI.Primitives.Optional source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static ReactiveUI.Primitives.Optional FirstOrOptional(this System.Collections.Generic.IEnumerable source, System.Func selector) + where T : notnull { } + public static DynamicData.Reactive.Kernel.OptionElse IfHasValue(this ReactiveUI.Primitives.Optional? source, System.Action action) + where T : notnull { } + public static DynamicData.Reactive.Kernel.OptionElse IfHasValue(this in ReactiveUI.Primitives.Optional source, System.Action action) + where T : notnull { } + public static ReactiveUI.Primitives.Optional Lookup(this System.Collections.Generic.IDictionary source, TKey key) + where TValue : notnull { } + public static ReactiveUI.Primitives.Optional OrElse(this in ReactiveUI.Primitives.Optional source, System.Func> fallbackOperation) + where T : notnull { } + public static bool RemoveIfContained(this System.Collections.Generic.IDictionary source, TKey key) { } + public static System.Collections.Generic.IEnumerable SelectValues(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + public static T ValueOr(this T? source, T defaultValue) + where T : struct { } + public static T ValueOr(this in ReactiveUI.Primitives.Optional source, System.Func valueSelector) + where T : notnull { } + public static T? ValueOrDefault(this in ReactiveUI.Primitives.Optional source) + where T : notnull { } + public static T ValueOrThrow(this in ReactiveUI.Primitives.Optional source, System.Func exceptionGenerator) + where T : notnull { } + } + public static class OptionObservableExtensions + { + public static System.IObservable> Convert(this System.IObservable> source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Convert(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable ConvertOr(this System.IObservable> source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static System.IObservable> OnHasNoValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OnHasValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OrElse(this System.IObservable> source, System.Func> fallbackOperation) + where T : notnull { } + public static System.IObservable SelectValues(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOr(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable ValueOrDefault(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOrThrow(this System.IObservable> source, System.Func exceptionGenerator) + where T : notnull { } + } +} +namespace DynamicData.Reactive.List +{ + public interface IGrouping + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + } +} +namespace DynamicData.Reactive.Operators +{ + public interface IPageResponse + { + int Page { get; } + int PageSize { get; } + int Pages { get; } + int TotalSize { get; } + } +} +namespace DynamicData.Reactive.PLinq +{ + public static class ParallelOperators + { + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + } + public enum ParallelType + { + None = 0, + Parallelise = 1, + Ordered = 2, + } + public class ParallelisationOptions + { + public static readonly DynamicData.Reactive.PLinq.ParallelisationOptions Default; + public static readonly DynamicData.Reactive.PLinq.ParallelisationOptions None; + public ParallelisationOptions(DynamicData.Reactive.PLinq.ParallelType type = 0, int threshold = 0, int maxDegreeOfParallelisation = 0) { } + public int MaxDegreeOfParallelisation { get; } + public int Threshold { get; } + public DynamicData.Reactive.PLinq.ParallelType Type { get; } + } +} +namespace DynamicData.Reactive.Tests +{ + public class ChangeSetAggregator : System.IDisposable + where TObject : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableList Data { get; } + public System.Exception? Exception { get; set; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public class DistinctChangeSetAggregator : System.IDisposable + where TValue : notnull + { + public DistinctChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class GroupChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull + { + public GroupChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache, TGroupKey> Data { get; } + public System.Exception? Error { get; } + public DynamicData.Reactive.IObservableCache, TGroupKey> Groups { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IReadOnlyList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + } + public static class ListTextEx + { + public static DynamicData.Reactive.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where T : notnull { } + } + public class PagedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public PagedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class SortedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SortedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public static class TestEx + { + public static DynamicData.Reactive.Tests.DistinctChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull { } + public static DynamicData.Reactive.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.PagedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.SortedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.VirtualChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.GroupChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull + where TKey : notnull + where TGroupKey : notnull { } + } + public class VirtualChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public VirtualChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } +} diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataReactiveTests.DotNet11_0.verified.txt b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataReactiveTests.DotNet11_0.verified.txt new file mode 100644 index 000000000..4a72ce7b4 --- /dev/null +++ b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataReactiveTests.DotNet11_0.verified.txt @@ -0,0 +1,3079 @@ +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Benchmarks")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Reactive.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v11.0", FrameworkDisplayName=".NET 11.0")] +namespace DynamicData.Reactive.Aggregation +{ + public readonly struct AggregateItem : System.IEquatable> + { + public AggregateItem(DynamicData.Reactive.Aggregation.AggregateType Type, TObject Item) { } + public TObject Item { get; init; } + public DynamicData.Reactive.Aggregation.AggregateType Type { get; init; } + public override int GetHashCode() { } + } + public enum AggregateType + { + Add = 0, + Remove = 1, + } + public static class AggregationEx + { + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + } + public static class AvgEx + { + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + } + public static class CountEx + { + public static System.IObservable Count(this System.IObservable> source) { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + } + public interface IAggregateChangeSet : System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable { } + public static class MaxEx + { + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + } + public static class StdDevEx + { + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal fallbackValue) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where TObject : notnull + where TKey : notnull { } + } + public static class SumEx + { + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Reactive.Alias +{ + public static class ObservableCacheAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> SelectTree(this System.IObservable> source, System.Func pivotOn) + where TObject : class + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func filter) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicate) + where T : notnull { } + } +} +namespace DynamicData.Reactive.Binding +{ + public abstract class AbstractNotifyPropertyChanged : System.ComponentModel.INotifyPropertyChanged + { + protected AbstractNotifyPropertyChanged() { } + public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; + protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, System.Collections.Generic.IEqualityComparer? comparer, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T> : DynamicData.Reactive.IChangeSetAdaptor + where T : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.Reactive.IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes) { } + } + public static class BindingListEx + { + public static System.IObservable> ObserveCollectionChanges(this System.ComponentModel.IBindingList source) { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.ComponentModel.BindingList source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.ComponentModel.IBindingList, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.ComponentModel.BindingList source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public struct BindingOptions : System.IEquatable + { + public const bool DefaultResetOnFirstTimeLoad = true; + public const int DefaultResetThreshold = 25; + public const bool DefaultUseReplaceForUpdates = true; + public BindingOptions(int ResetThreshold, bool UseReplaceForUpdates = true, bool ResetOnFirstTimeLoad = true) { } + public bool ResetOnFirstTimeLoad { get; set; } + public int ResetThreshold { get; set; } + public bool UseReplaceForUpdates { get; set; } + public static DynamicData.Reactive.Binding.BindingOptions NeverFireReset(bool useReplaceForUpdates = true) { } + } + public interface IEvaluateAware + { + void Evaluate(); + } + public interface IIndexAware + { + int Index { get; set; } + } + public interface INotifyCollectionChangedSuspender + { + System.IDisposable SuspendCount(); + System.IDisposable SuspendNotifications(); + } + public interface IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.IChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection); + } + public interface IObservableCollection : DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + void Load(System.Collections.Generic.IEnumerable items); + void Move(int oldIndex, int newIndex); + } + public static class IObservableListEx + { + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.Reactive.IObservableList observableList) + where TObject : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.Reactive.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.Reactive.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + } + public interface ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.ISortedChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection); + } + public static class NotifyPropertyChangedEx + { + public static System.IObservable WhenAnyPropertyChanged(this TObject source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Func resultSelector, System.Func? p1Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Linq.Expressions.Expression> p6, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null, System.Func? p6Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + } + public class ObservableCollectionAdaptor : DynamicData.Reactive.IChangeSetAdaptor + where T : notnull + { + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.IObservableCollection collection) { } + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.IObservableCollection collection, DynamicData.Reactive.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.IObservableCollection collection, int refreshThreshold, bool allowReplace = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes) { } + } + public class ObservableCollectionAdaptor : DynamicData.Reactive.Binding.IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public ObservableCollectionAdaptor(DynamicData.Reactive.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(int refreshThreshold = 25, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.Reactive.IChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection) { } + } + public static class ObservableCollectionEx + { + public static System.IObservable> ObserveCollectionChanges(this System.Collections.Specialized.INotifyCollectionChanged source) { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public class ObservableCollectionExtended : System.Collections.ObjectModel.ObservableCollection, DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, DynamicData.Reactive.Binding.IObservableCollection, DynamicData.Reactive.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + public ObservableCollectionExtended() { } + public ObservableCollectionExtended(System.Collections.Generic.IEnumerable collection) { } + public ObservableCollectionExtended(System.Collections.Generic.List list) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public void Load(System.Collections.Generic.IEnumerable items) { } + protected override void OnCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { } + protected override void OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs e) { } + public void RemoveRange(int index, int count) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + } + public sealed class PropertyValue : System.IEquatable> + { + public PropertyValue(TObject sender, TValue value) { } + public PropertyValue(TObject Sender, TValue? Value, bool UnobtainableValue) { } + public TObject Sender { get; init; } + public bool UnobtainableValue { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct SortAndBindOptions : System.IEquatable + { + public SortAndBindOptions() { } + public int InitialCapacity { get; init; } + public bool ResetOnFirstTimeLoad { get; init; } + public int ResetThreshold { get; init; } + public System.Reactive.Concurrency.IScheduler? Scheduler { get; init; } + public bool UseBinarySearch { get; init; } + public bool UseReplaceForUpdates { get; init; } + } + public enum SortDirection + { + Ascending = 0, + Descending = 1, + } + public class SortExpressionComparer : System.Collections.Generic.List>, System.Collections.Generic.IComparer + { + public SortExpressionComparer() { } + public int Compare(T? x, T? y) { } + public DynamicData.Reactive.Binding.SortExpressionComparer ThenByAscending(System.Func expression) { } + public DynamicData.Reactive.Binding.SortExpressionComparer ThenByDescending(System.Func expression) { } + public static DynamicData.Reactive.Binding.SortExpressionComparer Ascending(System.Func expression) { } + public static DynamicData.Reactive.Binding.SortExpressionComparer Descending(System.Func expression) { } + } + public class SortExpression + { + public SortExpression(System.Func expression, DynamicData.Reactive.Binding.SortDirection direction = 0) { } + public DynamicData.Reactive.Binding.SortDirection Direction { get; } + public System.Func Expression { get; } + } + public class SortedBindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.Reactive.ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedBindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.Reactive.ISortedChangeSet changes) { } + } + public class SortedObservableCollectionAdaptor : DynamicData.Reactive.Binding.ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedObservableCollectionAdaptor() { } + public SortedObservableCollectionAdaptor(DynamicData.Reactive.Binding.BindingOptions options) { } + public SortedObservableCollectionAdaptor(int refreshThreshold, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.Reactive.ISortedChangeSet changes, DynamicData.Reactive.Binding.IObservableCollection collection) { } + } +} +namespace DynamicData.Reactive.Cache.Internal +{ + public enum CombineOperator + { + And = 0, + Or = 1, + Xor = 2, + Except = 3, + } + [System.Serializable] + public class KeySelectorException : System.Exception + { + public KeySelectorException() { } + public KeySelectorException(string message) { } + public KeySelectorException(string message, System.Exception innerException) { } + } + [System.Diagnostics.DebuggerDisplay("LockFreeObservableCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Ite" + + "ms)")] + public sealed class LockFreeObservableCache : DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public LockFreeObservableCache() { } + public LockFreeObservableCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> editAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IObservable> Watch(TKey key) { } + } +} +namespace DynamicData.Reactive +{ + public sealed class ChangeAwareCache : DynamicData.Reactive.ICache, DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + public ChangeAwareCache() { } + public ChangeAwareCache(System.Collections.Generic.Dictionary data) { } + public ChangeAwareCache(int capacity) { } + public int Count { get; } + public System.Collections.Generic.IEnumerable Items { get; } + public System.Collections.Generic.IEnumerable> KeyValues { get; } + public System.Collections.Generic.IEnumerable Keys { get; } + public void Add(TObject item, TKey key) { } + public void AddOrUpdate(TObject item, TKey key) { } + public DynamicData.Reactive.ChangeSet CaptureChanges() { } + public void Clear() { } + public void Clone(DynamicData.Reactive.IChangeSet changes) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public void Refresh() { } + public void Refresh(System.Collections.Generic.IEnumerable keys) { } + public void Refresh(TKey key) { } + public void Remove(System.Collections.Generic.IEnumerable keys) { } + public void Remove(TKey key) { } + } + public class ChangeAwareList : DynamicData.Reactive.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + where T : notnull + { + public ChangeAwareList(System.Collections.Generic.IEnumerable items) { } + public ChangeAwareList(int capacity = -1) { } + public ChangeAwareList(DynamicData.Reactive.ChangeAwareList list, bool copyChanges) { } + public int Capacity { get; set; } + public int Count { get; } + public bool IsReadOnly { get; } + public T this[int index] { get; set; } + public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public DynamicData.Reactive.IChangeSet CaptureChanges() { } + public virtual void Clear() { } + public virtual bool Contains(T item) { } + public void CopyTo(T[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public int IndexOf(T item) { } + public int IndexOf(T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public void Insert(int index, T item) { } + protected virtual void InsertItem(int index, T item) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public virtual void Move(T item, int destination) { } + public virtual void Move(int original, int destination) { } + protected virtual void OnInsertItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnRemoveItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnSetItem(int index, T newItem, T oldItem) { } + public bool Refresh(T item) { } + public void Refresh(T item, int index) { } + public void RefreshAt(int index) { } + public bool Remove(T item) { } + public void RemoveAt(int index) { } + protected void RemoveItem(int index) { } + protected virtual void RemoveItem(int index, T item) { } + public void RemoveRange(int index, int count) { } + protected virtual void SetItem(int index, T item) { } + } + public enum ChangeReason + { + Add = 0, + Update = 1, + Remove = 2, + Refresh = 3, + Moved = 4, + } + public static class ChangeSetEx + { + public static System.Collections.Generic.IEnumerable> Flatten(this DynamicData.Reactive.IChangeSet source) + where T : notnull { } + public static DynamicData.Reactive.ChangeType GetChangeType(this DynamicData.Reactive.ListChangeReason source) { } + public static DynamicData.Reactive.IChangeSet Transform(this DynamicData.Reactive.IChangeSet source, System.Func transformer) + where TSource : notnull + where TDestination : notnull { } + public static System.Collections.Generic.IEnumerable> YieldWithoutIndex(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + public static readonly DynamicData.Reactive.IChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> items) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Replaced { get; } + public int TotalChanges { get; } + public override string ToString() { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public static readonly DynamicData.Reactive.ChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Updates { get; } + public override string ToString() { } + } + public sealed class ChangeSet : DynamicData.Reactive.ChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public ChangeSet(TContext context) { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection, TContext context) { } + public ChangeSet(int capacity, TContext context) { } + public TContext Context { get; } + } + public enum ChangeType + { + Item = 0, + Range = 1, + } + public sealed class Change : System.IEquatable> + where T : notnull + { + public Change(DynamicData.Reactive.ListChangeReason reason, System.Collections.Generic.IEnumerable items, int index = -1) { } + public Change(DynamicData.Reactive.ListChangeReason reason, T current, int index = -1) { } + public Change(T current, int currentIndex, int previousIndex) { } + public Change(DynamicData.Reactive.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public DynamicData.Reactive.ItemChange Item { get; } + public DynamicData.Reactive.RangeChange Range { get; } + public DynamicData.Reactive.ListChangeReason Reason { get; } + public DynamicData.Reactive.ChangeType Type { get; } + public bool Equals(DynamicData.Reactive.Change? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Reactive.Change left, DynamicData.Reactive.Change right) { } + public static bool operator ==(DynamicData.Reactive.Change left, DynamicData.Reactive.Change right) { } + } + public readonly struct Change : System.IEquatable> + where TObject : notnull + where TKey : notnull + { + public Change(DynamicData.Reactive.ChangeReason reason, TKey key, TObject current, int index = -1) { } + public Change(TKey key, TObject current, int currentIndex, int previousIndex) { } + public Change(DynamicData.Reactive.ChangeReason reason, TKey key, TObject current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public TObject Current { get; } + public int CurrentIndex { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.Reactive.ChangeReason Reason { get; } + public bool Equals(DynamicData.Reactive.Change other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.Reactive.Change left, in DynamicData.Reactive.Change right) { } + public static bool operator ==(in DynamicData.Reactive.Change left, in DynamicData.Reactive.Change right) { } + } + public static class DynamicDataOptions + { + public static DynamicData.Reactive.Binding.BindingOptions Binding { get; set; } + public static DynamicData.Reactive.Binding.SortAndBindOptions SortAndBind { get; set; } + } + public static class EnumerableEx + { + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, bool completable = false) + where TObject : notnull { } + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, System.Func keySelector, bool completable = false) + where TObject : notnull + where TKey : notnull { } + } + public interface ICacheUpdater : DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable> keyValuePairs); + void AddOrUpdate(System.Collections.Generic.KeyValuePair item); + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.Reactive.IChangeSet changes); + TKey GetKey(TObject item); + System.Collections.Generic.IEnumerable> GetKeyValues(System.Collections.Generic.IEnumerable items); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable> items); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(System.Collections.Generic.KeyValuePair item); + void Remove(TKey key); + void RemoveKey(TKey key); + void RemoveKeys(System.Collections.Generic.IEnumerable key); + [System.Obsolete("Use Clone()")] + void Update(DynamicData.Reactive.IChangeSet changes); + } + public interface ICache : DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.Reactive.IChangeSet changes); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(TKey key); + } + public interface IChangeSet + { + int Adds { get; } + int Capacity { get; set; } + int Count { get; } + int Moves { get; } + int Refreshes { get; } + int Removes { get; } + } + public interface IChangeSetAdaptor + where T : notnull + { + void Adapt(DynamicData.Reactive.IChangeSet changes); + } + public interface IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.IChangeSet changes); + } + public interface IChangeSet : DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + { + int Replaced { get; } + int TotalChanges { get; } + } + public interface IChangeSet : DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + int Updates { get; } + } + public interface IChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + TContext Context { get; } + } + public interface IConnectableCache + where TObject : notnull + where TKey : notnull + { + System.IObservable CountChanged { get; } + System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true); + System.IObservable> Preview(System.Func? predicate = null); + System.IObservable> Watch(TKey key); + } + public interface IDistinctChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull { } + public interface IExtendedList : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + { + void AddRange(System.Collections.Generic.IEnumerable collection); + void InsertRange(System.Collections.Generic.IEnumerable collection, int index); + void Move(int original, int destination); + void RemoveRange(int index, int count); + } + public interface IGroupChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IGroup + where TObject : notnull + { + TGroup GroupKey { get; } + DynamicData.Reactive.IObservableList List { get; } + } + public interface IGroup : DynamicData.Reactive.IKey + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.IObservableCache Cache { get; } + } + public interface IGrouping + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IImmutableGroupChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IIntermediateCache : DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + void Edit(System.Action> updateAction); + } + public interface IKeyValueCollection : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyList>, System.Collections.IEnumerable + { + System.Collections.Generic.IComparer> Comparer { get; } + DynamicData.Reactive.SortOptimisations Optimisations { get; } + DynamicData.Reactive.SortReason SortReason { get; } + } + public interface IKeyValue : DynamicData.Reactive.IKey + { + TObject Value { get; } + } + public interface IKey + { + T Key { get; } + } + public interface IObservableCache : DynamicData.Reactive.IConnectableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + int Count { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + System.Collections.Generic.IReadOnlyList Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IObservableList : System.IDisposable + where T : notnull + { + int Count { get; } + System.IObservable CountChanged { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.IObservable> Connect(System.Func? predicate = null); + System.IObservable> Preview(System.Func? predicate = null); + } + public interface IPageChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.Reactive.Operators.IPageResponse Response { get; } + } + public interface IPageRequest + { + int Page { get; } + int Size { get; } + } + public interface IPagedChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.Operators.IPageResponse Response { get; } + } + public interface IQuery + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.Reactive.ISortedChangeSet changes); + } + public interface ISortedChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.IKeyValueCollection SortedItems { get; } + } + public interface ISourceCache : DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.Func KeySelector { get; } + void Edit(System.Action> updateAction); + } + public interface ISourceList : DynamicData.Reactive.IObservableList, System.IDisposable + where T : notnull + { + void Edit(System.Action> updateAction); + } + public interface ISourceUpdater : DynamicData.Reactive.ICacheUpdater, DynamicData.Reactive.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable items); + void AddOrUpdate(TObject item); + void AddOrUpdate(System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer comparer); + void AddOrUpdate(TObject item, System.Collections.Generic.IEqualityComparer comparer); + void Load(System.Collections.Generic.IEnumerable items); + void Refresh(System.Collections.Generic.IEnumerable items); + void Refresh(TObject item); + void Remove(System.Collections.Generic.IEnumerable items); + void Remove(TObject item); + } + public interface IVirtualChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.Reactive.IVirtualResponse Response { get; } + } + public interface IVirtualChangeSet : DynamicData.Reactive.IChangeSet, DynamicData.Reactive.IChangeSet, DynamicData.Reactive.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Reactive.IVirtualResponse Response { get; } + } + public interface IVirtualRequest + { + int Size { get; } + int StartIndex { get; } + } + public interface IVirtualResponse + { + int Size { get; } + int StartIndex { get; } + int TotalSize { get; } + } + public sealed class IndexedItem : System.IEquatable> + { + public IndexedItem(TObject value, TKey key, int index) { } + public int Index { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.Reactive.IndexedItem? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + [System.Diagnostics.DebuggerDisplay("IntermediateCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class IntermediateCache : DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IIntermediateCache, DynamicData.Reactive.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public IntermediateCache() { } + public IntermediateCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public readonly struct ItemChange : System.IEquatable> + where T : notnull + { + public static readonly DynamicData.Reactive.ItemChange Empty; + public ItemChange(DynamicData.Reactive.ListChangeReason reason, T current, int currentIndex) { } + public ItemChange(DynamicData.Reactive.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public T Current { get; } + public int CurrentIndex { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.Reactive.ListChangeReason Reason { get; } + public bool Equals(DynamicData.Reactive.ItemChange other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.Reactive.ItemChange left, in DynamicData.Reactive.ItemChange right) { } + public static bool operator ==(in DynamicData.Reactive.ItemChange left, in DynamicData.Reactive.ItemChange right) { } + } + public enum ListChangeReason + { + Add = 0, + AddRange = 1, + Replace = 2, + Remove = 3, + RemoveRange = 4, + Refresh = 5, + Moved = 6, + Clear = 7, + } + public static class ListEx + { + public static void Add(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddOrInsertRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value, System.Collections.Generic.IComparer comparer) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TSearch value, System.Func comparer) { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.Reactive.IChangeSet changes) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.Reactive.IChangeSet changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable> changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item) { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public static ReactiveUI.Primitives.Optional> IndexOfOptional(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer? equalityComparer = null) { } + public static void Remove(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void RemoveMany(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable itemsToRemove) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith, System.Collections.Generic.IEqualityComparer comparer) { } + public static void ReplaceOrAdd(this System.Collections.Generic.IList source, T original, T replaceWith) { } + } + public enum ListFilterPolicy + { + ClearAndReplace = 0, + CalculateDiff = 1, + } + [System.Serializable] + public class MissingKeyException : System.Exception + { + public MissingKeyException() { } + public MissingKeyException(string message) { } + public MissingKeyException(string message, System.Exception innerException) { } + } + public class Node : System.IDisposable, System.IEquatable> + where TObject : class + where TKey : notnull + { + public Node(TObject item, TKey key) { } + public Node(TObject item, TKey key, in ReactiveUI.Primitives.Optional> parent) { } + public DynamicData.Reactive.IObservableCache, TKey> Children { get; } + public int Depth { get; } + public bool IsRoot { get; } + public TObject Item { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional> Parent { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + public bool Equals(DynamicData.Reactive.Node? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Reactive.Node left, DynamicData.Reactive.Node right) { } + public static bool operator ==(DynamicData.Reactive.Node? left, DynamicData.Reactive.Node? right) { } + } + public static class ObservableCacheEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.Reactive.IChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.Reactive.ISortedChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.IIntermediateCache source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.Reactive.ISourceCache source, TObject item, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.IObservableCache AsObservableCache(this DynamicData.Reactive.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.IObservableCache AsObservableCache(this System.IObservable> source, bool applyLocking = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AsyncDisposeMany(this System.IObservable> source, System.Action> disposalsCompletedAccessor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Batch(this System.IObservable> source, System.TimeSpan timeSpan, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.IObservable? timer, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, System.TimeSpan? timeOut = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.IObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, int refreshThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection destination, DynamicData.Reactive.Binding.ISortedObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Reactive.Binding.IObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Reactive.Binding.ISortedObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static void Clear(this DynamicData.Reactive.Cache.Internal.LockFreeObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.Reactive.IIntermediateCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.Reactive.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.ICollection target) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This was an experiment that did not work. Use Transform instead")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.Reactive.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static void EditDiff(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void EditDiff(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Func areItemsEqual) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EnsureUniqueKeys(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.Reactive.Concurrency.IScheduler scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> ExpireAfter(this DynamicData.Reactive.ISourceCache source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval, System.Reactive.Concurrency.IScheduler scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterImmutable(this System.IObservable> source, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This can cause unhandled exception issues so do not use")] + public static System.IObservable FinallySafe(this System.IObservable source, System.Action finallyAction) { } + public static System.IObservable> Flatten(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelector, System.IObservable> resultGroupSource) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable regrouper) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> IgnoreSameReferenceUpdate(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IgnoreUpdateWhen(this System.IObservable> source, System.Func ignoreFunction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IncludeUpdateWhen(this System.IObservable> source, System.Func includeFunction) + where TObject : notnull + where TKey : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, [System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] System.Func, TLeft, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InvokeEvaluate(this System.IObservable> source) + where TObject : DynamicData.Reactive.Binding.IEvaluateAware + where TKey : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LimitSizeTo(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> LimitSizeTo(this DynamicData.Reactive.ISourceCache source, int sizeLimit, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MonitorStatus(this System.IObservable source) { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OfType(this System.IObservable> source, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndPage as it\'s more efficient")] + public static System.IObservable> Page(this System.IObservable> source, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.Reactive.ISourceCache source, System.IObservable> observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.Reactive.ISourceCache source, System.IObservable observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.Cache.Internal.LockFreeObservableCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.IIntermediateCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.ISourceCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source, System.Func> itemChangedTrigger) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.Reactive.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.Reactive.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.IIntermediateCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.IIntermediateCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.Reactive.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RemoveKey(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKey(this DynamicData.Reactive.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKeys(this DynamicData.Reactive.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.Reactive.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable resorter, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, System.IObservable resorter, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged, DynamicData.Reactive.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests, DynamicData.Reactive.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests, DynamicData.Reactive.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests, DynamicData.Reactive.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests, DynamicData.Reactive.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortBy(this System.IObservable> source, System.Func expression, DynamicData.Reactive.Binding.SortDirection sortOrder = 0, DynamicData.Reactive.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item) + where TObject : DynamicData.Reactive.IKey + where TKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, bool initialOptionalWhenMissing, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Reactive.Binding.SortDirection sortOrder = 0) + where TObject : notnull + where TKey : notnull + where TSortKey : notnull { } + [System.Obsolete("Use Overload with comparer as it\'s more efficient")] + public static System.IObservable> Top(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> Top(this System.IObservable> source, System.Collections.Generic.IComparer comparer, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformImmutable(this System.IObservable> source, System.Func transformFactory) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.Reactive.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> TransformToTree(this System.IObservable> source, System.Func pivotOn, System.IObservable, bool>>? predicateChanged = null) + where TObject : class + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TreatMovesAsRemoveAdd(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable> UpdateIndex(this System.IObservable> source) + where TObject : DynamicData.Reactive.Binding.IIndexAware + where TKey : notnull { } + [System.Obsolete("Use SortAndVirtualize as it\'s more efficient")] + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Watch(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this DynamicData.Reactive.IObservableCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.Reactive.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.Reactive.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableChangeSet + { + public static System.IObservable> Create(System.Func, System.Action> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Action> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.Reactive.IChangeSetAdaptor adaptor) + where T : notnull { } + public static System.IObservable> AddKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static DynamicData.Reactive.IObservableList AsObservableList(this DynamicData.Reactive.ISourceList source) + where T : notnull { } + public static DynamicData.Reactive.IObservableList AsObservableList(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection targetCollection, DynamicData.Reactive.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Reactive.Binding.IObservableCollection targetCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Reactive.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Cast(this System.IObservable> source) + where TDestination : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> CastToObject(this System.IObservable> source) + where T : class { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.IList target) + where T : notnull { } + [System.Obsolete("Prefer Cast as it is does the same thing but is semantically correct")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.Reactive.IObservableList source) + where T : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TValue : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> ExpireAfter(this DynamicData.Reactive.ISourceList source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicate, DynamicData.Reactive.ListFilterPolicy filterPolicy = 1) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, DynamicData.Reactive.ListFilterPolicy filterPolicy = 1, bool suppressEmptyChangeSets = true) + where T : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> objectFilterObservable, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull { } + [System.Obsolete("Use AutoRefresh(), followed by Filter() instead")] + public static System.IObservable> FilterOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.Func predicate, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where T : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable> ForEachItemChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable>> GroupOn(this System.IObservable> source, System.Func groupSelector, System.IObservable? regrouper = null) + where TObject : notnull + where TGroup : notnull { } + public static System.IObservable>> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TGroupKey : notnull { } + public static System.IObservable> LimitSizeTo(this DynamicData.Reactive.ISourceList source, int sizeLimit, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.Reactive.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.Reactive.IObservableList>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.Reactive.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where T : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where T : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where T : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> Page(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Reactive.ISourceList destination) + where T : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where T : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> RemoveIndex(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Reverse(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerChanged, DynamicData.Reactive.SortOptions options = 0, System.IObservable? resort = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.Reactive.SortOptions options = 0, System.IObservable? resort = null, System.IObservable>? comparerChanged = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where T : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where T : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func expireAfter, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func expireAfter, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func? expireAfter, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func? expireAfter, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + where T : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Reactive.Binding.SortDirection sortOrder = 0) + where TObject : notnull { } + public static System.IObservable> Top(this System.IObservable> source, int numberOfItems) + where T : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, int, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.Reactive.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.Reactive.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.Reactive.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + } + public class PageContext : System.IEquatable> + { + public PageContext(DynamicData.Reactive.Operators.IPageResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.Reactive.SortAndPageOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.Reactive.SortAndPageOptions Options { get; init; } + public DynamicData.Reactive.Operators.IPageResponse Response { get; init; } + } + public sealed class PageRequest : DynamicData.Reactive.IPageRequest, System.IEquatable + { + public static readonly DynamicData.Reactive.IPageRequest Default; + public static readonly DynamicData.Reactive.IPageRequest Empty; + public PageRequest() { } + public PageRequest(int page, int size) { } + public int Page { get; } + public int Size { get; } + public static System.Collections.Generic.IEqualityComparer DefaultComparer { get; } + public bool Equals(DynamicData.Reactive.IPageRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class RangeChange : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public RangeChange(System.Collections.Generic.IEnumerable items, int index = -1) { } + public int Count { get; } + public int Index { get; } + public static DynamicData.Reactive.RangeChange Empty { get; } + public void Add(T item) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public void Insert(int index, T item) { } + public void SetStartingIndex(int index) { } + public override string ToString() { } + } + public readonly struct SortAndPageOptions : System.IEquatable + { + public SortAndPageOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + public readonly struct SortAndVirtualizeOptions : System.IEquatable + { + public SortAndVirtualizeOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + [System.Serializable] + public class SortException : System.Exception + { + public SortException() { } + public SortException(string message) { } + public SortException(string message, System.Exception innerException) { } + } + [System.Flags] + public enum SortOptimisations + { + None = 0, + ComparesImmutableValuesOnly = 1, + IgnoreEvaluates = 2, + [System.Obsolete("This is no longer being used. Use one of the other options instead.")] + InsertAtEndThenSort = 3, + } + public enum SortOptions + { + None = 0, + UseBinarySearch = 1, + } + public enum SortReason + { + InitialLoad = 0, + ComparerChanged = 1, + DataChanged = 2, + Reorder = 3, + Reset = 4, + } + public static class SourceCacheEx + { + public static System.IObservable> Cast(this DynamicData.Reactive.IObservableCache source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class SourceCache : DynamicData.Reactive.Binding.INotifyCollectionChangedSuspender, DynamicData.Reactive.IConnectableCache, DynamicData.Reactive.IObservableCache, DynamicData.Reactive.ISourceCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SourceCache(System.Func keySelector) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Func KeySelector { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public static class SourceListEditConvenienceEx + { + public static void Add(this DynamicData.Reactive.ISourceList source, T item) + where T : notnull { } + public static void AddRange(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable items) + where T : notnull { } + public static void Clear(this DynamicData.Reactive.ISourceList source) + where T : notnull { } + public static void EditDiff(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where T : notnull { } + public static void Insert(this DynamicData.Reactive.ISourceList source, int index, T item) + where T : notnull { } + public static void InsertRange(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable items, int index) + where T : notnull { } + public static void Move(this DynamicData.Reactive.ISourceList source, int original, int destination) + where T : notnull { } + public static bool Remove(this DynamicData.Reactive.ISourceList source, T item) + where T : notnull { } + public static void RemoveAt(this DynamicData.Reactive.ISourceList source, int index) + where T : notnull { } + public static void RemoveMany(this DynamicData.Reactive.ISourceList source, System.Collections.Generic.IEnumerable itemsToRemove) + where T : notnull { } + public static void RemoveRange(this DynamicData.Reactive.ISourceList source, int index, int count) + where T : notnull { } + public static void Replace(this DynamicData.Reactive.ISourceList source, T original, T destination) + where T : notnull { } + public static void ReplaceAt(this DynamicData.Reactive.ISourceList source, int index, T item) + where T : notnull { } + } + public static class SourceListEx + { + public static System.IObservable> Cast(this DynamicData.Reactive.ISourceList source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceList<{typeof(T).Name}> ({Count} Items)")] + public sealed class SourceList : DynamicData.Reactive.IObservableList, DynamicData.Reactive.ISourceList, System.IDisposable + where T : notnull + { + public SourceList(System.IObservable>? source = null) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.IObservable> Connect(System.Func? predicate = null) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + } + public struct TransformAsyncOptions : System.IEquatable + { + public static readonly DynamicData.Reactive.TransformAsyncOptions Default; + public TransformAsyncOptions(int? MaximumConcurrency, bool TransformOnRefresh) { } + public int? MaximumConcurrency { get; set; } + public bool TransformOnRefresh { get; set; } + } + [System.Serializable] + public class UnspecifiedIndexException : System.Exception + { + public UnspecifiedIndexException() { } + public UnspecifiedIndexException(string message) { } + public UnspecifiedIndexException(string message, System.Exception innerException) { } + } + public class VirtualContext : System.IEquatable> + { + public VirtualContext(DynamicData.Reactive.IVirtualResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.Reactive.SortAndVirtualizeOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.Reactive.SortAndVirtualizeOptions Options { get; init; } + public DynamicData.Reactive.IVirtualResponse Response { get; init; } + } + public class VirtualRequest : DynamicData.Reactive.IVirtualRequest, System.IEquatable + { + public static readonly DynamicData.Reactive.VirtualRequest Default; + public VirtualRequest() { } + public VirtualRequest(int startIndex, int size) { } + public int Size { get; } + public int StartIndex { get; } + public static System.Collections.Generic.IEqualityComparer StartIndexSizeComparer { get; } + public bool Equals(DynamicData.Reactive.IVirtualRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } +} +namespace DynamicData.Reactive.Diagnostics +{ + public class ChangeStatistics : System.IEquatable + { + public ChangeStatistics() { } + public ChangeStatistics(int Index, int Adds, int Updates, int Removes, int Refreshes, int Moves, int Count) { } + public int Adds { get; init; } + public int Count { get; init; } + public int Index { get; init; } + public System.DateTime LastUpdated { get; } + public int Moves { get; init; } + public int Refreshes { get; init; } + public int Removes { get; init; } + public int Updates { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public class ChangeSummary + { + public static readonly DynamicData.Reactive.Diagnostics.ChangeSummary Empty; + public ChangeSummary(int index, DynamicData.Reactive.Diagnostics.ChangeStatistics latest, DynamicData.Reactive.Diagnostics.ChangeStatistics overall) { } + public DynamicData.Reactive.Diagnostics.ChangeStatistics Latest { get; } + public DynamicData.Reactive.Diagnostics.ChangeStatistics Overall { get; } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public static class DiagnosticOperators + { + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull { } + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Reactive.Experimental +{ + public static class ExperimentalEx + { + public static DynamicData.Reactive.Experimental.IWatcher AsWatcher(this System.IObservable> source, System.Reactive.Concurrency.IScheduler? scheduler = null) + where TObject : notnull + where TKey : notnull { } + } + public interface IWatcher : System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.IObservable> Watch(TKey key); + } +} +namespace DynamicData.Reactive.Kernel +{ + public enum ConnectionStatus + { + Pending = 0, + Loaded = 1, + Errored = 2, + Completed = 3, + } + public static class EnumerableEx + { + public static T[] AsArray(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.List AsList(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.IEnumerable Duplicates(this System.Collections.Generic.IEnumerable source, System.Func valueSelector) { } + public static System.Collections.Generic.IEnumerable> IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind) { } + public static System.Collections.Generic.IEnumerable IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind, System.Func resultSelector) { } + } + public sealed class Error : DynamicData.Reactive.IKeyValue, DynamicData.Reactive.IKey, System.IEquatable> + where TKey : notnull + { + public Error(System.Exception? exception, TObject value, TKey key) { } + public System.Exception? Exception { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.Reactive.Kernel.Error? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Reactive.Kernel.Error left, DynamicData.Reactive.Kernel.Error right) { } + public static bool operator ==(DynamicData.Reactive.Kernel.Error left, DynamicData.Reactive.Kernel.Error right) { } + } + public static class InternalEx + { + public static System.IObservable RetryWithBackOff(this System.IObservable source, System.Func backOffStrategy) + where TException : System.Exception { } + public static System.IDisposable ScheduleRecurringAction(this System.Reactive.Concurrency.IScheduler scheduler, System.Func interval, System.Action action) { } + public static System.IDisposable ScheduleRecurringAction(this System.Reactive.Concurrency.IScheduler scheduler, System.TimeSpan interval, System.Action action) { } + } + public readonly struct ItemWithIndex : System.IEquatable> + { + public ItemWithIndex(T Item, int Index) { } + public int Index { get; init; } + public T Item { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct ItemWithValue : System.IEquatable> + { + public ItemWithValue(TObject Item, TValue Value) { } + public TObject Item { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class OptionElse + { + public void Else(System.Action action) { } + } + public static class OptionExtensions + { + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static TDestination? ConvertOr(this in ReactiveUI.Primitives.Optional source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static ReactiveUI.Primitives.Optional FirstOrOptional(this System.Collections.Generic.IEnumerable source, System.Func selector) + where T : notnull { } + public static DynamicData.Reactive.Kernel.OptionElse IfHasValue(this ReactiveUI.Primitives.Optional? source, System.Action action) + where T : notnull { } + public static DynamicData.Reactive.Kernel.OptionElse IfHasValue(this in ReactiveUI.Primitives.Optional source, System.Action action) + where T : notnull { } + public static ReactiveUI.Primitives.Optional Lookup(this System.Collections.Generic.IDictionary source, TKey key) + where TValue : notnull { } + public static ReactiveUI.Primitives.Optional OrElse(this in ReactiveUI.Primitives.Optional source, System.Func> fallbackOperation) + where T : notnull { } + public static bool RemoveIfContained(this System.Collections.Generic.IDictionary source, TKey key) { } + public static System.Collections.Generic.IEnumerable SelectValues(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + public static T ValueOr(this T? source, T defaultValue) + where T : struct { } + public static T ValueOr(this in ReactiveUI.Primitives.Optional source, System.Func valueSelector) + where T : notnull { } + public static T? ValueOrDefault(this in ReactiveUI.Primitives.Optional source) + where T : notnull { } + public static T ValueOrThrow(this in ReactiveUI.Primitives.Optional source, System.Func exceptionGenerator) + where T : notnull { } + } + public static class OptionObservableExtensions + { + public static System.IObservable> Convert(this System.IObservable> source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Convert(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable ConvertOr(this System.IObservable> source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static System.IObservable> OnHasNoValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OnHasValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OrElse(this System.IObservable> source, System.Func> fallbackOperation) + where T : notnull { } + public static System.IObservable SelectValues(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOr(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable ValueOrDefault(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOrThrow(this System.IObservable> source, System.Func exceptionGenerator) + where T : notnull { } + } +} +namespace DynamicData.Reactive.List +{ + public interface IGrouping + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + } +} +namespace DynamicData.Reactive.Operators +{ + public interface IPageResponse + { + int Page { get; } + int PageSize { get; } + int Pages { get; } + int TotalSize { get; } + } +} +namespace DynamicData.Reactive.PLinq +{ + public static class ParallelOperators + { + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.Reactive.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + } + public enum ParallelType + { + None = 0, + Parallelise = 1, + Ordered = 2, + } + public class ParallelisationOptions + { + public static readonly DynamicData.Reactive.PLinq.ParallelisationOptions Default; + public static readonly DynamicData.Reactive.PLinq.ParallelisationOptions None; + public ParallelisationOptions(DynamicData.Reactive.PLinq.ParallelType type = 0, int threshold = 0, int maxDegreeOfParallelisation = 0) { } + public int MaxDegreeOfParallelisation { get; } + public int Threshold { get; } + public DynamicData.Reactive.PLinq.ParallelType Type { get; } + } +} +namespace DynamicData.Reactive.Tests +{ + public class ChangeSetAggregator : System.IDisposable + where TObject : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableList Data { get; } + public System.Exception? Exception { get; set; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public class DistinctChangeSetAggregator : System.IDisposable + where TValue : notnull + { + public DistinctChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class GroupChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull + { + public GroupChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache, TGroupKey> Data { get; } + public System.Exception? Error { get; } + public DynamicData.Reactive.IObservableCache, TGroupKey> Groups { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IReadOnlyList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + } + public static class ListTextEx + { + public static DynamicData.Reactive.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where T : notnull { } + } + public class PagedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public PagedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class SortedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SortedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public static class TestEx + { + public static DynamicData.Reactive.Tests.DistinctChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull { } + public static DynamicData.Reactive.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.PagedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.SortedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.VirtualChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Reactive.Tests.GroupChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull + where TKey : notnull + where TGroupKey : notnull { } + } + public class VirtualChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public VirtualChangeSetAggregator(System.IObservable> source) { } + public DynamicData.Reactive.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Reactive.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } +} diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet10_0.verified.txt b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet10_0.verified.txt new file mode 100644 index 000000000..673d8b3d8 --- /dev/null +++ b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet10_0.verified.txt @@ -0,0 +1,3079 @@ +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Benchmarks")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Reactive.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")] +namespace DynamicData.Aggregation +{ + public readonly struct AggregateItem : System.IEquatable> + { + public AggregateItem(DynamicData.Aggregation.AggregateType Type, TObject Item) { } + public TObject Item { get; init; } + public DynamicData.Aggregation.AggregateType Type { get; init; } + public override int GetHashCode() { } + } + public enum AggregateType + { + Add = 0, + Remove = 1, + } + public static class AggregationEx + { + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + } + public static class AvgEx + { + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + } + public static class CountEx + { + public static System.IObservable Count(this System.IObservable> source) { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + } + public interface IAggregateChangeSet : System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable { } + public static class MaxEx + { + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + } + public static class StdDevEx + { + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal fallbackValue) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where TObject : notnull + where TKey : notnull { } + } + public static class SumEx + { + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Alias +{ + public static class ObservableCacheAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> SelectTree(this System.IObservable> source, System.Func pivotOn) + where TObject : class + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func filter) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicate) + where T : notnull { } + } +} +namespace DynamicData.Binding +{ + public abstract class AbstractNotifyPropertyChanged : System.ComponentModel.INotifyPropertyChanged + { + protected AbstractNotifyPropertyChanged() { } + public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; + protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, System.Collections.Generic.IEqualityComparer? comparer, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T> : DynamicData.IChangeSetAdaptor + where T : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.IChangeSet changes) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.IChangeSet changes) { } + } + public static class BindingListEx + { + public static System.IObservable> ObserveCollectionChanges(this System.ComponentModel.IBindingList source) { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.ComponentModel.BindingList source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.ComponentModel.IBindingList, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.ComponentModel.BindingList source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public struct BindingOptions : System.IEquatable + { + public const bool DefaultResetOnFirstTimeLoad = true; + public const int DefaultResetThreshold = 25; + public const bool DefaultUseReplaceForUpdates = true; + public BindingOptions(int ResetThreshold, bool UseReplaceForUpdates = true, bool ResetOnFirstTimeLoad = true) { } + public bool ResetOnFirstTimeLoad { get; set; } + public int ResetThreshold { get; set; } + public bool UseReplaceForUpdates { get; set; } + public static DynamicData.Binding.BindingOptions NeverFireReset(bool useReplaceForUpdates = true) { } + } + public interface IEvaluateAware + { + void Evaluate(); + } + public interface IIndexAware + { + int Index { get; set; } + } + public interface INotifyCollectionChangedSuspender + { + System.IDisposable SuspendCount(); + System.IDisposable SuspendNotifications(); + } + public interface IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.IChangeSet changes, DynamicData.Binding.IObservableCollection collection); + } + public interface IObservableCollection : DynamicData.Binding.INotifyCollectionChangedSuspender, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + void Load(System.Collections.Generic.IEnumerable items); + void Move(int oldIndex, int newIndex); + } + public static class IObservableListEx + { + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.IObservableList observableList) + where TObject : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + } + public interface ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.ISortedChangeSet changes, DynamicData.Binding.IObservableCollection collection); + } + public static class NotifyPropertyChangedEx + { + public static System.IObservable WhenAnyPropertyChanged(this TObject source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Func resultSelector, System.Func? p1Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Linq.Expressions.Expression> p6, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null, System.Func? p6Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + } + public class ObservableCollectionAdaptor : DynamicData.IChangeSetAdaptor + where T : notnull + { + public ObservableCollectionAdaptor(DynamicData.Binding.IObservableCollection collection) { } + public ObservableCollectionAdaptor(DynamicData.Binding.IObservableCollection collection, DynamicData.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(DynamicData.Binding.IObservableCollection collection, int refreshThreshold, bool allowReplace = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.IChangeSet changes) { } + } + public class ObservableCollectionAdaptor : DynamicData.Binding.IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public ObservableCollectionAdaptor(DynamicData.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(int refreshThreshold = 25, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.IChangeSet changes, DynamicData.Binding.IObservableCollection collection) { } + } + public static class ObservableCollectionEx + { + public static System.IObservable> ObserveCollectionChanges(this System.Collections.Specialized.INotifyCollectionChanged source) { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public class ObservableCollectionExtended : System.Collections.ObjectModel.ObservableCollection, DynamicData.Binding.INotifyCollectionChangedSuspender, DynamicData.Binding.IObservableCollection, DynamicData.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + public ObservableCollectionExtended() { } + public ObservableCollectionExtended(System.Collections.Generic.IEnumerable collection) { } + public ObservableCollectionExtended(System.Collections.Generic.List list) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public void Load(System.Collections.Generic.IEnumerable items) { } + protected override void OnCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { } + protected override void OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs e) { } + public void RemoveRange(int index, int count) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + } + public sealed class PropertyValue : System.IEquatable> + { + public PropertyValue(TObject sender, TValue value) { } + public PropertyValue(TObject Sender, TValue? Value, bool UnobtainableValue) { } + public TObject Sender { get; init; } + public bool UnobtainableValue { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct SortAndBindOptions : System.IEquatable + { + public SortAndBindOptions() { } + public int InitialCapacity { get; init; } + public bool ResetOnFirstTimeLoad { get; init; } + public int ResetThreshold { get; init; } + public ReactiveUI.Primitives.Concurrency.ISequencer? Scheduler { get; init; } + public bool UseBinarySearch { get; init; } + public bool UseReplaceForUpdates { get; init; } + } + public enum SortDirection + { + Ascending = 0, + Descending = 1, + } + public class SortExpressionComparer : System.Collections.Generic.List>, System.Collections.Generic.IComparer + { + public SortExpressionComparer() { } + public int Compare(T? x, T? y) { } + public DynamicData.Binding.SortExpressionComparer ThenByAscending(System.Func expression) { } + public DynamicData.Binding.SortExpressionComparer ThenByDescending(System.Func expression) { } + public static DynamicData.Binding.SortExpressionComparer Ascending(System.Func expression) { } + public static DynamicData.Binding.SortExpressionComparer Descending(System.Func expression) { } + } + public class SortExpression + { + public SortExpression(System.Func expression, DynamicData.Binding.SortDirection direction = 0) { } + public DynamicData.Binding.SortDirection Direction { get; } + public System.Func Expression { get; } + } + public class SortedBindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedBindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.ISortedChangeSet changes) { } + } + public class SortedObservableCollectionAdaptor : DynamicData.Binding.ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedObservableCollectionAdaptor() { } + public SortedObservableCollectionAdaptor(DynamicData.Binding.BindingOptions options) { } + public SortedObservableCollectionAdaptor(int refreshThreshold, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.ISortedChangeSet changes, DynamicData.Binding.IObservableCollection collection) { } + } +} +namespace DynamicData.Cache.Internal +{ + public enum CombineOperator + { + And = 0, + Or = 1, + Xor = 2, + Except = 3, + } + [System.Serializable] + public class KeySelectorException : System.Exception + { + public KeySelectorException() { } + public KeySelectorException(string message) { } + public KeySelectorException(string message, System.Exception innerException) { } + } + [System.Diagnostics.DebuggerDisplay("LockFreeObservableCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Ite" + + "ms)")] + public sealed class LockFreeObservableCache : DynamicData.IConnectableCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public LockFreeObservableCache() { } + public LockFreeObservableCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> editAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IObservable> Watch(TKey key) { } + } +} +namespace DynamicData +{ + public sealed class ChangeAwareCache : DynamicData.ICache, DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + public ChangeAwareCache() { } + public ChangeAwareCache(System.Collections.Generic.Dictionary data) { } + public ChangeAwareCache(int capacity) { } + public int Count { get; } + public System.Collections.Generic.IEnumerable Items { get; } + public System.Collections.Generic.IEnumerable> KeyValues { get; } + public System.Collections.Generic.IEnumerable Keys { get; } + public void Add(TObject item, TKey key) { } + public void AddOrUpdate(TObject item, TKey key) { } + public DynamicData.ChangeSet CaptureChanges() { } + public void Clear() { } + public void Clone(DynamicData.IChangeSet changes) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public void Refresh() { } + public void Refresh(System.Collections.Generic.IEnumerable keys) { } + public void Refresh(TKey key) { } + public void Remove(System.Collections.Generic.IEnumerable keys) { } + public void Remove(TKey key) { } + } + public class ChangeAwareList : DynamicData.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + where T : notnull + { + public ChangeAwareList(System.Collections.Generic.IEnumerable items) { } + public ChangeAwareList(int capacity = -1) { } + public ChangeAwareList(DynamicData.ChangeAwareList list, bool copyChanges) { } + public int Capacity { get; set; } + public int Count { get; } + public bool IsReadOnly { get; } + public T this[int index] { get; set; } + public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public DynamicData.IChangeSet CaptureChanges() { } + public virtual void Clear() { } + public virtual bool Contains(T item) { } + public void CopyTo(T[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public int IndexOf(T item) { } + public int IndexOf(T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public void Insert(int index, T item) { } + protected virtual void InsertItem(int index, T item) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public virtual void Move(T item, int destination) { } + public virtual void Move(int original, int destination) { } + protected virtual void OnInsertItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnRemoveItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnSetItem(int index, T newItem, T oldItem) { } + public bool Refresh(T item) { } + public void Refresh(T item, int index) { } + public void RefreshAt(int index) { } + public bool Remove(T item) { } + public void RemoveAt(int index) { } + protected void RemoveItem(int index) { } + protected virtual void RemoveItem(int index, T item) { } + public void RemoveRange(int index, int count) { } + protected virtual void SetItem(int index, T item) { } + } + public enum ChangeReason + { + Add = 0, + Update = 1, + Remove = 2, + Refresh = 3, + Moved = 4, + } + public static class ChangeSetEx + { + public static System.Collections.Generic.IEnumerable> Flatten(this DynamicData.IChangeSet source) + where T : notnull { } + public static DynamicData.ChangeType GetChangeType(this DynamicData.ListChangeReason source) { } + public static DynamicData.IChangeSet Transform(this DynamicData.IChangeSet source, System.Func transformer) + where TSource : notnull + where TDestination : notnull { } + public static System.Collections.Generic.IEnumerable> YieldWithoutIndex(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + public static readonly DynamicData.IChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> items) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Replaced { get; } + public int TotalChanges { get; } + public override string ToString() { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public static readonly DynamicData.ChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Updates { get; } + public override string ToString() { } + } + public sealed class ChangeSet : DynamicData.ChangeSet, DynamicData.IChangeSet, DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public ChangeSet(TContext context) { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection, TContext context) { } + public ChangeSet(int capacity, TContext context) { } + public TContext Context { get; } + } + public enum ChangeType + { + Item = 0, + Range = 1, + } + public sealed class Change : System.IEquatable> + where T : notnull + { + public Change(DynamicData.ListChangeReason reason, System.Collections.Generic.IEnumerable items, int index = -1) { } + public Change(DynamicData.ListChangeReason reason, T current, int index = -1) { } + public Change(T current, int currentIndex, int previousIndex) { } + public Change(DynamicData.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public DynamicData.ItemChange Item { get; } + public DynamicData.RangeChange Range { get; } + public DynamicData.ListChangeReason Reason { get; } + public DynamicData.ChangeType Type { get; } + public bool Equals(DynamicData.Change? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Change left, DynamicData.Change right) { } + public static bool operator ==(DynamicData.Change left, DynamicData.Change right) { } + } + public readonly struct Change : System.IEquatable> + where TObject : notnull + where TKey : notnull + { + public Change(DynamicData.ChangeReason reason, TKey key, TObject current, int index = -1) { } + public Change(TKey key, TObject current, int currentIndex, int previousIndex) { } + public Change(DynamicData.ChangeReason reason, TKey key, TObject current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public TObject Current { get; } + public int CurrentIndex { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.ChangeReason Reason { get; } + public bool Equals(DynamicData.Change other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.Change left, in DynamicData.Change right) { } + public static bool operator ==(in DynamicData.Change left, in DynamicData.Change right) { } + } + public static class DynamicDataOptions + { + public static DynamicData.Binding.BindingOptions Binding { get; set; } + public static DynamicData.Binding.SortAndBindOptions SortAndBind { get; set; } + } + public static class EnumerableEx + { + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, bool completable = false) + where TObject : notnull { } + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, System.Func keySelector, bool completable = false) + where TObject : notnull + where TKey : notnull { } + } + public interface ICacheUpdater : DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable> keyValuePairs); + void AddOrUpdate(System.Collections.Generic.KeyValuePair item); + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.IChangeSet changes); + TKey GetKey(TObject item); + System.Collections.Generic.IEnumerable> GetKeyValues(System.Collections.Generic.IEnumerable items); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable> items); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(System.Collections.Generic.KeyValuePair item); + void Remove(TKey key); + void RemoveKey(TKey key); + void RemoveKeys(System.Collections.Generic.IEnumerable key); + [System.Obsolete("Use Clone()")] + void Update(DynamicData.IChangeSet changes); + } + public interface ICache : DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.IChangeSet changes); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(TKey key); + } + public interface IChangeSet + { + int Adds { get; } + int Capacity { get; set; } + int Count { get; } + int Moves { get; } + int Refreshes { get; } + int Removes { get; } + } + public interface IChangeSetAdaptor + where T : notnull + { + void Adapt(DynamicData.IChangeSet changes); + } + public interface IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.IChangeSet changes); + } + public interface IChangeSet : DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + { + int Replaced { get; } + int TotalChanges { get; } + } + public interface IChangeSet : DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + int Updates { get; } + } + public interface IChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + TContext Context { get; } + } + public interface IConnectableCache + where TObject : notnull + where TKey : notnull + { + System.IObservable CountChanged { get; } + System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true); + System.IObservable> Preview(System.Func? predicate = null); + System.IObservable> Watch(TKey key); + } + public interface IDistinctChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull { } + public interface IExtendedList : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + { + void AddRange(System.Collections.Generic.IEnumerable collection); + void InsertRange(System.Collections.Generic.IEnumerable collection, int index); + void Move(int original, int destination); + void RemoveRange(int index, int count); + } + public interface IGroupChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IGroup + where TObject : notnull + { + TGroup GroupKey { get; } + DynamicData.IObservableList List { get; } + } + public interface IGroup : DynamicData.IKey + where TObject : notnull + where TKey : notnull + { + DynamicData.IObservableCache Cache { get; } + } + public interface IGrouping + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IImmutableGroupChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IIntermediateCache : DynamicData.IConnectableCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + void Edit(System.Action> updateAction); + } + public interface IKeyValueCollection : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyList>, System.Collections.IEnumerable + { + System.Collections.Generic.IComparer> Comparer { get; } + DynamicData.SortOptimisations Optimisations { get; } + DynamicData.SortReason SortReason { get; } + } + public interface IKeyValue : DynamicData.IKey + { + TObject Value { get; } + } + public interface IKey + { + T Key { get; } + } + public interface IObservableCache : DynamicData.IConnectableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + int Count { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + System.Collections.Generic.IReadOnlyList Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IObservableList : System.IDisposable + where T : notnull + { + int Count { get; } + System.IObservable CountChanged { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.IObservable> Connect(System.Func? predicate = null); + System.IObservable> Preview(System.Func? predicate = null); + } + public interface IPageChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.Operators.IPageResponse Response { get; } + } + public interface IPageRequest + { + int Page { get; } + int Size { get; } + } + public interface IPagedChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, DynamicData.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Operators.IPageResponse Response { get; } + } + public interface IQuery + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.ISortedChangeSet changes); + } + public interface ISortedChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.IKeyValueCollection SortedItems { get; } + } + public interface ISourceCache : DynamicData.IConnectableCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.Func KeySelector { get; } + void Edit(System.Action> updateAction); + } + public interface ISourceList : DynamicData.IObservableList, System.IDisposable + where T : notnull + { + void Edit(System.Action> updateAction); + } + public interface ISourceUpdater : DynamicData.ICacheUpdater, DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable items); + void AddOrUpdate(TObject item); + void AddOrUpdate(System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer comparer); + void AddOrUpdate(TObject item, System.Collections.Generic.IEqualityComparer comparer); + void Load(System.Collections.Generic.IEnumerable items); + void Refresh(System.Collections.Generic.IEnumerable items); + void Refresh(TObject item); + void Remove(System.Collections.Generic.IEnumerable items); + void Remove(TObject item); + } + public interface IVirtualChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.IVirtualResponse Response { get; } + } + public interface IVirtualChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, DynamicData.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.IVirtualResponse Response { get; } + } + public interface IVirtualRequest + { + int Size { get; } + int StartIndex { get; } + } + public interface IVirtualResponse + { + int Size { get; } + int StartIndex { get; } + int TotalSize { get; } + } + public sealed class IndexedItem : System.IEquatable> + { + public IndexedItem(TObject value, TKey key, int index) { } + public int Index { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.IndexedItem? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + [System.Diagnostics.DebuggerDisplay("IntermediateCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class IntermediateCache : DynamicData.Binding.INotifyCollectionChangedSuspender, DynamicData.IConnectableCache, DynamicData.IIntermediateCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public IntermediateCache() { } + public IntermediateCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public readonly struct ItemChange : System.IEquatable> + where T : notnull + { + public static readonly DynamicData.ItemChange Empty; + public ItemChange(DynamicData.ListChangeReason reason, T current, int currentIndex) { } + public ItemChange(DynamicData.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public T Current { get; } + public int CurrentIndex { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.ListChangeReason Reason { get; } + public bool Equals(DynamicData.ItemChange other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.ItemChange left, in DynamicData.ItemChange right) { } + public static bool operator ==(in DynamicData.ItemChange left, in DynamicData.ItemChange right) { } + } + public enum ListChangeReason + { + Add = 0, + AddRange = 1, + Replace = 2, + Remove = 3, + RemoveRange = 4, + Refresh = 5, + Moved = 6, + Clear = 7, + } + public static class ListEx + { + public static void Add(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddOrInsertRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value, System.Collections.Generic.IComparer comparer) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TSearch value, System.Func comparer) { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.IChangeSet changes) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.IChangeSet changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable> changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item) { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public static ReactiveUI.Primitives.Optional> IndexOfOptional(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer? equalityComparer = null) { } + public static void Remove(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void RemoveMany(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable itemsToRemove) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith, System.Collections.Generic.IEqualityComparer comparer) { } + public static void ReplaceOrAdd(this System.Collections.Generic.IList source, T original, T replaceWith) { } + } + public enum ListFilterPolicy + { + ClearAndReplace = 0, + CalculateDiff = 1, + } + [System.Serializable] + public class MissingKeyException : System.Exception + { + public MissingKeyException() { } + public MissingKeyException(string message) { } + public MissingKeyException(string message, System.Exception innerException) { } + } + public class Node : System.IDisposable, System.IEquatable> + where TObject : class + where TKey : notnull + { + public Node(TObject item, TKey key) { } + public Node(TObject item, TKey key, in ReactiveUI.Primitives.Optional> parent) { } + public DynamicData.IObservableCache, TKey> Children { get; } + public int Depth { get; } + public bool IsRoot { get; } + public TObject Item { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional> Parent { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + public bool Equals(DynamicData.Node? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Node left, DynamicData.Node right) { } + public static bool operator ==(DynamicData.Node? left, DynamicData.Node? right) { } + } + public static class ObservableCacheEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.IChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.ISortedChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.IIntermediateCache source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, TObject item, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.IObservableCache AsObservableCache(this DynamicData.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.IObservableCache AsObservableCache(this System.IObservable> source, bool applyLocking = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AsyncDisposeMany(this System.IObservable> source, System.Action> disposalsCompletedAccessor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Batch(this System.IObservable> source, System.TimeSpan timeSpan, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.IObservable? timer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, System.TimeSpan? timeOut = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.IObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, int refreshThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.ISortedObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Binding.IObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Binding.ISortedObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static void Clear(this DynamicData.Cache.Internal.LockFreeObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.IIntermediateCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.ICollection target) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This was an experiment that did not work. Use Transform instead")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static void EditDiff(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void EditDiff(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Func areItemsEqual) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EnsureUniqueKeys(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, ReactiveUI.Primitives.Concurrency.ISequencer scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> ExpireAfter(this DynamicData.ISourceCache source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval, ReactiveUI.Primitives.Concurrency.ISequencer scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterImmutable(this System.IObservable> source, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This can cause unhandled exception issues so do not use")] + public static System.IObservable FinallySafe(this System.IObservable source, System.Action finallyAction) { } + public static System.IObservable> Flatten(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelector, System.IObservable> resultGroupSource) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable regrouper) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> IgnoreSameReferenceUpdate(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IgnoreUpdateWhen(this System.IObservable> source, System.Func ignoreFunction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IncludeUpdateWhen(this System.IObservable> source, System.Func includeFunction) + where TObject : notnull + where TKey : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, [System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] System.Func, TLeft, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InvokeEvaluate(this System.IObservable> source) + where TObject : DynamicData.Binding.IEvaluateAware + where TKey : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LimitSizeTo(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> LimitSizeTo(this DynamicData.ISourceCache source, int sizeLimit, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MonitorStatus(this System.IObservable source) { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OfType(this System.IObservable> source, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndPage as it\'s more efficient")] + public static System.IObservable> Page(this System.IObservable> source, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.ISourceCache source, System.IObservable> observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.ISourceCache source, System.IObservable observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Cache.Internal.LockFreeObservableCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.IIntermediateCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.ISourceCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source, System.Func> itemChangedTrigger) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.IIntermediateCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.IIntermediateCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RemoveKey(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKey(this DynamicData.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKeys(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests, DynamicData.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests, DynamicData.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests, DynamicData.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests, DynamicData.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortBy(this System.IObservable> source, System.Func expression, DynamicData.Binding.SortDirection sortOrder = 0, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item) + where TObject : DynamicData.IKey + where TKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, bool initialOptionalWhenMissing, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Binding.SortDirection sortOrder = 0) + where TObject : notnull + where TKey : notnull + where TSortKey : notnull { } + [System.Obsolete("Use Overload with comparer as it\'s more efficient")] + public static System.IObservable> Top(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> Top(this System.IObservable> source, System.Collections.Generic.IComparer comparer, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformImmutable(this System.IObservable> source, System.Func transformFactory) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> TransformToTree(this System.IObservable> source, System.Func pivotOn, System.IObservable, bool>>? predicateChanged = null) + where TObject : class + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TreatMovesAsRemoveAdd(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable> UpdateIndex(this System.IObservable> source) + where TObject : DynamicData.Binding.IIndexAware + where TKey : notnull { } + [System.Obsolete("Use SortAndVirtualize as it\'s more efficient")] + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Watch(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this DynamicData.IObservableCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableChangeSet + { + public static System.IObservable> Create(System.Func, System.Action> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Action> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.IChangeSetAdaptor adaptor) + where T : notnull { } + public static System.IObservable> AddKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static DynamicData.IObservableList AsObservableList(this DynamicData.ISourceList source) + where T : notnull { } + public static DynamicData.IObservableList AsObservableList(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection targetCollection, DynamicData.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection targetCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Cast(this System.IObservable> source) + where TDestination : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> CastToObject(this System.IObservable> source) + where T : class { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.IList target) + where T : notnull { } + [System.Obsolete("Prefer Cast as it is does the same thing but is semantically correct")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.IObservableList source) + where T : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TValue : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> ExpireAfter(this DynamicData.ISourceList source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicate, DynamicData.ListFilterPolicy filterPolicy = 1) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, DynamicData.ListFilterPolicy filterPolicy = 1, bool suppressEmptyChangeSets = true) + where T : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> objectFilterObservable, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull { } + [System.Obsolete("Use AutoRefresh(), followed by Filter() instead")] + public static System.IObservable> FilterOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.Func predicate, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where T : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable> ForEachItemChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable>> GroupOn(this System.IObservable> source, System.Func groupSelector, System.IObservable? regrouper = null) + where TObject : notnull + where TGroup : notnull { } + public static System.IObservable>> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TGroupKey : notnull { } + public static System.IObservable> LimitSizeTo(this DynamicData.ISourceList source, int sizeLimit, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where T : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where T : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where T : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> Page(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.ISourceList destination) + where T : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where T : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> RemoveIndex(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Reverse(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerChanged, DynamicData.SortOptions options = 0, System.IObservable? resort = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.SortOptions options = 0, System.IObservable? resort = null, System.IObservable>? comparerChanged = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where T : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where T : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func expireAfter, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func expireAfter, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func? expireAfter, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func? expireAfter, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Binding.SortDirection sortOrder = 0) + where TObject : notnull { } + public static System.IObservable> Top(this System.IObservable> source, int numberOfItems) + where T : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, int, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + } + public class PageContext : System.IEquatable> + { + public PageContext(DynamicData.Operators.IPageResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.SortAndPageOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.SortAndPageOptions Options { get; init; } + public DynamicData.Operators.IPageResponse Response { get; init; } + } + public sealed class PageRequest : DynamicData.IPageRequest, System.IEquatable + { + public static readonly DynamicData.IPageRequest Default; + public static readonly DynamicData.IPageRequest Empty; + public PageRequest() { } + public PageRequest(int page, int size) { } + public int Page { get; } + public int Size { get; } + public static System.Collections.Generic.IEqualityComparer DefaultComparer { get; } + public bool Equals(DynamicData.IPageRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class RangeChange : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public RangeChange(System.Collections.Generic.IEnumerable items, int index = -1) { } + public int Count { get; } + public int Index { get; } + public static DynamicData.RangeChange Empty { get; } + public void Add(T item) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public void Insert(int index, T item) { } + public void SetStartingIndex(int index) { } + public override string ToString() { } + } + public readonly struct SortAndPageOptions : System.IEquatable + { + public SortAndPageOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + public readonly struct SortAndVirtualizeOptions : System.IEquatable + { + public SortAndVirtualizeOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + [System.Serializable] + public class SortException : System.Exception + { + public SortException() { } + public SortException(string message) { } + public SortException(string message, System.Exception innerException) { } + } + [System.Flags] + public enum SortOptimisations + { + None = 0, + ComparesImmutableValuesOnly = 1, + IgnoreEvaluates = 2, + [System.Obsolete("This is no longer being used. Use one of the other options instead.")] + InsertAtEndThenSort = 3, + } + public enum SortOptions + { + None = 0, + UseBinarySearch = 1, + } + public enum SortReason + { + InitialLoad = 0, + ComparerChanged = 1, + DataChanged = 2, + Reorder = 3, + Reset = 4, + } + public static class SourceCacheEx + { + public static System.IObservable> Cast(this DynamicData.IObservableCache source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class SourceCache : DynamicData.Binding.INotifyCollectionChangedSuspender, DynamicData.IConnectableCache, DynamicData.IObservableCache, DynamicData.ISourceCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SourceCache(System.Func keySelector) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Func KeySelector { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public static class SourceListEditConvenienceEx + { + public static void Add(this DynamicData.ISourceList source, T item) + where T : notnull { } + public static void AddRange(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable items) + where T : notnull { } + public static void Clear(this DynamicData.ISourceList source) + where T : notnull { } + public static void EditDiff(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where T : notnull { } + public static void Insert(this DynamicData.ISourceList source, int index, T item) + where T : notnull { } + public static void InsertRange(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable items, int index) + where T : notnull { } + public static void Move(this DynamicData.ISourceList source, int original, int destination) + where T : notnull { } + public static bool Remove(this DynamicData.ISourceList source, T item) + where T : notnull { } + public static void RemoveAt(this DynamicData.ISourceList source, int index) + where T : notnull { } + public static void RemoveMany(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable itemsToRemove) + where T : notnull { } + public static void RemoveRange(this DynamicData.ISourceList source, int index, int count) + where T : notnull { } + public static void Replace(this DynamicData.ISourceList source, T original, T destination) + where T : notnull { } + public static void ReplaceAt(this DynamicData.ISourceList source, int index, T item) + where T : notnull { } + } + public static class SourceListEx + { + public static System.IObservable> Cast(this DynamicData.ISourceList source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceList<{typeof(T).Name}> ({Count} Items)")] + public sealed class SourceList : DynamicData.IObservableList, DynamicData.ISourceList, System.IDisposable + where T : notnull + { + public SourceList(System.IObservable>? source = null) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.IObservable> Connect(System.Func? predicate = null) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + } + public struct TransformAsyncOptions : System.IEquatable + { + public static readonly DynamicData.TransformAsyncOptions Default; + public TransformAsyncOptions(int? MaximumConcurrency, bool TransformOnRefresh) { } + public int? MaximumConcurrency { get; set; } + public bool TransformOnRefresh { get; set; } + } + [System.Serializable] + public class UnspecifiedIndexException : System.Exception + { + public UnspecifiedIndexException() { } + public UnspecifiedIndexException(string message) { } + public UnspecifiedIndexException(string message, System.Exception innerException) { } + } + public class VirtualContext : System.IEquatable> + { + public VirtualContext(DynamicData.IVirtualResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.SortAndVirtualizeOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.SortAndVirtualizeOptions Options { get; init; } + public DynamicData.IVirtualResponse Response { get; init; } + } + public class VirtualRequest : DynamicData.IVirtualRequest, System.IEquatable + { + public static readonly DynamicData.VirtualRequest Default; + public VirtualRequest() { } + public VirtualRequest(int startIndex, int size) { } + public int Size { get; } + public int StartIndex { get; } + public static System.Collections.Generic.IEqualityComparer StartIndexSizeComparer { get; } + public bool Equals(DynamicData.IVirtualRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } +} +namespace DynamicData.Diagnostics +{ + public class ChangeStatistics : System.IEquatable + { + public ChangeStatistics() { } + public ChangeStatistics(int Index, int Adds, int Updates, int Removes, int Refreshes, int Moves, int Count) { } + public int Adds { get; init; } + public int Count { get; init; } + public int Index { get; init; } + public System.DateTime LastUpdated { get; } + public int Moves { get; init; } + public int Refreshes { get; init; } + public int Removes { get; init; } + public int Updates { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public class ChangeSummary + { + public static readonly DynamicData.Diagnostics.ChangeSummary Empty; + public ChangeSummary(int index, DynamicData.Diagnostics.ChangeStatistics latest, DynamicData.Diagnostics.ChangeStatistics overall) { } + public DynamicData.Diagnostics.ChangeStatistics Latest { get; } + public DynamicData.Diagnostics.ChangeStatistics Overall { get; } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public static class DiagnosticOperators + { + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull { } + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Experimental +{ + public static class ExperimentalEx + { + public static DynamicData.Experimental.IWatcher AsWatcher(this System.IObservable> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + } + public interface IWatcher : System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.IObservable> Watch(TKey key); + } +} +namespace DynamicData.Kernel +{ + public enum ConnectionStatus + { + Pending = 0, + Loaded = 1, + Errored = 2, + Completed = 3, + } + public static class EnumerableEx + { + public static T[] AsArray(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.List AsList(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.IEnumerable Duplicates(this System.Collections.Generic.IEnumerable source, System.Func valueSelector) { } + public static System.Collections.Generic.IEnumerable> IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind) { } + public static System.Collections.Generic.IEnumerable IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind, System.Func resultSelector) { } + } + public sealed class Error : DynamicData.IKeyValue, DynamicData.IKey, System.IEquatable> + where TKey : notnull + { + public Error(System.Exception? exception, TObject value, TKey key) { } + public System.Exception? Exception { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.Kernel.Error? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Kernel.Error left, DynamicData.Kernel.Error right) { } + public static bool operator ==(DynamicData.Kernel.Error left, DynamicData.Kernel.Error right) { } + } + public static class InternalEx + { + public static System.IObservable RetryWithBackOff(this System.IObservable source, System.Func backOffStrategy) + where TException : System.Exception { } + public static System.IDisposable ScheduleRecurringAction(this ReactiveUI.Primitives.Concurrency.ISequencer scheduler, System.Func interval, System.Action action) { } + public static System.IDisposable ScheduleRecurringAction(this ReactiveUI.Primitives.Concurrency.ISequencer scheduler, System.TimeSpan interval, System.Action action) { } + } + public readonly struct ItemWithIndex : System.IEquatable> + { + public ItemWithIndex(T Item, int Index) { } + public int Index { get; init; } + public T Item { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct ItemWithValue : System.IEquatable> + { + public ItemWithValue(TObject Item, TValue Value) { } + public TObject Item { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class OptionElse + { + public void Else(System.Action action) { } + } + public static class OptionExtensions + { + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static TDestination? ConvertOr(this in ReactiveUI.Primitives.Optional source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static ReactiveUI.Primitives.Optional FirstOrOptional(this System.Collections.Generic.IEnumerable source, System.Func selector) + where T : notnull { } + public static DynamicData.Kernel.OptionElse IfHasValue(this ReactiveUI.Primitives.Optional? source, System.Action action) + where T : notnull { } + public static DynamicData.Kernel.OptionElse IfHasValue(this in ReactiveUI.Primitives.Optional source, System.Action action) + where T : notnull { } + public static ReactiveUI.Primitives.Optional Lookup(this System.Collections.Generic.IDictionary source, TKey key) + where TValue : notnull { } + public static ReactiveUI.Primitives.Optional OrElse(this in ReactiveUI.Primitives.Optional source, System.Func> fallbackOperation) + where T : notnull { } + public static bool RemoveIfContained(this System.Collections.Generic.IDictionary source, TKey key) { } + public static System.Collections.Generic.IEnumerable SelectValues(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + public static T ValueOr(this T? source, T defaultValue) + where T : struct { } + public static T ValueOr(this in ReactiveUI.Primitives.Optional source, System.Func valueSelector) + where T : notnull { } + public static T? ValueOrDefault(this in ReactiveUI.Primitives.Optional source) + where T : notnull { } + public static T ValueOrThrow(this in ReactiveUI.Primitives.Optional source, System.Func exceptionGenerator) + where T : notnull { } + } + public static class OptionObservableExtensions + { + public static System.IObservable> Convert(this System.IObservable> source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Convert(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable ConvertOr(this System.IObservable> source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static System.IObservable> OnHasNoValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OnHasValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OrElse(this System.IObservable> source, System.Func> fallbackOperation) + where T : notnull { } + public static System.IObservable SelectValues(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOr(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable ValueOrDefault(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOrThrow(this System.IObservable> source, System.Func exceptionGenerator) + where T : notnull { } + } +} +namespace DynamicData.List +{ + public interface IGrouping + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + } +} +namespace DynamicData.Operators +{ + public interface IPageResponse + { + int Page { get; } + int PageSize { get; } + int Pages { get; } + int TotalSize { get; } + } +} +namespace DynamicData.PLinq +{ + public static class ParallelOperators + { + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + } + public enum ParallelType + { + None = 0, + Parallelise = 1, + Ordered = 2, + } + public class ParallelisationOptions + { + public static readonly DynamicData.PLinq.ParallelisationOptions Default; + public static readonly DynamicData.PLinq.ParallelisationOptions None; + public ParallelisationOptions(DynamicData.PLinq.ParallelType type = 0, int threshold = 0, int maxDegreeOfParallelisation = 0) { } + public int MaxDegreeOfParallelisation { get; } + public int Threshold { get; } + public DynamicData.PLinq.ParallelType Type { get; } + } +} +namespace DynamicData.Tests +{ + public class ChangeSetAggregator : System.IDisposable + where TObject : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableList Data { get; } + public System.Exception? Exception { get; set; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public class DistinctChangeSetAggregator : System.IDisposable + where TValue : notnull + { + public DistinctChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class GroupChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull + { + public GroupChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache, TGroupKey> Data { get; } + public System.Exception? Error { get; } + public DynamicData.IObservableCache, TGroupKey> Groups { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IReadOnlyList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + } + public static class ListTextEx + { + public static DynamicData.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where T : notnull { } + } + public class PagedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public PagedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class SortedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SortedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public static class TestEx + { + public static DynamicData.Tests.DistinctChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull { } + public static DynamicData.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.PagedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.SortedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.VirtualChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.GroupChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull + where TKey : notnull + where TGroupKey : notnull { } + } + public class VirtualChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public VirtualChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } +} diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet11_0.verified.txt b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet11_0.verified.txt new file mode 100644 index 000000000..abf25e959 --- /dev/null +++ b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet11_0.verified.txt @@ -0,0 +1,3079 @@ +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Benchmarks")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Reactive.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v11.0", FrameworkDisplayName=".NET 11.0")] +namespace DynamicData.Aggregation +{ + public readonly struct AggregateItem : System.IEquatable> + { + public AggregateItem(DynamicData.Aggregation.AggregateType Type, TObject Item) { } + public TObject Item { get; init; } + public DynamicData.Aggregation.AggregateType Type { get; init; } + public override int GetHashCode() { } + } + public enum AggregateType + { + Add = 0, + Remove = 1, + } + public static class AggregationEx + { + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ForAggregation(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + } + public static class AvgEx + { + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where T : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal emptyValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, double emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, float emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, int emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Avg(this System.IObservable> source, System.Func valueSelector, long emptyValue = 0) + where TObject : notnull + where TKey : notnull { } + } + public static class CountEx + { + public static System.IObservable Count(this System.IObservable> source) { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable Count(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable IsNotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + } + public interface IAggregateChangeSet : System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable { } + public static class MaxEx + { + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Maximum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TResult : struct, System.IComparable { } + public static System.IObservable Minimum(this System.IObservable> source, System.Func valueSelector, TResult emptyValue = default) + where TObject : notnull + where TKey : notnull + where TResult : struct, System.IComparable { } + } + public static class StdDevEx + { + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, [System.Runtime.CompilerServices.DecimalConstant(0, 0, 0u, 0u, 0u)] decimal fallbackValue) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue = 0) { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where T : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, decimal fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, double fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, float fallbackValue = 0) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, int fallbackValue) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable StdDev(this System.IObservable> source, System.Func valueSelector, long fallbackValue) + where TObject : notnull + where TKey : notnull { } + } + public static class SumEx + { + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable Sum(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Alias +{ + public static class ObservableCacheAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> SelectTree(this System.IObservable> source, System.Func pivotOn) + where TObject : class + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func filter) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListAlias + { + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> SelectMany(this System.IObservable> source, System.Func> manySelector) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicate) + where T : notnull { } + } +} +namespace DynamicData.Binding +{ + public abstract class AbstractNotifyPropertyChanged : System.ComponentModel.INotifyPropertyChanged + { + protected AbstractNotifyPropertyChanged() { } + public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; + protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + protected virtual void SetAndRaise(ref T backingField, T newValue, System.Collections.Generic.IEqualityComparer? comparer, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T> : DynamicData.IChangeSetAdaptor + where T : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.IChangeSet changes) { } + } + public class BindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public BindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.IChangeSet changes) { } + } + public static class BindingListEx + { + public static System.IObservable> ObserveCollectionChanges(this System.ComponentModel.IBindingList source) { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.ComponentModel.BindingList source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.ComponentModel.IBindingList, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.ComponentModel.BindingList source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public struct BindingOptions : System.IEquatable + { + public const bool DefaultResetOnFirstTimeLoad = true; + public const int DefaultResetThreshold = 25; + public const bool DefaultUseReplaceForUpdates = true; + public BindingOptions(int ResetThreshold, bool UseReplaceForUpdates = true, bool ResetOnFirstTimeLoad = true) { } + public bool ResetOnFirstTimeLoad { get; set; } + public int ResetThreshold { get; set; } + public bool UseReplaceForUpdates { get; set; } + public static DynamicData.Binding.BindingOptions NeverFireReset(bool useReplaceForUpdates = true) { } + } + public interface IEvaluateAware + { + void Evaluate(); + } + public interface IIndexAware + { + int Index { get; set; } + } + public interface INotifyCollectionChangedSuspender + { + System.IDisposable SuspendCount(); + System.IDisposable SuspendNotifications(); + } + public interface IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.IChangeSet changes, DynamicData.Binding.IObservableCollection collection); + } + public interface IObservableCollection : DynamicData.Binding.INotifyCollectionChangedSuspender, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + void Load(System.Collections.Generic.IEnumerable items); + void Move(int oldIndex, int newIndex); + } + public static class IObservableListEx + { + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.IObservableList observableList) + where TObject : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BindToObservableList(this System.IObservable> source, out DynamicData.IObservableList observableList) + where TObject : notnull + where TKey : notnull { } + } + public interface ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.ISortedChangeSet changes, DynamicData.Binding.IObservableCollection collection); + } + public static class NotifyPropertyChangedEx + { + public static System.IObservable WhenAnyPropertyChanged(this TObject source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Func resultSelector, System.Func? p1Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenChanged(this TObject source, System.Linq.Expressions.Expression> p1, System.Linq.Expressions.Expression> p2, System.Linq.Expressions.Expression> p3, System.Linq.Expressions.Expression> p4, System.Linq.Expressions.Expression> p5, System.Linq.Expressions.Expression> p6, System.Func resultSelector, System.Func? p1Fallback = null, System.Func? p2Fallback = null, System.Func? p3Fallback = null, System.Func? p4Fallback = null, System.Func? p5Fallback = null, System.Func? p6Fallback = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this TObject source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true, System.Func? fallbackValue = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + } + public class ObservableCollectionAdaptor : DynamicData.IChangeSetAdaptor + where T : notnull + { + public ObservableCollectionAdaptor(DynamicData.Binding.IObservableCollection collection) { } + public ObservableCollectionAdaptor(DynamicData.Binding.IObservableCollection collection, DynamicData.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(DynamicData.Binding.IObservableCollection collection, int refreshThreshold, bool allowReplace = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.IChangeSet changes) { } + } + public class ObservableCollectionAdaptor : DynamicData.Binding.IObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public ObservableCollectionAdaptor(DynamicData.Binding.BindingOptions options) { } + public ObservableCollectionAdaptor(int refreshThreshold = 25, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.IChangeSet changes, DynamicData.Binding.IObservableCollection collection) { } + } + public static class ObservableCollectionEx + { + public static System.IObservable> ObserveCollectionChanges(this System.Collections.Specialized.INotifyCollectionChanged source) { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this TCollection source) + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public class ObservableCollectionExtended : System.Collections.ObjectModel.ObservableCollection, DynamicData.Binding.INotifyCollectionChangedSuspender, DynamicData.Binding.IObservableCollection, DynamicData.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged + { + public ObservableCollectionExtended() { } + public ObservableCollectionExtended(System.Collections.Generic.IEnumerable collection) { } + public ObservableCollectionExtended(System.Collections.Generic.List list) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public void Load(System.Collections.Generic.IEnumerable items) { } + protected override void OnCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { } + protected override void OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs e) { } + public void RemoveRange(int index, int count) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + } + public sealed class PropertyValue : System.IEquatable> + { + public PropertyValue(TObject sender, TValue value) { } + public PropertyValue(TObject Sender, TValue? Value, bool UnobtainableValue) { } + public TObject Sender { get; init; } + public bool UnobtainableValue { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct SortAndBindOptions : System.IEquatable + { + public SortAndBindOptions() { } + public int InitialCapacity { get; init; } + public bool ResetOnFirstTimeLoad { get; init; } + public int ResetThreshold { get; init; } + public ReactiveUI.Primitives.Concurrency.ISequencer? Scheduler { get; init; } + public bool UseBinarySearch { get; init; } + public bool UseReplaceForUpdates { get; init; } + } + public enum SortDirection + { + Ascending = 0, + Descending = 1, + } + public class SortExpressionComparer : System.Collections.Generic.List>, System.Collections.Generic.IComparer + { + public SortExpressionComparer() { } + public int Compare(T? x, T? y) { } + public DynamicData.Binding.SortExpressionComparer ThenByAscending(System.Func expression) { } + public DynamicData.Binding.SortExpressionComparer ThenByDescending(System.Func expression) { } + public static DynamicData.Binding.SortExpressionComparer Ascending(System.Func expression) { } + public static DynamicData.Binding.SortExpressionComparer Descending(System.Func expression) { } + } + public class SortExpression + { + public SortExpression(System.Func expression, DynamicData.Binding.SortDirection direction = 0) { } + public DynamicData.Binding.SortDirection Direction { get; } + public System.Func Expression { get; } + } + public class SortedBindingListAdaptor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey> : DynamicData.ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedBindingListAdaptor(System.ComponentModel.BindingList list, int refreshThreshold = 25) { } + public void Adapt(DynamicData.ISortedChangeSet changes) { } + } + public class SortedObservableCollectionAdaptor : DynamicData.Binding.ISortedObservableCollectionAdaptor + where TObject : notnull + where TKey : notnull + { + public SortedObservableCollectionAdaptor() { } + public SortedObservableCollectionAdaptor(DynamicData.Binding.BindingOptions options) { } + public SortedObservableCollectionAdaptor(int refreshThreshold, bool useReplaceForUpdates = true, bool resetOnFirstTimeLoad = true) { } + public void Adapt(DynamicData.ISortedChangeSet changes, DynamicData.Binding.IObservableCollection collection) { } + } +} +namespace DynamicData.Cache.Internal +{ + public enum CombineOperator + { + And = 0, + Or = 1, + Xor = 2, + Except = 3, + } + [System.Serializable] + public class KeySelectorException : System.Exception + { + public KeySelectorException() { } + public KeySelectorException(string message) { } + public KeySelectorException(string message, System.Exception innerException) { } + } + [System.Diagnostics.DebuggerDisplay("LockFreeObservableCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Ite" + + "ms)")] + public sealed class LockFreeObservableCache : DynamicData.IConnectableCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public LockFreeObservableCache() { } + public LockFreeObservableCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> editAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IObservable> Watch(TKey key) { } + } +} +namespace DynamicData +{ + public sealed class ChangeAwareCache : DynamicData.ICache, DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + public ChangeAwareCache() { } + public ChangeAwareCache(System.Collections.Generic.Dictionary data) { } + public ChangeAwareCache(int capacity) { } + public int Count { get; } + public System.Collections.Generic.IEnumerable Items { get; } + public System.Collections.Generic.IEnumerable> KeyValues { get; } + public System.Collections.Generic.IEnumerable Keys { get; } + public void Add(TObject item, TKey key) { } + public void AddOrUpdate(TObject item, TKey key) { } + public DynamicData.ChangeSet CaptureChanges() { } + public void Clear() { } + public void Clone(DynamicData.IChangeSet changes) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public void Refresh() { } + public void Refresh(System.Collections.Generic.IEnumerable keys) { } + public void Refresh(TKey key) { } + public void Remove(System.Collections.Generic.IEnumerable keys) { } + public void Remove(TKey key) { } + } + public class ChangeAwareList : DynamicData.IExtendedList, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + where T : notnull + { + public ChangeAwareList(System.Collections.Generic.IEnumerable items) { } + public ChangeAwareList(int capacity = -1) { } + public ChangeAwareList(DynamicData.ChangeAwareList list, bool copyChanges) { } + public int Capacity { get; set; } + public int Count { get; } + public bool IsReadOnly { get; } + public T this[int index] { get; set; } + public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable collection) { } + public DynamicData.IChangeSet CaptureChanges() { } + public virtual void Clear() { } + public virtual bool Contains(T item) { } + public void CopyTo(T[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public int IndexOf(T item) { } + public int IndexOf(T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public void Insert(int index, T item) { } + protected virtual void InsertItem(int index, T item) { } + public void InsertRange(System.Collections.Generic.IEnumerable collection, int index) { } + public virtual void Move(T item, int destination) { } + public virtual void Move(int original, int destination) { } + protected virtual void OnInsertItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnRemoveItems(int startIndex, System.Collections.Generic.IEnumerable items) { } + protected virtual void OnSetItem(int index, T newItem, T oldItem) { } + public bool Refresh(T item) { } + public void Refresh(T item, int index) { } + public void RefreshAt(int index) { } + public bool Remove(T item) { } + public void RemoveAt(int index) { } + protected void RemoveItem(int index) { } + protected virtual void RemoveItem(int index, T item) { } + public void RemoveRange(int index, int count) { } + protected virtual void SetItem(int index, T item) { } + } + public enum ChangeReason + { + Add = 0, + Update = 1, + Remove = 2, + Refresh = 3, + Moved = 4, + } + public static class ChangeSetEx + { + public static System.Collections.Generic.IEnumerable> Flatten(this DynamicData.IChangeSet source) + where T : notnull { } + public static DynamicData.ChangeType GetChangeType(this DynamicData.ListChangeReason source) { } + public static DynamicData.IChangeSet Transform(this DynamicData.IChangeSet source, System.Func transformer) + where TSource : notnull + where TDestination : notnull { } + public static System.Collections.Generic.IEnumerable> YieldWithoutIndex(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + public static readonly DynamicData.IChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> items) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Replaced { get; } + public int TotalChanges { get; } + public override string ToString() { } + } + public class ChangeSet : System.Collections.Generic.List>, DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public static readonly DynamicData.ChangeSet Empty; + public ChangeSet() { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection) { } + public ChangeSet(int capacity) { } + public int Adds { get; } + public int Moves { get; } + public int Refreshes { get; } + public int Removes { get; } + public int Updates { get; } + public override string ToString() { } + } + public sealed class ChangeSet : DynamicData.ChangeSet, DynamicData.IChangeSet, DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + public ChangeSet(TContext context) { } + public ChangeSet(System.Collections.Generic.IEnumerable> collection, TContext context) { } + public ChangeSet(int capacity, TContext context) { } + public TContext Context { get; } + } + public enum ChangeType + { + Item = 0, + Range = 1, + } + public sealed class Change : System.IEquatable> + where T : notnull + { + public Change(DynamicData.ListChangeReason reason, System.Collections.Generic.IEnumerable items, int index = -1) { } + public Change(DynamicData.ListChangeReason reason, T current, int index = -1) { } + public Change(T current, int currentIndex, int previousIndex) { } + public Change(DynamicData.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public DynamicData.ItemChange Item { get; } + public DynamicData.RangeChange Range { get; } + public DynamicData.ListChangeReason Reason { get; } + public DynamicData.ChangeType Type { get; } + public bool Equals(DynamicData.Change? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Change left, DynamicData.Change right) { } + public static bool operator ==(DynamicData.Change left, DynamicData.Change right) { } + } + public readonly struct Change : System.IEquatable> + where TObject : notnull + where TKey : notnull + { + public Change(DynamicData.ChangeReason reason, TKey key, TObject current, int index = -1) { } + public Change(TKey key, TObject current, int currentIndex, int previousIndex) { } + public Change(DynamicData.ChangeReason reason, TKey key, TObject current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public TObject Current { get; } + public int CurrentIndex { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.ChangeReason Reason { get; } + public bool Equals(DynamicData.Change other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.Change left, in DynamicData.Change right) { } + public static bool operator ==(in DynamicData.Change left, in DynamicData.Change right) { } + } + public static class DynamicDataOptions + { + public static DynamicData.Binding.BindingOptions Binding { get; set; } + public static DynamicData.Binding.SortAndBindOptions SortAndBind { get; set; } + } + public static class EnumerableEx + { + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, bool completable = false) + where TObject : notnull { } + public static System.IObservable> AsObservableChangeSet(this System.Collections.Generic.IEnumerable source, System.Func keySelector, bool completable = false) + where TObject : notnull + where TKey : notnull { } + } + public interface ICacheUpdater : DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable> keyValuePairs); + void AddOrUpdate(System.Collections.Generic.KeyValuePair item); + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.IChangeSet changes); + TKey GetKey(TObject item); + System.Collections.Generic.IEnumerable> GetKeyValues(System.Collections.Generic.IEnumerable items); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable> items); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(System.Collections.Generic.KeyValuePair item); + void Remove(TKey key); + void RemoveKey(TKey key); + void RemoveKeys(System.Collections.Generic.IEnumerable key); + [System.Obsolete("Use Clone()")] + void Update(DynamicData.IChangeSet changes); + } + public interface ICache : DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(TObject item, TKey key); + void Clear(); + void Clone(DynamicData.IChangeSet changes); + void Refresh(); + void Refresh(System.Collections.Generic.IEnumerable keys); + void Refresh(TKey key); + void Remove(System.Collections.Generic.IEnumerable keys); + void Remove(TKey key); + } + public interface IChangeSet + { + int Adds { get; } + int Capacity { get; set; } + int Count { get; } + int Moves { get; } + int Refreshes { get; } + int Removes { get; } + } + public interface IChangeSetAdaptor + where T : notnull + { + void Adapt(DynamicData.IChangeSet changes); + } + public interface IChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.IChangeSet changes); + } + public interface IChangeSet : DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + { + int Replaced { get; } + int TotalChanges { get; } + } + public interface IChangeSet : DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + int Updates { get; } + } + public interface IChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + TContext Context { get; } + } + public interface IConnectableCache + where TObject : notnull + where TKey : notnull + { + System.IObservable CountChanged { get; } + System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true); + System.IObservable> Preview(System.Func? predicate = null); + System.IObservable> Watch(TKey key); + } + public interface IDistinctChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull { } + public interface IExtendedList : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable + { + void AddRange(System.Collections.Generic.IEnumerable collection); + void InsertRange(System.Collections.Generic.IEnumerable collection, int index); + void Move(int original, int destination); + void RemoveRange(int index, int count); + } + public interface IGroupChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IGroup + where TObject : notnull + { + TGroup GroupKey { get; } + DynamicData.IObservableList List { get; } + } + public interface IGroup : DynamicData.IKey + where TObject : notnull + where TKey : notnull + { + DynamicData.IObservableCache Cache { get; } + } + public interface IGrouping + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IImmutableGroupChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, TGroupKey>, System.Collections.Generic.IEnumerable, TGroupKey>>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public interface IIntermediateCache : DynamicData.IConnectableCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + void Edit(System.Action> updateAction); + } + public interface IKeyValueCollection : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyList>, System.Collections.IEnumerable + { + System.Collections.Generic.IComparer> Comparer { get; } + DynamicData.SortOptimisations Optimisations { get; } + DynamicData.SortReason SortReason { get; } + } + public interface IKeyValue : DynamicData.IKey + { + TObject Value { get; } + } + public interface IKey + { + T Key { get; } + } + public interface IObservableCache : DynamicData.IConnectableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + int Count { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + System.Collections.Generic.IReadOnlyList Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface IObservableList : System.IDisposable + where T : notnull + { + int Count { get; } + System.IObservable CountChanged { get; } + System.Collections.Generic.IReadOnlyList Items { get; } + System.IObservable> Connect(System.Func? predicate = null); + System.IObservable> Preview(System.Func? predicate = null); + } + public interface IPageChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.Operators.IPageResponse Response { get; } + } + public interface IPageRequest + { + int Page { get; } + int Size { get; } + } + public interface IPagedChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, DynamicData.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.Operators.IPageResponse Response { get; } + } + public interface IQuery + where TObject : notnull + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + System.Collections.Generic.IEnumerable> KeyValues { get; } + System.Collections.Generic.IEnumerable Keys { get; } + ReactiveUI.Primitives.Optional Lookup(TKey key); + } + public interface ISortedChangeSetAdaptor + where TObject : notnull + where TKey : notnull + { + void Adapt(DynamicData.ISortedChangeSet changes); + } + public interface ISortedChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.IKeyValueCollection SortedItems { get; } + } + public interface ISourceCache : DynamicData.IConnectableCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.Func KeySelector { get; } + void Edit(System.Action> updateAction); + } + public interface ISourceList : DynamicData.IObservableList, System.IDisposable + where T : notnull + { + void Edit(System.Action> updateAction); + } + public interface ISourceUpdater : DynamicData.ICacheUpdater, DynamicData.IQuery + where TObject : notnull + where TKey : notnull + { + void AddOrUpdate(System.Collections.Generic.IEnumerable items); + void AddOrUpdate(TObject item); + void AddOrUpdate(System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer comparer); + void AddOrUpdate(TObject item, System.Collections.Generic.IEqualityComparer comparer); + void Load(System.Collections.Generic.IEnumerable items); + void Refresh(System.Collections.Generic.IEnumerable items); + void Refresh(TObject item); + void Remove(System.Collections.Generic.IEnumerable items); + void Remove(TObject item); + } + public interface IVirtualChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where T : notnull + { + DynamicData.IVirtualResponse Response { get; } + } + public interface IVirtualChangeSet : DynamicData.IChangeSet, DynamicData.IChangeSet, DynamicData.ISortedChangeSet, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + where TObject : notnull + where TKey : notnull + { + DynamicData.IVirtualResponse Response { get; } + } + public interface IVirtualRequest + { + int Size { get; } + int StartIndex { get; } + } + public interface IVirtualResponse + { + int Size { get; } + int StartIndex { get; } + int TotalSize { get; } + } + public sealed class IndexedItem : System.IEquatable> + { + public IndexedItem(TObject value, TKey key, int index) { } + public int Index { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.IndexedItem? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + [System.Diagnostics.DebuggerDisplay("IntermediateCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class IntermediateCache : DynamicData.Binding.INotifyCollectionChangedSuspender, DynamicData.IConnectableCache, DynamicData.IIntermediateCache, DynamicData.IObservableCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public IntermediateCache() { } + public IntermediateCache(System.IObservable> source) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public readonly struct ItemChange : System.IEquatable> + where T : notnull + { + public static readonly DynamicData.ItemChange Empty; + public ItemChange(DynamicData.ListChangeReason reason, T current, int currentIndex) { } + public ItemChange(DynamicData.ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { } + public T Current { get; } + public int CurrentIndex { get; } + public ReactiveUI.Primitives.Optional Previous { get; } + public int PreviousIndex { get; } + public DynamicData.ListChangeReason Reason { get; } + public bool Equals(DynamicData.ItemChange other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(in DynamicData.ItemChange left, in DynamicData.ItemChange right) { } + public static bool operator ==(in DynamicData.ItemChange left, in DynamicData.ItemChange right) { } + } + public enum ListChangeReason + { + Add = 0, + AddRange = 1, + Replace = 2, + Remove = 3, + RemoveRange = 4, + Refresh = 5, + Moved = 6, + Clear = 7, + } + public static class ListEx + { + public static void Add(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddOrInsertRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void AddRange(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items, int index) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TItem value, System.Collections.Generic.IComparer comparer) { } + public static int BinarySearch(this System.Collections.Generic.IList list, TSearch value, System.Func comparer) { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.IChangeSet changes) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, DynamicData.IChangeSet changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static void Clone(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable> changes, System.Collections.Generic.IEqualityComparer? equalityComparer) + where T : notnull { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item) { } + public static int IndexOf(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer equalityComparer) { } + public static ReactiveUI.Primitives.Optional> IndexOfOptional(this System.Collections.Generic.IEnumerable source, T item, System.Collections.Generic.IEqualityComparer? equalityComparer = null) { } + public static void Remove(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable items) { } + public static void RemoveMany(this System.Collections.Generic.IList source, System.Collections.Generic.IEnumerable itemsToRemove) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith) { } + public static void Replace(this System.Collections.Generic.IList source, T original, T replaceWith, System.Collections.Generic.IEqualityComparer comparer) { } + public static void ReplaceOrAdd(this System.Collections.Generic.IList source, T original, T replaceWith) { } + } + public enum ListFilterPolicy + { + ClearAndReplace = 0, + CalculateDiff = 1, + } + [System.Serializable] + public class MissingKeyException : System.Exception + { + public MissingKeyException() { } + public MissingKeyException(string message) { } + public MissingKeyException(string message, System.Exception innerException) { } + } + public class Node : System.IDisposable, System.IEquatable> + where TObject : class + where TKey : notnull + { + public Node(TObject item, TKey key) { } + public Node(TObject item, TKey key, in ReactiveUI.Primitives.Optional> parent) { } + public DynamicData.IObservableCache, TKey> Children { get; } + public int Depth { get; } + public bool IsRoot { get; } + public TObject Item { get; } + public TKey Key { get; } + public ReactiveUI.Primitives.Optional> Parent { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + public bool Equals(DynamicData.Node? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Node left, DynamicData.Node right) { } + public static bool operator ==(DynamicData.Node? left, DynamicData.Node? right) { } + } + public static class ObservableCacheEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.IChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.ISortedChangeSetAdaptor adaptor) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.IIntermediateCache source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void AddOrUpdate(this DynamicData.ISourceCache source, TObject item, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.IObservableCache AsObservableCache(this DynamicData.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.IObservableCache AsObservableCache(this System.IObservable> source, bool applyLocking = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AsyncDisposeMany(this System.IObservable> source, System.Action> disposalsCompletedAccessor) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Batch(this System.IObservable> source, System.TimeSpan timeSpan, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.IObservable? timer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, System.TimeSpan? timeOut = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.IObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, int refreshThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection destination, DynamicData.Binding.ISortedObservableCollectionAdaptor updater) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.BindingOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Binding.IObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Binding.ISortedObservableCollectionAdaptor? adaptor = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static System.IObservable> ChangeKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TSourceKey : notnull + where TDestinationKey : notnull { } + public static void Clear(this DynamicData.Cache.Internal.LockFreeObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.IIntermediateCache source) + where TObject : notnull + where TKey : notnull { } + public static void Clear(this DynamicData.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.ICollection target) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This was an experiment that did not work. Use Transform instead")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.IObservableCache source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static void EditDiff(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static void EditDiff(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable allItems, System.Func areItemsEqual) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EditDiff(this System.IObservable> source, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> EnsureUniqueKeys(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, ReactiveUI.Primitives.Concurrency.ISequencer scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> ExpireAfter(this DynamicData.ISourceCache source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval, ReactiveUI.Primitives.Concurrency.ISequencer scheduler) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterImmutable(this System.IObservable> source, System.Func predicate, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("This can cause unhandled exception issues so do not use")] + public static System.IObservable FinallySafe(this System.IObservable source, System.Action finallyAction) { } + public static System.IObservable> Flatten(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> FullJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelector, System.IObservable> resultGroupSource) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable regrouper) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnObservable(this System.IObservable> source, System.Func> groupObservableSelector) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> IgnoreSameReferenceUpdate(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IgnoreUpdateWhen(this System.IObservable> source, System.Func ignoreFunction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> IncludeUpdateWhen(this System.IObservable> source, System.Func includeFunction) + where TObject : notnull + where TKey : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + [return: System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] + public static System.IObservable>> InnerJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, [System.Runtime.CompilerServices.TupleElementNames(new string[] { + "leftKey", + "rightKey"})] System.Func, TLeft, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InnerJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> InvokeEvaluate(this System.IObservable> source) + where TObject : DynamicData.Binding.IEvaluateAware + where TKey : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LeftJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> LimitSizeTo(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> LimitSizeTo(this DynamicData.ISourceCache source, int sizeLimit, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IComparer childComparer) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer sourceComparer, bool resortOnSourceRefresh, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? childComparer = null) + where TObject : notnull + where TKey : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeManyItems(this System.IObservable> source, System.Func> observableSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MonitorStatus(this System.IObservable source) { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OfType(this System.IObservable> source, bool suppressEmptyChangeSets = true) + where TObject : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> OnItemUpdated(this System.IObservable> source, System.Action updateAction) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndPage as it\'s more efficient")] + public static System.IObservable> Page(this System.IObservable> source, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.ISourceCache source, System.IObservable> observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateFrom(this DynamicData.ISourceCache source, System.IObservable observable) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.Cache.Internal.LockFreeObservableCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.IIntermediateCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.ISourceCache destination) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source, System.Func> itemChangedTrigger) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.ISourceCache source) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Refresh(this DynamicData.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.IIntermediateCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.IIntermediateCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable items) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void Remove(this DynamicData.ISourceCache source, TObject item) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RemoveKey(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKey(this DynamicData.ISourceCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static void RemoveKeys(this DynamicData.ISourceCache source, System.Collections.Generic.IEnumerable keys) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoin(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, TRight, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> RightJoinMany(this System.IObservable> left, System.IObservable> right, System.Func rightKeySelector, System.Func, DynamicData.IGrouping, TDestination> resultSelector) + where TLeft : notnull + where TLeftKey : notnull + where TRight : notnull + where TRightKey : notnull + where TDestination : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + [System.Obsolete("Use SortAndBind as it\'s more efficient")] + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull, System.IComparable + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.Collections.Generic.IComparer comparer, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList, System.IObservable> comparerChanged, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.Collections.Generic.IComparer comparer, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, System.IObservable> comparerChanged, DynamicData.Binding.SortAndBindOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable pageRequests, DynamicData.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndPage(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable pageRequests, DynamicData.SortAndPageOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable virtualRequests, DynamicData.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> SortAndVirtualize(this System.IObservable> source, System.IObservable> comparerChanged, System.IObservable virtualRequests, DynamicData.SortAndVirtualizeOptions options) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SortBy(this System.IObservable> source, System.Func expression, DynamicData.Binding.SortDirection sortOrder = 0, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item) + where TObject : DynamicData.IKey + where TKey : notnull { } + public static System.IObservable> StartWithItem(this System.IObservable> source, TObject item, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, bool initialOptionalWhenMissing, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Binding.SortDirection sortOrder = 0) + where TObject : notnull + where TKey : notnull + where TSortKey : notnull { } + [System.Obsolete("Use Overload with comparer as it\'s more efficient")] + public static System.IObservable> Top(this System.IObservable> source, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable>> Top(this System.IObservable> source, System.Collections.Generic.IComparer comparer, int size) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, bool transformOnRefresh) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformImmutable(this System.IObservable> source, System.Func transformFactory) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Func keySelector) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManyAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func>> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformManySafeAsync(this System.IObservable> source, System.Func> manySelector, System.Func keySelector, System.Action> errorHandler, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformOnObservable(this System.IObservable> source, System.Func> transformFactory) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, DynamicData.TransformAsyncOptions options) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafeAsync(this System.IObservable> source, System.Func, TKey, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, System.Action> errorHandler, System.IObservable>? forceTransform = null) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable, TKey>> TransformToTree(this System.IObservable> source, System.Func pivotOn, System.IObservable, bool>>? predicateChanged = null) + where TObject : class + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformWithInlineUpdate(this System.IObservable> source, System.Func transformFactory, System.Action updateAction, System.Action> errorHandler, bool transformOnRefresh) + where TDestination : class + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TreatMovesAsRemoveAdd(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAll(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable TrueForAny(this System.IObservable> source, System.Func> observableSelector, System.Func equalityCondition) + where TObject : notnull + where TKey : notnull + where TValue : notnull { } + public static System.IObservable> UpdateIndex(this System.IObservable> source) + where TObject : DynamicData.Binding.IIndexAware + where TKey : notnull { } + [System.Obsolete("Use SortAndVirtualize as it\'s more efficient")] + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable virtualRequests) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Watch(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this DynamicData.IObservableCache source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WatchValue(this System.IObservable> source, TKey key) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TKey : notnull { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.ChangeReason[] reasons) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableChangeSet + { + public static System.IObservable> Create(System.Func, System.Action> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe) + where T : notnull { } + public static System.IObservable> Create(System.Func, System.Action> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.IDisposable> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Create(System.Func, System.Threading.CancellationToken, System.Threading.Tasks.Task> subscribe, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + } + public static class ObservableListEx + { + public static System.IObservable> Adapt(this System.IObservable> source, DynamicData.IChangeSetAdaptor adaptor) + where T : notnull { } + public static System.IObservable> AddKey(this System.IObservable> source, System.Func keySelector) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> And(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> And(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> And(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static DynamicData.IObservableList AsObservableList(this DynamicData.ISourceList source) + where T : notnull { } + public static DynamicData.IObservableList AsObservableList(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection targetCollection, DynamicData.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection targetCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, DynamicData.Binding.BindingOptions options) + where T : notnull { } + public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull { } + public static System.IObservable> Cast(this System.IObservable> source) + where TDestination : notnull { } + public static System.IObservable> Cast(this System.IObservable> source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> CastToObject(this System.IObservable> source) + where T : class { } + public static System.IObservable> Clone(this System.IObservable> source, System.Collections.Generic.IList target) + where T : notnull { } + [System.Obsolete("Prefer Cast as it is does the same thing but is semantically correct")] + public static System.IObservable> Convert(this System.IObservable> source, System.Func conversionFactory) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> DeferUntilLoaded(this DynamicData.IObservableList source) + where T : notnull { } + public static System.IObservable> DeferUntilLoaded(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DisposeMany(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> DistinctValues(this System.IObservable> source, System.Func valueSelector) + where TObject : notnull + where TValue : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Except(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> ExpireAfter(this DynamicData.ISourceList source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.Func predicate) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicate, DynamicData.ListFilterPolicy filterPolicy = 1) + where T : notnull { } + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, DynamicData.ListFilterPolicy filterPolicy = 1, bool suppressEmptyChangeSets = true) + where T : notnull { } + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> objectFilterObservable, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull { } + [System.Obsolete("Use AutoRefresh(), followed by Filter() instead")] + public static System.IObservable> FilterOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.Func predicate, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) + where T : notnull { } + public static System.IObservable> ForEachChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable> ForEachItemChange(this System.IObservable> source, System.Action> action) + where TObject : notnull { } + public static System.IObservable>> GroupOn(this System.IObservable> source, System.Func groupSelector, System.IObservable? regrouper = null) + where TObject : notnull + where TGroup : notnull { } + public static System.IObservable>> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : System.ComponentModel.INotifyPropertyChanged + where TGroup : notnull { } + public static System.IObservable>> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + where TObject : notnull + where TGroupKey : notnull { } + public static System.IObservable> LimitSizeTo(this DynamicData.ISourceList source, int sizeLimit, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) + where TObject : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> MergeChangeSets(this System.IObservable>>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) + where T : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TObject : notnull + where TDestination : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IComparer comparer) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> MergeManyChangeSets(this System.IObservable> source, System.Func>> observableSelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Collections.Generic.IComparer? comparer = null) + where TObject : notnull + where TDestination : notnull + where TDestinationKey : notnull { } + public static System.IObservable> NotEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> OnItemAdded(this System.IObservable> source, System.Action addAction) + where T : notnull { } + public static System.IObservable> OnItemRefreshed(this System.IObservable> source, System.Action refreshAction) + where T : notnull { } + public static System.IObservable> OnItemRemoved(this System.IObservable> source, System.Action removeAction, bool invokeOnUnsubscribe = true) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Or(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Or(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + public static System.IObservable> Page(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IDisposable PopulateInto(this System.IObservable> source, DynamicData.ISourceList destination) + where T : notnull { } + public static System.IObservable> QueryWhenChanged(this System.IObservable> source) + where T : notnull { } + public static System.IObservable QueryWhenChanged(this System.IObservable> source, System.Func, TDestination> resultSelector) + where TObject : notnull { } + public static System.IObservable> RefCount(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> RemoveIndex(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Reverse(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SkipInitial(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerChanged, DynamicData.SortOptions options = 0, System.IObservable? resort = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.SortOptions options = 0, System.IObservable? resort = null, System.IObservable>? comparerChanged = null, int resetThreshold = 50) + where T : notnull { } + public static System.IObservable> StartWithEmpty(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory) + where T : notnull { } + public static System.IObservable> SuppressRefresh(this System.IObservable> source) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable> sources) + where T : notnull { } + public static System.IObservable> Switch(this System.IObservable>> sources) + where T : notnull { } + public static System.IObservable> ToCollection(this System.IObservable> source) + where TObject : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func expireAfter, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func expireAfter, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func? expireAfter, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func? expireAfter, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where T : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) + where TObject : notnull { } + public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Func sort, DynamicData.Binding.SortDirection sortOrder = 0) + where TObject : notnull { } + public static System.IObservable> Top(this System.IObservable> source, int numberOfItems) + where T : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func, int, TDestination> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformAsync(this System.IObservable> source, System.Func, int, System.Threading.CancellationToken, System.Threading.Tasks.Task> transformFactory, bool transformOnRefresh = false) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> TransformMany(this System.IObservable> source, System.Func> manySelector, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where TDestination : notnull + where TSource : notnull { } + public static System.IObservable> Virtualise(this System.IObservable> source, System.IObservable requests) + where T : notnull { } + public static System.IObservable WhenAnyPropertyChanged(this System.IObservable> source, params string[] propertiesToMonitor) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhenPropertyChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable WhenValueChanged(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, bool notifyOnInitialValue = true) + where TObject : System.ComponentModel.INotifyPropertyChanged { } + public static System.IObservable> WhereReasonsAre(this System.IObservable> source, params DynamicData.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> WhereReasonsAreNot(this System.IObservable> source, params DynamicData.ListChangeReason[] reasons) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList> sources) + where T : notnull { } + public static System.IObservable> Xor(this DynamicData.IObservableList>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.Collections.Generic.ICollection>> sources) + where T : notnull { } + public static System.IObservable> Xor(this System.IObservable> source, params System.IObservable>[] others) + where T : notnull { } + } + public class PageContext : System.IEquatable> + { + public PageContext(DynamicData.Operators.IPageResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.SortAndPageOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.SortAndPageOptions Options { get; init; } + public DynamicData.Operators.IPageResponse Response { get; init; } + } + public sealed class PageRequest : DynamicData.IPageRequest, System.IEquatable + { + public static readonly DynamicData.IPageRequest Default; + public static readonly DynamicData.IPageRequest Empty; + public PageRequest() { } + public PageRequest(int page, int size) { } + public int Page { get; } + public int Size { get; } + public static System.Collections.Generic.IEqualityComparer DefaultComparer { get; } + public bool Equals(DynamicData.IPageRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class RangeChange : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public RangeChange(System.Collections.Generic.IEnumerable items, int index = -1) { } + public int Count { get; } + public int Index { get; } + public static DynamicData.RangeChange Empty { get; } + public void Add(T item) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { } + public void Insert(int index, T item) { } + public void SetStartingIndex(int index) { } + public override string ToString() { } + } + public readonly struct SortAndPageOptions : System.IEquatable + { + public SortAndPageOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + public readonly struct SortAndVirtualizeOptions : System.IEquatable + { + public SortAndVirtualizeOptions() { } + public int InitialCapacity { get; init; } + public int ResetThreshold { get; init; } + public bool UseBinarySearch { get; init; } + } + [System.Serializable] + public class SortException : System.Exception + { + public SortException() { } + public SortException(string message) { } + public SortException(string message, System.Exception innerException) { } + } + [System.Flags] + public enum SortOptimisations + { + None = 0, + ComparesImmutableValuesOnly = 1, + IgnoreEvaluates = 2, + [System.Obsolete("This is no longer being used. Use one of the other options instead.")] + InsertAtEndThenSort = 3, + } + public enum SortOptions + { + None = 0, + UseBinarySearch = 1, + } + public enum SortReason + { + InitialLoad = 0, + ComparerChanged = 1, + DataChanged = 2, + Reorder = 3, + Reset = 4, + } + public static class SourceCacheEx + { + public static System.IObservable> Cast(this DynamicData.IObservableCache source, System.Func converter) + where TSource : notnull + where TKey : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] + public sealed class SourceCache : DynamicData.Binding.INotifyCollectionChangedSuspender, DynamicData.IConnectableCache, DynamicData.IObservableCache, DynamicData.ISourceCache, System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SourceCache(System.Func keySelector) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.Func KeySelector { get; } + public System.Collections.Generic.IReadOnlyDictionary KeyValues { get; } + public System.Collections.Generic.IReadOnlyList Keys { get; } + public System.IObservable> Connect(System.Func? predicate = null, bool suppressEmptyChangeSets = true) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public ReactiveUI.Primitives.Optional Lookup(TKey key) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + public System.IDisposable SuspendCount() { } + public System.IDisposable SuspendNotifications() { } + public System.IObservable> Watch(TKey key) { } + } + public static class SourceListEditConvenienceEx + { + public static void Add(this DynamicData.ISourceList source, T item) + where T : notnull { } + public static void AddRange(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable items) + where T : notnull { } + public static void Clear(this DynamicData.ISourceList source) + where T : notnull { } + public static void EditDiff(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable allItems, System.Collections.Generic.IEqualityComparer? equalityComparer = null) + where T : notnull { } + public static void Insert(this DynamicData.ISourceList source, int index, T item) + where T : notnull { } + public static void InsertRange(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable items, int index) + where T : notnull { } + public static void Move(this DynamicData.ISourceList source, int original, int destination) + where T : notnull { } + public static bool Remove(this DynamicData.ISourceList source, T item) + where T : notnull { } + public static void RemoveAt(this DynamicData.ISourceList source, int index) + where T : notnull { } + public static void RemoveMany(this DynamicData.ISourceList source, System.Collections.Generic.IEnumerable itemsToRemove) + where T : notnull { } + public static void RemoveRange(this DynamicData.ISourceList source, int index, int count) + where T : notnull { } + public static void Replace(this DynamicData.ISourceList source, T original, T destination) + where T : notnull { } + public static void ReplaceAt(this DynamicData.ISourceList source, int index, T item) + where T : notnull { } + } + public static class SourceListEx + { + public static System.IObservable> Cast(this DynamicData.ISourceList source, System.Func conversionFactory) + where TSource : notnull + where TDestination : notnull { } + } + [System.Diagnostics.DebuggerDisplay("SourceList<{typeof(T).Name}> ({Count} Items)")] + public sealed class SourceList : DynamicData.IObservableList, DynamicData.ISourceList, System.IDisposable + where T : notnull + { + public SourceList(System.IObservable>? source = null) { } + public int Count { get; } + public System.IObservable CountChanged { get; } + public System.Collections.Generic.IReadOnlyList Items { get; } + public System.IObservable> Connect(System.Func? predicate = null) { } + public void Dispose() { } + public void Edit(System.Action> updateAction) { } + public System.IObservable> Preview(System.Func? predicate = null) { } + } + public struct TransformAsyncOptions : System.IEquatable + { + public static readonly DynamicData.TransformAsyncOptions Default; + public TransformAsyncOptions(int? MaximumConcurrency, bool TransformOnRefresh) { } + public int? MaximumConcurrency { get; set; } + public bool TransformOnRefresh { get; set; } + } + [System.Serializable] + public class UnspecifiedIndexException : System.Exception + { + public UnspecifiedIndexException() { } + public UnspecifiedIndexException(string message) { } + public UnspecifiedIndexException(string message, System.Exception innerException) { } + } + public class VirtualContext : System.IEquatable> + { + public VirtualContext(DynamicData.IVirtualResponse Response, System.Collections.Generic.IComparer Comparer, DynamicData.SortAndVirtualizeOptions Options) { } + public System.Collections.Generic.IComparer Comparer { get; init; } + public DynamicData.SortAndVirtualizeOptions Options { get; init; } + public DynamicData.IVirtualResponse Response { get; init; } + } + public class VirtualRequest : DynamicData.IVirtualRequest, System.IEquatable + { + public static readonly DynamicData.VirtualRequest Default; + public VirtualRequest() { } + public VirtualRequest(int startIndex, int size) { } + public int Size { get; } + public int StartIndex { get; } + public static System.Collections.Generic.IEqualityComparer StartIndexSizeComparer { get; } + public bool Equals(DynamicData.IVirtualRequest? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } +} +namespace DynamicData.Diagnostics +{ + public class ChangeStatistics : System.IEquatable + { + public ChangeStatistics() { } + public ChangeStatistics(int Index, int Adds, int Updates, int Removes, int Refreshes, int Moves, int Count) { } + public int Adds { get; init; } + public int Count { get; init; } + public int Index { get; init; } + public System.DateTime LastUpdated { get; } + public int Moves { get; init; } + public int Refreshes { get; init; } + public int Removes { get; init; } + public int Updates { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public class ChangeSummary + { + public static readonly DynamicData.Diagnostics.ChangeSummary Empty; + public ChangeSummary(int index, DynamicData.Diagnostics.ChangeStatistics latest, DynamicData.Diagnostics.ChangeStatistics overall) { } + public DynamicData.Diagnostics.ChangeStatistics Latest { get; } + public DynamicData.Diagnostics.ChangeStatistics Overall { get; } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + } + public static class DiagnosticOperators + { + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull { } + public static System.IObservable CollectUpdateStats(this System.IObservable> source) + where TSource : notnull + where TKey : notnull { } + } +} +namespace DynamicData.Experimental +{ + public static class ExperimentalEx + { + public static DynamicData.Experimental.IWatcher AsWatcher(this System.IObservable> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) + where TObject : notnull + where TKey : notnull { } + } + public interface IWatcher : System.IDisposable + where TObject : notnull + where TKey : notnull + { + System.IObservable> Watch(TKey key); + } +} +namespace DynamicData.Kernel +{ + public enum ConnectionStatus + { + Pending = 0, + Loaded = 1, + Errored = 2, + Completed = 3, + } + public static class EnumerableEx + { + public static T[] AsArray(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.List AsList(this System.Collections.Generic.IEnumerable source) { } + public static System.Collections.Generic.IEnumerable Duplicates(this System.Collections.Generic.IEnumerable source, System.Func valueSelector) { } + public static System.Collections.Generic.IEnumerable> IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind) { } + public static System.Collections.Generic.IEnumerable IndexOfMany(this System.Collections.Generic.IEnumerable source, System.Collections.Generic.IEnumerable itemsToFind, System.Func resultSelector) { } + } + public sealed class Error : DynamicData.IKeyValue, DynamicData.IKey, System.IEquatable> + where TKey : notnull + { + public Error(System.Exception? exception, TObject value, TKey key) { } + public System.Exception? Exception { get; } + public TKey Key { get; } + public TObject Value { get; } + public bool Equals(DynamicData.Kernel.Error? other) { } + public override bool Equals(object? obj) { } + public override int GetHashCode() { } + public override string ToString() { } + public static bool operator !=(DynamicData.Kernel.Error left, DynamicData.Kernel.Error right) { } + public static bool operator ==(DynamicData.Kernel.Error left, DynamicData.Kernel.Error right) { } + } + public static class InternalEx + { + public static System.IObservable RetryWithBackOff(this System.IObservable source, System.Func backOffStrategy) + where TException : System.Exception { } + public static System.IDisposable ScheduleRecurringAction(this ReactiveUI.Primitives.Concurrency.ISequencer scheduler, System.Func interval, System.Action action) { } + public static System.IDisposable ScheduleRecurringAction(this ReactiveUI.Primitives.Concurrency.ISequencer scheduler, System.TimeSpan interval, System.Action action) { } + } + public readonly struct ItemWithIndex : System.IEquatable> + { + public ItemWithIndex(T Item, int Index) { } + public int Index { get; init; } + public T Item { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public readonly struct ItemWithValue : System.IEquatable> + { + public ItemWithValue(TObject Item, TValue Value) { } + public TObject Item { get; init; } + public TValue Value { get; init; } + public override int GetHashCode() { } + public override string ToString() { } + } + public sealed class OptionElse + { + public void Else(System.Action action) { } + } + public static class OptionExtensions + { + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static TDestination? ConvertOr(this in ReactiveUI.Primitives.Optional source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static ReactiveUI.Primitives.Optional FirstOrOptional(this System.Collections.Generic.IEnumerable source, System.Func selector) + where T : notnull { } + public static DynamicData.Kernel.OptionElse IfHasValue(this ReactiveUI.Primitives.Optional? source, System.Action action) + where T : notnull { } + public static DynamicData.Kernel.OptionElse IfHasValue(this in ReactiveUI.Primitives.Optional source, System.Action action) + where T : notnull { } + public static ReactiveUI.Primitives.Optional Lookup(this System.Collections.Generic.IDictionary source, TKey key) + where TValue : notnull { } + public static ReactiveUI.Primitives.Optional OrElse(this in ReactiveUI.Primitives.Optional source, System.Func> fallbackOperation) + where T : notnull { } + public static bool RemoveIfContained(this System.Collections.Generic.IDictionary source, TKey key) { } + public static System.Collections.Generic.IEnumerable SelectValues(this System.Collections.Generic.IEnumerable> source) + where T : notnull { } + public static T ValueOr(this T? source, T defaultValue) + where T : struct { } + public static T ValueOr(this in ReactiveUI.Primitives.Optional source, System.Func valueSelector) + where T : notnull { } + public static T? ValueOrDefault(this in ReactiveUI.Primitives.Optional source) + where T : notnull { } + public static T ValueOrThrow(this in ReactiveUI.Primitives.Optional source, System.Func exceptionGenerator) + where T : notnull { } + } + public static class OptionObservableExtensions + { + public static System.IObservable> Convert(this System.IObservable> source, System.Func> converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable> Convert(this System.IObservable> source, System.Func converter) + where TSource : notnull + where TDestination : notnull { } + public static System.IObservable ConvertOr(this System.IObservable> source, System.Func converter, System.Func fallbackConverter) + where TSource : notnull { } + public static System.IObservable> OnHasNoValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OnHasValue(this System.IObservable> source, System.Action action, System.Action? elseAction = null) + where T : notnull { } + public static System.IObservable> OrElse(this System.IObservable> source, System.Func> fallbackOperation) + where T : notnull { } + public static System.IObservable SelectValues(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOr(this System.IObservable> source, System.Func valueSelector) + where T : notnull { } + public static System.IObservable ValueOrDefault(this System.IObservable> source) + where T : notnull { } + public static System.IObservable ValueOrThrow(this System.IObservable> source, System.Func exceptionGenerator) + where T : notnull { } + } +} +namespace DynamicData.List +{ + public interface IGrouping + { + int Count { get; } + System.Collections.Generic.IEnumerable Items { get; } + TGroupKey Key { get; } + } +} +namespace DynamicData.Operators +{ + public interface IPageResponse + { + int Page { get; } + int PageSize { get; } + int Pages { get; } + int TotalSize { get; } + } +} +namespace DynamicData.PLinq +{ + public static class ParallelOperators + { + public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> SubscribeMany(this System.IObservable> source, System.Func subscriptionFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TObject : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, DynamicData.PLinq.ParallelisationOptions parallelisationOptions) + where TDestination : notnull + where TSource : notnull + where TKey : notnull { } + } + public enum ParallelType + { + None = 0, + Parallelise = 1, + Ordered = 2, + } + public class ParallelisationOptions + { + public static readonly DynamicData.PLinq.ParallelisationOptions Default; + public static readonly DynamicData.PLinq.ParallelisationOptions None; + public ParallelisationOptions(DynamicData.PLinq.ParallelType type = 0, int threshold = 0, int maxDegreeOfParallelisation = 0) { } + public int MaxDegreeOfParallelisation { get; } + public int Threshold { get; } + public DynamicData.PLinq.ParallelType Type { get; } + } +} +namespace DynamicData.Tests +{ + public class ChangeSetAggregator : System.IDisposable + where TObject : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableList Data { get; } + public System.Exception? Exception { get; set; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public sealed class ChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public ChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + } + public class DistinctChangeSetAggregator : System.IDisposable + where TValue : notnull + { + public DistinctChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class GroupChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + where TGroupKey : notnull + { + public GroupChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache, TGroupKey> Data { get; } + public System.Exception? Error { get; } + public DynamicData.IObservableCache, TGroupKey> Groups { get; } + public bool IsCompleted { get; } + public System.Collections.Generic.IReadOnlyList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + } + public static class ListTextEx + { + public static DynamicData.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where T : notnull { } + } + public class PagedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public PagedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public class SortedChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public SortedChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } + public static class TestEx + { + public static DynamicData.Tests.DistinctChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull { } + public static DynamicData.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.PagedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.SortedChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.VirtualChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.ChangeSetAggregator AsAggregator(this System.IObservable> source) + where TObject : notnull + where TKey : notnull { } + public static DynamicData.Tests.GroupChangeSetAggregator AsAggregator(this System.IObservable> source) + where TValue : notnull + where TKey : notnull + where TGroupKey : notnull { } + } + public class VirtualChangeSetAggregator : System.IDisposable + where TObject : notnull + where TKey : notnull + { + public VirtualChangeSetAggregator(System.IObservable> source) { } + public DynamicData.IObservableCache Data { get; } + public System.Exception? Error { get; } + public System.Collections.Generic.IList> Messages { get; } + public DynamicData.Diagnostics.ChangeSummary Summary { get; } + public void Dispose() { } + protected virtual void Dispose(bool isDisposing) { } + } +} diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet8_0.verified.txt b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet8_0.verified.txt index 92fa2bb0d..f095140e7 100644 --- a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet8_0.verified.txt +++ b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet8_0.verified.txt @@ -1,4 +1,6 @@ -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Profile")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.ReactiveUI")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] [assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")] namespace DynamicData.Aggregation { @@ -3111,4 +3113,4 @@ namespace DynamicData.Tests public void Dispose() { } protected virtual void Dispose(bool isDisposing) { } } -} +} \ No newline at end of file diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet9_0.verified.txt b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet9_0.verified.txt index 5e852c6d4..bccebde70 100644 --- a/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet9_0.verified.txt +++ b/src/DynamicData.Tests/API/ApiApprovalTests.DynamicDataTests.DotNet9_0.verified.txt @@ -1,5 +1,7 @@ -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName=".NET 9.0")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Benchmarks")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Profile")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.ReactiveUI")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicData.Tests")] namespace DynamicData.Aggregation { public readonly struct AggregateItem : System.IEquatable> @@ -25,7 +27,7 @@ namespace DynamicData.Aggregation public static System.IObservable> ForAggregation(this System.IObservable> source) where TObject : notnull where TKey : notnull { } - public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } + public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } public static System.IObservable InvalidateWhen(this System.IObservable source, System.IObservable invalidate) { } } public static class AvgEx @@ -231,7 +233,7 @@ namespace DynamicData.Alias { public static class ObservableCacheAlias { - public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -239,7 +241,7 @@ namespace DynamicData.Alias where TDestination : notnull where TSource : notnull where TKey : notnull { } - public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + public static System.IObservable> Select(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -252,7 +254,7 @@ namespace DynamicData.Alias where TDestinationKey : notnull where TSource : notnull where TSourceKey : notnull { } - public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -260,7 +262,7 @@ namespace DynamicData.Alias where TDestination : notnull where TSource : notnull where TKey : notnull { } - public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + public static System.IObservable> SelectSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -277,7 +279,7 @@ namespace DynamicData.Alias public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged) where TObject : notnull where TKey : notnull { } - public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter) + public static System.IObservable> Where(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter) where TObject : notnull where TKey : notnull { } } @@ -320,7 +322,7 @@ namespace DynamicData.Binding } public static class BindingListEx { - public static System.IObservable> ObserveCollectionChanges(this System.ComponentModel.IBindingList source) { } + public static System.IObservable> ObserveCollectionChanges(this System.ComponentModel.IBindingList source) { } public static System.IObservable> ToObservableChangeSet<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.ComponentModel.BindingList source) where T : notnull { } public static System.IObservable> ToObservableChangeSet(this TCollection source) @@ -421,7 +423,7 @@ namespace DynamicData.Binding } public static class ObservableCollectionEx { - public static System.IObservable> ObserveCollectionChanges(this System.Collections.Specialized.INotifyCollectionChanged source) { } + public static System.IObservable> ObserveCollectionChanges(this System.Collections.Specialized.INotifyCollectionChanged source) { } public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ObservableCollection source) where T : notnull { } public static System.IObservable> ToObservableChangeSet(this System.Collections.ObjectModel.ReadOnlyObservableCollection source) @@ -468,7 +470,7 @@ namespace DynamicData.Binding public int InitialCapacity { get; init; } public bool ResetOnFirstTimeLoad { get; init; } public int ResetThreshold { get; init; } - public System.Reactive.Concurrency.IScheduler? Scheduler { get; init; } + public ReactiveUI.Primitives.Concurrency.ISequencer? Scheduler { get; init; } public bool UseBinarySearch { get; init; } public bool UseReplaceForUpdates { get; init; } } @@ -1130,40 +1132,37 @@ namespace DynamicData public static DynamicData.IObservableCache AsObservableCache(this System.IObservable> source, bool applyLocking = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> AsyncDisposeMany(this System.IObservable> source, System.Action> disposalsCompletedAccessor) + public static System.IObservable> AsyncDisposeMany(this System.IObservable> source, System.Action> disposalsCompletedAccessor) where TObject : notnull where TKey : notnull { } - public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged where TKey : notnull { } - public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged where TKey : notnull { } - public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> Batch(this System.IObservable> source, System.TimeSpan timeSpan, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> Batch(this System.IObservable> source, System.TimeSpan timeSpan, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector) + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, System.IObservable? timer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.IObservable? timer, System.Reactive.Concurrency.IScheduler? scheduler = null) - where TObject : notnull - where TKey : notnull { } - public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BatchIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState = false, System.TimeSpan? timeOut = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable>> source, System.Collections.Generic.IList targetList) @@ -1226,7 +1225,7 @@ namespace DynamicData public static System.IObservable> Bind(this System.IObservable> source, out System.Collections.ObjectModel.ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = 25, bool useReplaceForUpdates = true, DynamicData.Binding.ISortedObservableCollectionAdaptor? adaptor = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } public static System.IObservable> Cast(this System.IObservable> source, System.Func converter) @@ -1304,16 +1303,16 @@ namespace DynamicData public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector) where TObject : notnull where TKey : notnull { } - public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.Reactive.Concurrency.IScheduler scheduler) + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, ReactiveUI.Primitives.Concurrency.ISequencer scheduler) where TObject : notnull where TKey : notnull { } public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval) where TObject : notnull where TKey : notnull { } - public static System.IObservable>> ExpireAfter(this DynamicData.ISourceCache source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable>> ExpireAfter(this DynamicData.ISourceCache source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval, System.Reactive.Concurrency.IScheduler scheduler) + public static System.IObservable> ExpireAfter(this System.IObservable> source, System.Func timeSelector, System.TimeSpan? pollingInterval, ReactiveUI.Primitives.Concurrency.ISequencer scheduler) where TObject : notnull where TKey : notnull { } public static System.IObservable> Filter(this System.IObservable> source, System.Func filter, bool suppressEmptyChangeSets = true) @@ -1322,7 +1321,7 @@ namespace DynamicData public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, bool suppressEmptyChangeSets = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter, bool suppressEmptyChangeSets = true) + public static System.IObservable> Filter(this System.IObservable> source, System.IObservable> predicateChanged, System.IObservable reapplyFilter, bool suppressEmptyChangeSets = true) where TObject : notnull where TKey : notnull { } public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, bool suppressEmptyChangeSets = true) @@ -1331,10 +1330,10 @@ namespace DynamicData public static System.IObservable> FilterImmutable(this System.IObservable> source, System.Func predicate, bool suppressEmptyChangeSets = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> filterFactory, System.TimeSpan? buffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } [System.Obsolete("This can cause unhandled exception issues so do not use")] @@ -1380,15 +1379,15 @@ namespace DynamicData where TObject : notnull where TKey : notnull where TGroupKey : notnull { } - public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable regrouper) + public static System.IObservable> Group(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable regrouper) where TObject : notnull where TKey : notnull where TGroupKey : notnull { } - public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { } - public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) + public static System.IObservable> Group(this System.IObservable> source, System.IObservable> groupSelectorKeyObservable, System.IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { } @@ -1400,15 +1399,15 @@ namespace DynamicData where TObject : notnull where TKey : notnull where TGroupKey : notnull { } - public static System.IObservable> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged where TKey : notnull where TGroupKey : notnull { } - public static System.IObservable> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged where TKey : notnull where TGroupKey : notnull { } - public static System.IObservable> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + public static System.IObservable> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { } @@ -1483,7 +1482,7 @@ namespace DynamicData public static System.IObservable> LimitSizeTo(this System.IObservable> source, int size) where TObject : notnull where TKey : notnull { } - public static System.IObservable>> LimitSizeTo(this DynamicData.ISourceCache source, int sizeLimit, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable>> LimitSizeTo(this DynamicData.ISourceCache source, int sizeLimit, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } public static System.IObservable> MergeChangeSets(this System.IObservable>> source) @@ -1495,43 +1494,43 @@ namespace DynamicData public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer equalityComparer, System.Collections.Generic.IComparer comparer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull where TKey : notnull { } public static System.IObservable MergeMany(this System.IObservable> source, System.Func> observableSelector) @@ -1764,11 +1763,11 @@ namespace DynamicData where TObject : notnull where TKey : notnull { } [System.Obsolete("Use SortAndBind as it\'s more efficient")] - public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) where TObject : notnull where TKey : notnull { } [System.Obsolete("Use SortAndBind as it\'s more efficient")] - public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerObservable, System.IObservable resorter, DynamicData.SortOptimisations sortOptimisations = 0, int resetThreshold = 100) where TObject : notnull where TKey : notnull { } public static System.IObservable> SortAndBind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] TObject, TKey>(this System.IObservable> source, System.Collections.Generic.IList targetList) @@ -1879,10 +1878,10 @@ namespace DynamicData public static System.IObservable> ToCollection(this System.IObservable> source) where TObject : notnull where TKey : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func keySelector, System.Func? expireAfter = null, int limitSizeTo = -1, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } public static System.IObservable> ToObservableOptional(this System.IObservable> source, TKey key, System.Collections.Generic.IEqualityComparer? equalityComparer = null) @@ -1905,7 +1904,7 @@ namespace DynamicData public static System.IObservable>> Top(this System.IObservable> source, System.Collections.Generic.IComparer comparer, int size) where TObject : notnull where TKey : notnull { } - public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -1917,7 +1916,7 @@ namespace DynamicData where TDestination : notnull where TSource : notnull where TKey : notnull { } - public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) + public static System.IObservable> Transform(this System.IObservable> source, System.Func transformFactory, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -1929,7 +1928,7 @@ namespace DynamicData where TDestination : notnull where TSource : notnull where TKey : notnull { } - public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable forceTransform) + public static System.IObservable> Transform(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -2069,7 +2068,7 @@ namespace DynamicData where TSource : notnull where TKey : notnull where TDestination : notnull { } - public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -2077,7 +2076,7 @@ namespace DynamicData where TDestination : notnull where TSource : notnull where TKey : notnull { } - public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func transformFactory, System.Action> errorHandler, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -2085,7 +2084,7 @@ namespace DynamicData where TDestination : notnull where TSource : notnull where TKey : notnull { } - public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable forceTransform) + public static System.IObservable> TransformSafe(this System.IObservable> source, System.Func, TKey, TDestination> transformFactory, System.Action> errorHandler, System.IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { } @@ -2274,11 +2273,11 @@ namespace DynamicData where T : notnull { } public static DynamicData.IObservableList AsObservableList(this System.IObservable> source) where T : notnull { } - public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged { } - public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefresh(this System.IObservable> source, System.Linq.Expressions.Expression> propertyAccessor, System.TimeSpan? changeSetBuffer = default, System.TimeSpan? propertyChangeThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged { } - public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> AutoRefreshOnObservable(this System.IObservable> source, System.Func> reevaluator, System.TimeSpan? changeSetBuffer = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull { } public static System.IObservable> Bind(this System.IObservable> source, DynamicData.Binding.IObservableCollection targetCollection, DynamicData.Binding.BindingOptions options) where T : notnull { } @@ -2290,15 +2289,15 @@ namespace DynamicData where T : notnull { } public static System.IObservable> Bind<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this System.IObservable> source, System.ComponentModel.BindingList bindingList, int resetThreshold = 25) where T : notnull { } - public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BufferIf(this System.IObservable> source, System.IObservable pauseIfTrueSelector, bool initialPauseState, System.TimeSpan? timeOut, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> BufferInitial(this System.IObservable> source, System.TimeSpan initialBuffer, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull { } public static System.IObservable> Cast(this System.IObservable> source) where TDestination : notnull { } @@ -2332,7 +2331,7 @@ namespace DynamicData where T : notnull { } public static System.IObservable> Except(this System.IObservable> source, params System.IObservable>[] others) where T : notnull { } - public static System.IObservable> ExpireAfter(this DynamicData.ISourceList source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ExpireAfter(this DynamicData.ISourceList source, System.Func timeSelector, System.TimeSpan? pollingInterval = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } public static System.IObservable> Filter(this System.IObservable> source, System.Func predicate) where T : notnull { } @@ -2340,10 +2339,10 @@ namespace DynamicData where T : notnull { } public static System.IObservable> Filter(this System.IObservable> source, System.IObservable predicateState, System.Func predicate, DynamicData.ListFilterPolicy filterPolicy = 1, bool suppressEmptyChangeSets = true) where T : notnull { } - public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> objectFilterObservable, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> FilterOnObservable(this System.IObservable> source, System.Func> objectFilterObservable, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull { } [System.Obsolete("Use AutoRefresh(), followed by Filter() instead")] - public static System.IObservable> FilterOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.Func predicate, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> FilterOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.Func predicate, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged { } public static System.IObservable> FlattenBufferResult(this System.IObservable>> source) where T : notnull { } @@ -2351,19 +2350,19 @@ namespace DynamicData where TObject : notnull { } public static System.IObservable> ForEachItemChange(this System.IObservable> source, System.Action> action) where TObject : notnull { } - public static System.IObservable>> GroupOn(this System.IObservable> source, System.Func groupSelector, System.IObservable? regrouper = null) + public static System.IObservable>> GroupOn(this System.IObservable> source, System.Func groupSelector, System.IObservable? regrouper = null) where TObject : notnull where TGroup : notnull { } - public static System.IObservable>> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable>> GroupOnProperty(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged where TGroup : notnull { } - public static System.IObservable>> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable>> GroupOnPropertyWithImmutableState(this System.IObservable> source, System.Linq.Expressions.Expression> propertySelector, System.TimeSpan? propertyChangedThrottle = default, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : System.ComponentModel.INotifyPropertyChanged where TGroup : notnull { } - public static System.IObservable>> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) + public static System.IObservable>> GroupWithImmutableState(this System.IObservable> source, System.Func groupSelectorKey, System.IObservable? regrouper = null) where TObject : notnull where TGroupKey : notnull { } - public static System.IObservable> LimitSizeTo(this DynamicData.ISourceList source, int sizeLimit, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> LimitSizeTo(this DynamicData.ISourceList source, int sizeLimit, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) where TObject : notnull { } @@ -2371,11 +2370,11 @@ namespace DynamicData where TObject : notnull { } public static System.IObservable> MergeChangeSets(this System.IObservable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null) where TObject : notnull { } - public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.Collections.Generic.IEnumerable>> source, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.Collections.Generic.IEnumerable>> others, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull { } - public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer? equalityComparer = null, System.Reactive.Concurrency.IScheduler? scheduler = null, bool completable = true) + public static System.IObservable> MergeChangeSets(this System.IObservable> source, System.IObservable> other, System.Collections.Generic.IEqualityComparer? equalityComparer = null, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null, bool completable = true) where TObject : notnull { } public static System.IObservable> MergeChangeSets(this DynamicData.IObservableList>> source, System.Collections.Generic.IComparer comparer) where TObject : notnull @@ -2436,9 +2435,9 @@ namespace DynamicData where T : notnull { } public static System.IObservable> SkipInitial(this System.IObservable> source) where T : notnull { } - public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerChanged, DynamicData.SortOptions options = 0, System.IObservable? resort = null, int resetThreshold = 50) + public static System.IObservable> Sort(this System.IObservable> source, System.IObservable> comparerChanged, DynamicData.SortOptions options = 0, System.IObservable? resort = null, int resetThreshold = 50) where T : notnull { } - public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.SortOptions options = 0, System.IObservable? resort = null, System.IObservable>? comparerChanged = null, int resetThreshold = 50) + public static System.IObservable> Sort(this System.IObservable> source, System.Collections.Generic.IComparer comparer, DynamicData.SortOptions options = 0, System.IObservable? resort = null, System.IObservable>? comparerChanged = null, int resetThreshold = 50) where T : notnull { } public static System.IObservable> StartWithEmpty(this System.IObservable> source) where T : notnull { } @@ -2452,21 +2451,21 @@ namespace DynamicData where T : notnull { } public static System.IObservable> ToCollection(this System.IObservable> source) where TObject : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func expireAfter, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func expireAfter, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func expireAfter, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func expireAfter, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable source, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func? expireAfter, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable> source, System.Func? expireAfter, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } - public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func? expireAfter, int limitSizeTo, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static System.IObservable> ToObservableChangeSet(this System.IObservable source, System.Func? expireAfter, int limitSizeTo, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where T : notnull { } public static System.IObservable> ToSortedCollection(this System.IObservable> source, System.Collections.Generic.IComparer comparer) where TObject : notnull { } @@ -2767,7 +2766,7 @@ namespace DynamicData.Experimental { public static class ExperimentalEx { - public static DynamicData.Experimental.IWatcher AsWatcher(this System.IObservable> source, System.Reactive.Concurrency.IScheduler? scheduler = null) + public static DynamicData.Experimental.IWatcher AsWatcher(this System.IObservable> source, ReactiveUI.Primitives.Concurrency.ISequencer? scheduler = null) where TObject : notnull where TKey : notnull { } } @@ -2813,8 +2812,8 @@ namespace DynamicData.Kernel { public static System.IObservable RetryWithBackOff(this System.IObservable source, System.Func backOffStrategy) where TException : System.Exception { } - public static System.IDisposable ScheduleRecurringAction(this System.Reactive.Concurrency.IScheduler scheduler, System.Func interval, System.Action action) { } - public static System.IDisposable ScheduleRecurringAction(this System.Reactive.Concurrency.IScheduler scheduler, System.TimeSpan interval, System.Action action) { } + public static System.IDisposable ScheduleRecurringAction(this ReactiveUI.Primitives.Concurrency.ISequencer scheduler, System.Func interval, System.Action action) { } + public static System.IDisposable ScheduleRecurringAction(this ReactiveUI.Primitives.Concurrency.ISequencer scheduler, System.TimeSpan interval, System.Action action) { } } public readonly struct ItemWithIndex : System.IEquatable> { @@ -3120,4 +3119,4 @@ namespace DynamicData.Tests public void Dispose() { } protected virtual void Dispose(bool isDisposing) { } } -} +} \ No newline at end of file diff --git a/src/DynamicData.Tests/API/ApiApprovalTests.cs b/src/DynamicData.Tests/API/ApiApprovalTests.cs index 4799b73eb..b810c1ee1 100644 --- a/src/DynamicData.Tests/API/ApiApprovalTests.cs +++ b/src/DynamicData.Tests/API/ApiApprovalTests.cs @@ -1,6 +1,4 @@ -using System.Diagnostics.CodeAnalysis; -using System.Threading.Tasks; -using Xunit; +using System.Diagnostics.CodeAnalysis; namespace DynamicData.APITests { @@ -13,7 +11,19 @@ public class ApiApprovalTests /// /// Tests to make sure the API of DynamicData project is approved. /// - [Fact] + [Test] public Task DynamicDataTests() => typeof(VirtualRequest).Assembly.CheckApproval(["DynamicData"]); + + /// + /// Tests to make sure the API of DynamicData.Reactive project is approved. + /// + [Test] + public Task DynamicDataReactiveTests() + { + var reactiveAssemblyPath = Path.Combine(AppContext.BaseDirectory, "DynamicData.Reactive.dll"); + var reactiveAssembly = System.Reflection.Assembly.LoadFrom(reactiveAssemblyPath); + + return reactiveAssembly.CheckApproval(["DynamicData.Reactive"]); + } } } diff --git a/src/DynamicData.Tests/API/ApiExtensions.cs b/src/DynamicData.Tests/API/ApiExtensions.cs index cd465eb86..0b47952b1 100644 --- a/src/DynamicData.Tests/API/ApiExtensions.cs +++ b/src/DynamicData.Tests/API/ApiExtensions.cs @@ -1,39 +1,69 @@ -using System; using System.Diagnostics.CodeAnalysis; using System.Reflection; using System.Runtime.CompilerServices; -using System.Threading.Tasks; using PublicApiGenerator; -using VerifyXunit; namespace DynamicData.APITests; -/// -/// A helper for doing API approvals. -/// +/// Compares the public API with a reviewed, runtime-specific baseline. [ExcludeFromCodeCoverage] public static class ApiExtensions { - /// - /// Checks to make sure the API is approved. - /// - /// The assembly that is being checked. - /// The namespaces. - /// The caller file path. - /// - /// A Task. - /// - public static async Task CheckApproval(this Assembly assembly, string[] namespaces, [CallerFilePath] string filePath = "") + public static async Task CheckApproval(this Assembly assembly, string[] namespaces, + [CallerFilePath] string filePath = "", [CallerMemberName] string testName = "") { - var generatorOptions = new ApiGeneratorOptions { AllowNamespacePrefixes = namespaces }; - var apiText = assembly.GeneratePublicApi(generatorOptions); - var result = await Verifier.Verify(apiText, null, filePath) - .UniqueForRuntimeAndVersion() - .ScrubEmptyLines() - .ScrubLines(l => - l.StartsWith("[assembly: AssemblyVersion(", StringComparison.InvariantCulture) || - l.StartsWith("[assembly: AssemblyFileVersion(", StringComparison.InvariantCulture) || - l.StartsWith("[assembly: AssemblyInformationalVersion(", StringComparison.InvariantCulture) || - l.StartsWith("[assembly: System.Reflection.AssemblyMetadata(", StringComparison.InvariantCulture)); + var apiText = assembly.GeneratePublicApi(new ApiGeneratorOptions { AllowNamespacePrefixes = namespaces }); + var actual = Normalize(apiText); + var baseline = Path.Combine(ResolveApprovalDirectory(filePath), + $"ApiApprovalTests.{testName}.DotNet{Environment.Version.Major}_0.verified.txt"); + var received = baseline.Replace(".verified.txt", ".received.txt", StringComparison.Ordinal); + var expected = File.Exists(baseline) ? Normalize(await File.ReadAllTextAsync(baseline)) : null; + + if (!string.Equals(actual, expected, StringComparison.Ordinal)) + { + await File.WriteAllTextAsync(received, actual); + } + else if (File.Exists(received)) + { + File.Delete(received); + } + + await Assert.That(actual).IsEqualTo(expected) + .Because($"The public API must match the reviewed baseline at {baseline}; inspect {received} before updating it."); } + + private static string ResolveApprovalDirectory(string filePath) + { + var sourceFileName = Path.GetFileName(filePath); + var directory = new DirectoryInfo(AppContext.BaseDirectory); + while (directory is not null) + { + foreach (var candidate in GetApprovalDirectoryCandidates(directory.FullName)) + { + if (File.Exists(Path.Combine(candidate, sourceFileName))) + { + return candidate; + } + } + + directory = directory.Parent; + } + + return Path.GetDirectoryName(filePath)!; + } + + private static IEnumerable GetApprovalDirectoryCandidates(string directory) + { + yield return Path.Combine(directory, "API"); + yield return Path.Combine(directory, "DynamicData.Tests", "API"); + yield return Path.Combine(directory, "src", "DynamicData.Tests", "API"); + } + + private static string Normalize(string text) => string.Join("\n", text.Replace("\r\n", "\n", StringComparison.Ordinal) + .Split('\n') + .Where(line => !string.IsNullOrWhiteSpace(line) + && !line.StartsWith("[assembly: AssemblyVersion(", StringComparison.Ordinal) + && !line.StartsWith("[assembly: AssemblyFileVersion(", StringComparison.Ordinal) + && !line.StartsWith("[assembly: AssemblyInformationalVersion(", StringComparison.Ordinal) + && !line.StartsWith("[assembly: System.Reflection.AssemblyMetadata(", StringComparison.Ordinal))); } diff --git a/src/DynamicData.Tests/AggregationTests/AggregationFixture.cs b/src/DynamicData.Tests/AggregationTests/AggregationFixture.cs index 4755cddbc..615358498 100644 --- a/src/DynamicData.Tests/AggregationTests/AggregationFixture.cs +++ b/src/DynamicData.Tests/AggregationTests/AggregationFixture.cs @@ -1,14 +1,15 @@ -using System; -using System.Reactive.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.AggregationTests; public class AggregationFixture : IDisposable @@ -44,8 +45,8 @@ public AggregationFixture() }); } - [Fact] - public void CanAccumulate() + [Test] + public async Task CanAccumulate() { var latest = 0; var counter = 0; @@ -61,15 +62,15 @@ public void CanAccumulate() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - counter.Should().Be(3, "Should be 3 updates"); - latest.Should().Be(60, "Accumulated value should be 60"); + await Assert.That(counter).IsEqualTo(3).Because("Should be 3 updates"); + await Assert.That(latest).IsEqualTo(60).Because("Accumulated value should be 60"); _source.AddOrUpdate(new Person("A", 5)); accumulator.Dispose(); } - [Fact] - public void CanHandleUpdatedItem() + [Test] + public async Task CanHandleUpdatedItem() { var latest = 0; var counter = 0; @@ -84,8 +85,8 @@ public void CanHandleUpdatedItem() _source.AddOrUpdate(new Person("A", 10)); _source.AddOrUpdate(new Person("A", 15)); - counter.Should().Be(2, "Should be 2 updates"); - latest.Should().Be(15, "Accumulated value should be 60"); + await Assert.That(counter).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(latest).IsEqualTo(15).Because("Accumulated value should be 60"); accumulator.Dispose(); } diff --git a/src/DynamicData.Tests/AggregationTests/AverageFixture.cs b/src/DynamicData.Tests/AggregationTests/AverageFixture.cs index 400461a92..45c7175d9 100644 --- a/src/DynamicData.Tests/AggregationTests/AverageFixture.cs +++ b/src/DynamicData.Tests/AggregationTests/AverageFixture.cs @@ -1,12 +1,10 @@ -using System; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.AggregationTests; public class AverageFixture : IDisposable @@ -15,8 +13,8 @@ public class AverageFixture : IDisposable public AverageFixture() => _source = new SourceCache(p => p.Name); - [Fact] - public void AddedItemsContributeToSum() + [Test] + public async Task AddedItemsContributeToSum() { double avg = 0; @@ -26,13 +24,13 @@ public void AddedItemsContributeToSum() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumLong() + [Test] + public async Task AddedItemsContributeToSumLong() { double avg = 0; @@ -42,13 +40,13 @@ public void AddedItemsContributeToSumLong() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumFloat() + [Test] + public async Task AddedItemsContributeToSumFloat() { double avg = 0; @@ -58,13 +56,13 @@ public void AddedItemsContributeToSumFloat() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumDouble() + [Test] + public async Task AddedItemsContributeToSumDouble() { double avg = 0; @@ -74,13 +72,13 @@ public void AddedItemsContributeToSumDouble() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumDecimal() + [Test] + public async Task AddedItemsContributeToSumDecimal() { decimal avg = 0; @@ -90,13 +88,13 @@ public void AddedItemsContributeToSumDecimal() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumNullable() + [Test] + public async Task AddedItemsContributeToSumNullable() { double avg = 0; @@ -106,13 +104,13 @@ public void AddedItemsContributeToSumNullable() _source.AddOrUpdate(new Person("B", new int?(20), "F", null)); _source.AddOrUpdate(new Person("C", new int?(30), "F", null)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumNullableLong() + [Test] + public async Task AddedItemsContributeToSumNullableLong() { double avg = 0; @@ -122,13 +120,13 @@ public void AddedItemsContributeToSumNullableLong() _source.AddOrUpdate(new Person("B", new int?(20), "F", null)); _source.AddOrUpdate(new Person("C", new int?(30), "F", null)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumNullableFloat() + [Test] + public async Task AddedItemsContributeToSumNullableFloat() { double avg = 0; @@ -138,13 +136,13 @@ public void AddedItemsContributeToSumNullableFloat() _source.AddOrUpdate(new Person("B", new int?(20), "F", null)); _source.AddOrUpdate(new Person("C", new int?(30), "F", null)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumNullableDouble() + [Test] + public async Task AddedItemsContributeToSumNullableDouble() { double avg = 0; @@ -154,13 +152,13 @@ public void AddedItemsContributeToSumNullableDouble() _source.AddOrUpdate(new Person("B", new int?(20), "F", null)); _source.AddOrUpdate(new Person("C", new int?(30), "F", null)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } - [Fact] - public void AddedItemsContributeToSumNullableDecimal() + [Test] + public async Task AddedItemsContributeToSumNullableDecimal() { decimal avg = 0; @@ -170,15 +168,15 @@ public void AddedItemsContributeToSumNullableDecimal() _source.AddOrUpdate(new Person("B", new int?(20), "F", null)); _source.AddOrUpdate(new Person("C", new int?(30), "F", null)); - avg.Should().Be(20, "Average value should be 20"); + await Assert.That(avg).IsEqualTo(20).Because("Average value should be 20"); accumulator.Dispose(); } public void Dispose() => _source.Dispose(); - [Fact] - public void InlineChangeReEvaluatesTotals() + [Test] + public async Task InlineChangeReEvaluatesTotals() { double avg = 0; @@ -191,16 +189,16 @@ public void InlineChangeReEvaluatesTotals() _source.AddOrUpdate(personb); _source.AddOrUpdate(new Person("C", 30)); - avg.Should().Be(15, "Sum should be 15 after inline change"); + await Assert.That(avg).IsEqualTo(15).Because("Sum should be 15 after inline change"); personb.Age = 20; - avg.Should().Be(20, "Sum should be 20 after inline change"); + await Assert.That(avg).IsEqualTo(20).Because("Sum should be 20 after inline change"); accumulator.Dispose(); } - [Fact] - public void RemoveProduceCorrectResult() + [Test] + public async Task RemoveProduceCorrectResult() { double avg = 0; @@ -211,7 +209,7 @@ public void RemoveProduceCorrectResult() _source.AddOrUpdate(new Person("C", 30)); _source.Remove("A"); - avg.Should().Be(25, "Average value should be 25 after remove"); + await Assert.That(avg).IsEqualTo(25).Because("Average value should be 25 after remove"); accumulator.Dispose(); } } diff --git a/src/DynamicData.Tests/AggregationTests/MaxFixture.cs b/src/DynamicData.Tests/AggregationTests/MaxFixture.cs index 89f274619..2d47a514a 100644 --- a/src/DynamicData.Tests/AggregationTests/MaxFixture.cs +++ b/src/DynamicData.Tests/AggregationTests/MaxFixture.cs @@ -1,12 +1,10 @@ -using System; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.AggregationTests; public class MaxFixture : IDisposable @@ -15,8 +13,8 @@ public class MaxFixture : IDisposable public MaxFixture() => _source = new SourceCache(p => p.Name); - [Fact] - public void AddItems() + [Test] + public async Task AddItems() { var result = 0; @@ -26,15 +24,15 @@ public void AddItems() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - result.Should().Be(30, "Max value should be 30"); + await Assert.That(result).IsEqualTo(30).Because("Max value should be 30"); accumulator.Dispose(); } public void Dispose() => _source.Dispose(); - [Fact] - public void InlineChangeReEvaluatesTotals() + [Test] + public async Task InlineChangeReEvaluatesTotals() { double max = 0; @@ -47,16 +45,16 @@ public void InlineChangeReEvaluatesTotals() _source.AddOrUpdate(new Person("B", 11)); _source.AddOrUpdate(personc); - max.Should().Be(11, "Max should be 11"); + await Assert.That(max).IsEqualTo(11).Because("Max should be 11"); personc.Age = 100; - max.Should().Be(100, "Max should be 100 after inline change"); + await Assert.That(max).IsEqualTo(100).Because("Max should be 100 after inline change"); accumulator.Dispose(); } - [Fact] - public void RemoveItems() + [Test] + public async Task RemoveItems() { var result = 0; @@ -67,7 +65,7 @@ public void RemoveItems() _source.AddOrUpdate(new Person("C", 30)); _source.Remove("C"); - result.Should().Be(20, "Max value should be 20 after remove"); + await Assert.That(result).IsEqualTo(20).Because("Max value should be 20 after remove"); accumulator.Dispose(); } } diff --git a/src/DynamicData.Tests/AggregationTests/MinFixture.cs b/src/DynamicData.Tests/AggregationTests/MinFixture.cs index 168babdbd..77d9ee8bd 100644 --- a/src/DynamicData.Tests/AggregationTests/MinFixture.cs +++ b/src/DynamicData.Tests/AggregationTests/MinFixture.cs @@ -1,12 +1,10 @@ -using System; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.AggregationTests; public class MinFixture : IDisposable @@ -15,8 +13,8 @@ public class MinFixture : IDisposable public MinFixture() => _source = new SourceCache(p => p.Name); - [Fact] - public void AddedItemsContributeToSum() + [Test] + public async Task AddedItemsContributeToSum() { var result = 0; @@ -26,15 +24,15 @@ public void AddedItemsContributeToSum() _source.AddOrUpdate(new Person("B", 20)); _source.AddOrUpdate(new Person("C", 30)); - result.Should().Be(10, "Min value should be 10"); + await Assert.That(result).IsEqualTo(10).Because("Min value should be 10"); accumulator.Dispose(); } public void Dispose() => _source.Dispose(); - [Fact] - public void InlineChangeReEvaluatesTotals() + [Test] + public async Task InlineChangeReEvaluatesTotals() { double min = 0; @@ -46,18 +44,18 @@ public void InlineChangeReEvaluatesTotals() _source.AddOrUpdate(new Person("A", 10)); _source.AddOrUpdate(new Person("B", 11)); _source.AddOrUpdate(personc); - min.Should().Be(5); + await Assert.That(min).IsEqualTo(5); _source.AddOrUpdate(personc); personc.Age = 11; - min.Should().Be(10); + await Assert.That(min).IsEqualTo(10); accumulator.Dispose(); } - [Fact] - public void RemoveProduceCorrectResult() + [Test] + public async Task RemoveProduceCorrectResult() { var result = 0; @@ -68,7 +66,7 @@ public void RemoveProduceCorrectResult() _source.AddOrUpdate(new Person("C", 30)); _source.Remove("A"); - result.Should().Be(20, "Min value should be 20 after remove"); + await Assert.That(result).IsEqualTo(20).Because("Min value should be 20 after remove"); accumulator.Dispose(); } } diff --git a/src/DynamicData.Tests/AggregationTests/SumFixture.ForCache.cs b/src/DynamicData.Tests/AggregationTests/SumFixture.ForCache.cs index 078a8f1b0..346219f36 100644 --- a/src/DynamicData.Tests/AggregationTests/SumFixture.ForCache.cs +++ b/src/DynamicData.Tests/AggregationTests/SumFixture.ForCache.cs @@ -1,12 +1,9 @@ -using System; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.AggregationTests; @@ -14,10 +11,10 @@ public partial class SumFixture { public class ForCache { - [Theory] - [InlineData(1, 10)] - [InlineData(3, 60)] - public void ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) + [Test] + [Arguments(1, 10)] + [Arguments(3, 60)] + public async Task ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) { var ages = new[] { 10, 20, 30 }; using var source = new TestSourceCache(p => p.Name); @@ -28,9 +25,9 @@ public void ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().BeEmpty("no items have been added to the source"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).IsEmpty(); // UUT Action for (var i = 0; i < itemCount; i++) @@ -38,17 +35,17 @@ public void ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) source.AddOrUpdate(new Person(((char)('A' + i)).ToString(), ages[i])); } - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(itemCount, "each AddOrUpdate should produce a new sum emission"); - results.RecordedValues[^1].Should().Be(expectedSum, $"the sum of the first {itemCount} ages should be {expectedSum}"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(itemCount).Because("each AddOrUpdate should produce a new sum emission"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(expectedSum).Because($"the sum of the first {itemCount} ages should be {expectedSum}"); } - [Theory] - [InlineData("A", 50)] - [InlineData("B", 40)] - [InlineData("C", 30)] - public void ItemIsRemoved_SumReflectsRemoval(string keyToRemove, int expectedSum) + [Test] + [Arguments("A", 50)] + [Arguments("B", 40)] + [Arguments("C", 30)] + public async Task ItemIsRemoved_SumReflectsRemoval(string keyToRemove, int expectedSum) { using var source = new TestSourceCache(p => p.Name); @@ -62,22 +59,21 @@ public void ItemIsRemoved_SumReflectsRemoval(string keyToRemove, int expectedSum .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(60, "the sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of ages 10 + 20 + 30 is 60"); // UUT Action source.Remove(keyToRemove); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(2, "one additional sum value should have been emitted after the removal"); - results.RecordedValues[^1].Should().Be(expectedSum, $"removing '{keyToRemove}' should leave a sum of {expectedSum}"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(2).Because("one additional sum value should have been emitted after the removal"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(expectedSum).Because($"removing '{keyToRemove}' should leave a sum of {expectedSum}"); } - [Fact] - public void ItemIsUpdated_SumReflectsNewValue() + [Test] + public async Task ItemIsUpdated_SumReflectsNewValue() { using var source = new TestSourceCache(p => p.Name); @@ -90,22 +86,21 @@ public void ItemIsUpdated_SumReflectsNewValue() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(30, "the sum of ages 10 + 20 is 30"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(30).Because("the sum of ages 10 + 20 is 30"); // UUT Action: update "B" from age 20 to age 50 (same key, new value) source.AddOrUpdate(new Person("B", 50)); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(2, "one additional sum value should have been emitted after the update"); - results.RecordedValues[^1].Should().Be(60, "updating 'B' from 20 to 50 should change the sum from 30 to 60"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(2).Because("one additional sum value should have been emitted after the update"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60).Because("updating 'B' from 20 to 50 should change the sum from 30 to 60"); } - [Fact] - public void MultipleChangesInBatch_SingleSumEmitted() + [Test] + public async Task MultipleChangesInBatch_SingleSumEmitted() { using var source = new TestSourceCache(p => p.Name); @@ -115,7 +110,7 @@ public void MultipleChangesInBatch_SingleSumEmitted() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().BeEmpty("no items have been added to the source"); + await Assert.That(results.RecordedValues).IsEmpty(); // UUT Action: add 3 items in a single batch source.Edit(updater => @@ -125,14 +120,13 @@ public void MultipleChangesInBatch_SingleSumEmitted() updater.AddOrUpdate(new Person("C", 30)); }); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("a batched edit should produce exactly one sum emission") - .Which.Should().Be(60, "the sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void SourceIsEmpty_NoSumEmitted() + [Test] + public async Task SourceIsEmpty_NoSumEmitted() { using var source = new TestSourceCache(p => p.Name); @@ -142,13 +136,13 @@ public void SourceIsEmpty_NoSumEmitted() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void AllItemsRemoved_SumReturnsToZero() + [Test] + public async Task AllItemsRemoved_SumReturnsToZero() { using var source = new TestSourceCache(p => p.Name); @@ -162,20 +156,19 @@ public void AllItemsRemoved_SumReturnsToZero() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(60, "the sum of ages 10 + 20 + 30 is 60"); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of ages 10 + 20 + 30 is 60"); // UUT Action: remove all items in a single batch source.Edit(updater => updater.Clear()); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(2, "one additional sum value should have been emitted after clearing"); - results.RecordedValues[^1].Should().Be(0, "all items were removed so the sum should return to zero"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(2).Because("one additional sum value should have been emitted after clearing"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(0).Because("all items were removed so the sum should return to zero"); } - [Fact] - public void SourceCompletesAfterEmitting_CompletionPropagates() + [Test] + public async Task SourceCompletesAfterEmitting_CompletionPropagates() { using var source = new TestSourceCache(p => p.Name); @@ -187,20 +180,19 @@ public void SourceCompletesAfterEmitting_CompletionPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing the pre-existing item") - .Which.Should().Be(10, "the sum of a single age of 10 is 10"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(10).Because("the sum of a single age of 10 is 10"); // UUT Action source.Complete(); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); } - [Fact] - public void SourceCompletesWithoutEmitting_CompletionPropagates() + [Test] + public async Task SourceCompletesWithoutEmitting_CompletionPropagates() { using var source = new TestSourceCache(p => p.Name); @@ -210,18 +202,18 @@ public void SourceCompletesWithoutEmitting_CompletionPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().BeEmpty("no items were added to the source"); + await Assert.That(results.RecordedValues).IsEmpty(); // UUT Action source.Complete(); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void SourceCompletesImmediately_InitialSumAndCompletionPropagate() + [Test] + public async Task SourceCompletesImmediately_InitialSumAndCompletionPropagate() { using var source = new TestSourceCache(p => p.Name); @@ -237,14 +229,13 @@ public void SourceCompletesImmediately_InitialSumAndCompletionPropagate() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source was already completed at the time of subscription"); - results.RecordedValues.Should().ContainSingle("an initial sum value should still be emitted, even when the source completes immediately upon subscription") - .Which.Should().Be(60, "the sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void SourceCompletesImmediatelyWithoutEmitting_CompletionPropagates() + [Test] + public async Task SourceCompletesImmediatelyWithoutEmitting_CompletionPropagates() { using var source = new TestSourceCache(p => p.Name); @@ -256,13 +247,13 @@ public void SourceCompletesImmediatelyWithoutEmitting_CompletionPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source was already completed at the time of subscription"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void SourceErrorsAfterEmitting_ErrorPropagates() + [Test] + public async Task SourceErrorsAfterEmitting_ErrorPropagates() { using var source = new TestSourceCache(p => p.Name); @@ -274,19 +265,19 @@ public void SourceErrorsAfterEmitting_ErrorPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing the pre-existing item"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).HasSingleItem(); // UUT Action var error = new Exception("Test error"); source.SetError(error); - results.Error.Should().BeSameAs(error, "the error from the source should propagate to the subscriber"); - results.HasCompleted.Should().BeFalse("an error is not a completion"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("the error from the source should propagate to the subscriber"); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void SourceErrorsWithoutEmitting_ErrorPropagates() + [Test] + public async Task SourceErrorsWithoutEmitting_ErrorPropagates() { using var source = new TestSourceCache(p => p.Name); @@ -296,19 +287,19 @@ public void SourceErrorsWithoutEmitting_ErrorPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().BeEmpty("no items were added to the source"); + await Assert.That(results.RecordedValues).IsEmpty(); // UUT Action var error = new Exception("Test error"); source.SetError(error); - results.Error.Should().BeSameAs(error, "the error from the source should propagate to the subscriber"); - results.HasCompleted.Should().BeFalse("an error is not a completion"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("the error from the source should propagate to the subscriber"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void SourceFailsImmediately_ErrorPropagates() + [Test] + public async Task SourceFailsImmediately_ErrorPropagates() { using var source = new TestSourceCache(p => p.Name); @@ -323,12 +314,12 @@ public void SourceFailsImmediately_ErrorPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeSameAs(error, "the error from the source should propagate to the subscriber immediately upon subscription"); - results.HasCompleted.Should().BeFalse("an error is not a completion"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("the error from the source should propagate to the subscriber immediately upon subscription"); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void NullableValuesAreTreatedAsZero() + [Test] + public async Task NullableValuesAreTreatedAsZero() { using var source = new TestSourceCache(p => p.Name); @@ -342,19 +333,18 @@ public void NullableValuesAreTreatedAsZero() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(40, "null values should be treated as zero, so the sum should be 10 + 0 + 30 = 40"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(40).Because("null values should be treated as zero, so the sum should be 10 + 0 + 30 = 40"); } - [Theory] - [InlineData(new[] { 10, 20, 30 }, 60)] - [InlineData(new[] { int.MaxValue }, int.MaxValue)] - [InlineData(new[] { int.MinValue }, int.MinValue)] - [InlineData(new[] { int.MaxValue, -1 }, int.MaxValue - 1)] - [InlineData(new[] { int.MinValue, 1 }, int.MinValue + 1)] - public void ItemsAreAdded_SumIsCorrect_ForInt(int[] ages, int expectedSum) + [Test] + [Arguments(new[] { 10, 20, 30 }, 60)] + [Arguments(new[] { int.MaxValue }, int.MaxValue)] + [Arguments(new[] { int.MinValue }, int.MinValue)] + [Arguments(new[] { int.MaxValue, -1 }, int.MaxValue - 1)] + [Arguments(new[] { int.MinValue, 1 }, int.MinValue + 1)] + public async Task ItemsAreAdded_SumIsCorrect_ForInt(int[] ages, int expectedSum) { using var source = new TestSourceCache(p => p.Name); @@ -367,11 +357,11 @@ public void ItemsAreAdded_SumIsCorrect_ForInt(int[] ages, int expectedSum) .Sum(p => p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(expectedSum, $"the int sum of [{string.Join(", ", ages)}] is {expectedSum}"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(expectedSum).Because($"the int sum of [{string.Join(", ", ages)}] is {expectedSum}"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableInt() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableInt() { using var source = new TestSourceCache(p => p.Name); @@ -383,11 +373,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableInt() .Sum(p => p.AgeNullable) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60, "the nullable int sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60).Because("the nullable int sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForLong() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForLong() { using var source = new TestSourceCache(p => p.Name); @@ -399,11 +389,11 @@ public void ItemsAreAdded_SumIsCorrect_ForLong() .Sum(p => (long)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60L, "the long sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60L).Because("the long sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableLong() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableLong() { using var source = new TestSourceCache(p => p.Name); @@ -415,11 +405,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableLong() .Sum(p => (long?)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60L, "the nullable long sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60L).Because("the nullable long sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForDouble() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForDouble() { using var source = new TestSourceCache(p => p.Name); @@ -431,11 +421,11 @@ public void ItemsAreAdded_SumIsCorrect_ForDouble() .Sum(p => (double)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60.0, "the double sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60.0).Because("the double sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableDouble() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableDouble() { using var source = new TestSourceCache(p => p.Name); @@ -447,11 +437,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableDouble() .Sum(p => (double?)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60.0, "the nullable double sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60.0).Because("the nullable double sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForDecimal() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForDecimal() { using var source = new TestSourceCache(p => p.Name); @@ -463,11 +453,11 @@ public void ItemsAreAdded_SumIsCorrect_ForDecimal() .Sum(p => (decimal)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60M, "the decimal sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60M).Because("the decimal sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableDecimal() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableDecimal() { using var source = new TestSourceCache(p => p.Name); @@ -479,11 +469,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableDecimal() .Sum(p => (decimal?)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60M, "the nullable decimal sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60M).Because("the nullable decimal sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForFloat() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForFloat() { using var source = new TestSourceCache(p => p.Name); @@ -495,11 +485,11 @@ public void ItemsAreAdded_SumIsCorrect_ForFloat() .Sum(p => (float)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60F, "the float sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60F).Because("the float sum of ages 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableFloat() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableFloat() { using var source = new TestSourceCache(p => p.Name); @@ -511,7 +501,7 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableFloat() .Sum(p => (float?)p.Age) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60F, "the nullable float sum of ages 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60F).Because("the nullable float sum of ages 10 + 20 + 30 is 60"); } } } diff --git a/src/DynamicData.Tests/AggregationTests/SumFixture.ForList.cs b/src/DynamicData.Tests/AggregationTests/SumFixture.ForList.cs index 9e9108602..b145b6058 100644 --- a/src/DynamicData.Tests/AggregationTests/SumFixture.ForList.cs +++ b/src/DynamicData.Tests/AggregationTests/SumFixture.ForList.cs @@ -1,12 +1,8 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.AggregationTests; @@ -14,10 +10,10 @@ public partial class SumFixture { public class ForList { - [Theory] - [InlineData(1, 10)] - [InlineData(3, 60)] - public void ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) + [Test] + [Arguments(1, 10)] + [Arguments(3, 60)] + public async Task ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) { var items = new[] { 10, 20, 30 }; using var source = new TestSourceList(); @@ -28,24 +24,23 @@ public void ItemsAreAdded_SumReflectsAllItems(int itemCount, int expectedSum) .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().BeEmpty("no items have been added to the source"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).IsEmpty(); // UUT Action source.AddRange(items.Take(itemCount)); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("an AddRange produces a single changeset") - .Which.Should().Be(expectedSum, $"the sum of the first {itemCount} items should be {expectedSum}"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(expectedSum).Because($"the sum of the first {itemCount} items should be {expectedSum}"); } - [Theory] - [InlineData(0, 50)] - [InlineData(1, 40)] - [InlineData(2, 30)] - public void ItemIsRemoved_SumReflectsRemoval(int removalIndex, int expectedSum) + [Test] + [Arguments(0, 50)] + [Arguments(1, 40)] + [Arguments(2, 30)] + public async Task ItemIsRemoved_SumReflectsRemoval(int removalIndex, int expectedSum) { using var source = new TestSourceList(); @@ -57,22 +52,21 @@ public void ItemIsRemoved_SumReflectsRemoval(int removalIndex, int expectedSum) .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(60, "the sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of items 10 + 20 + 30 is 60"); // UUT Action source.RemoveAt(removalIndex); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(2, "one additional sum value should have been emitted after the removal"); - results.RecordedValues[^1].Should().Be(expectedSum, $"removing item at index {removalIndex} should leave a sum of {expectedSum}"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(2).Because("one additional sum value should have been emitted after the removal"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(expectedSum).Because($"removing item at index {removalIndex} should leave a sum of {expectedSum}"); } - [Fact] - public void ItemIsReplaced_SumReflectsReplacement() + [Test] + public async Task ItemIsReplaced_SumReflectsReplacement() { using var source = new TestSourceList(); @@ -84,20 +78,19 @@ public void ItemIsReplaced_SumReflectsReplacement() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(60, "the sum of items 10 + 20 + 30 is 60"); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of items 10 + 20 + 30 is 60"); // UUT Action: replace item at index 1 (value 20) with 50 source.ReplaceAt(1, 50); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(2, "one additional sum value should have been emitted after the replacement"); - results.RecordedValues[^1].Should().Be(90, "replacing 20 with 50 should change the sum from 60 to 90"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(2).Because("one additional sum value should have been emitted after the replacement"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(90).Because("replacing 20 with 50 should change the sum from 60 to 90"); } - [Fact] - public void ItemsAreCleared_SumReturnsToZero() + [Test] + public async Task ItemsAreCleared_SumReturnsToZero() { using var source = new TestSourceList(); @@ -109,20 +102,19 @@ public void ItemsAreCleared_SumReturnsToZero() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items") - .Which.Should().Be(60, "the sum of items 10 + 20 + 30 is 60"); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of items 10 + 20 + 30 is 60"); // UUT Action source.Clear(); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().HaveCount(2, "one additional sum value should have been emitted after clearing"); - results.RecordedValues[^1].Should().Be(0, "all items were removed so the sum should return to zero"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasCount(2).Because("one additional sum value should have been emitted after clearing"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(0).Because("all items were removed so the sum should return to zero"); } - [Fact] - public void SourceIsEmpty_NoSumEmitted() + [Test] + public async Task SourceIsEmpty_NoSumEmitted() { using var source = new TestSourceList(); @@ -132,13 +124,13 @@ public void SourceIsEmpty_NoSumEmitted() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void SourceCompletesAfterEmitting_CompletionPropagates() + [Test] + public async Task SourceCompletesAfterEmitting_CompletionPropagates() { using var source = new TestSourceList(); @@ -150,19 +142,19 @@ public void SourceCompletesAfterEmitting_CompletionPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasSingleItem(); // UUT Action source.Complete(); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); } - [Fact] - public void SourceCompletesWithoutEmitting_CompletionPropagates() + [Test] + public async Task SourceCompletesWithoutEmitting_CompletionPropagates() { using var source = new TestSourceList(); @@ -172,18 +164,18 @@ public void SourceCompletesWithoutEmitting_CompletionPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Should().BeEmpty("no items were added to the source"); + await Assert.That(results.RecordedValues).IsEmpty(); // UUT Action source.Complete(); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void SourceCompletesImmediately_InitialSumAndCompletionPropagate() + [Test] + public async Task SourceCompletesImmediately_InitialSumAndCompletionPropagate() { using var source = new TestSourceList(); @@ -197,14 +189,13 @@ public void SourceCompletesImmediately_InitialSumAndCompletionPropagate() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source was already completed at the time of subscription"); - results.RecordedValues.Should().ContainSingle("an initial sum value should still be emitted, even when the source completes immediately upon subscription") - .Which.Should().Be(60, "the sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(await Assert.That(results.RecordedValues).HasSingleItem()).IsEqualTo(60).Because("the sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void SourceCompletesImmediatelyWithoutEmitting_CompletionPropagates() + [Test] + public async Task SourceCompletesImmediatelyWithoutEmitting_CompletionPropagates() { using var source = new TestSourceList(); @@ -216,13 +207,13 @@ public void SourceCompletesImmediatelyWithoutEmitting_CompletionPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source was already completed at the time of subscription"); - results.RecordedValues.Should().BeEmpty("no items were added so no sum values should have been emitted"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedValues).IsEmpty(); } - [Fact] - public void SourceErrorsAfterEmitting_ErrorPropagates() + [Test] + public async Task SourceErrorsAfterEmitting_ErrorPropagates() { using var source = new TestSourceList(); @@ -234,19 +225,19 @@ public void SourceErrorsAfterEmitting_ErrorPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Should().ContainSingle("one changeset was published containing all pre-existing items"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).HasSingleItem(); // UUT Action var error = new Exception("Test error"); source.SetError(error); - results.Error.Should().BeSameAs(error, "the error from the source should propagate to the subscriber"); - results.HasCompleted.Should().BeFalse("an error is not a completion"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("the error from the source should propagate to the subscriber"); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void SourceFailsImmediately_ErrorPropagates() + [Test] + public async Task SourceFailsImmediately_ErrorPropagates() { using var source = new TestSourceList(); @@ -261,17 +252,17 @@ public void SourceFailsImmediately_ErrorPropagates() .ValidateSynchronization() .RecordValues(out var results); - results.Error.Should().BeSameAs(error, "the error from the source should propagate to the subscriber immediately upon subscription"); - results.HasCompleted.Should().BeFalse("an error is not a completion"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("the error from the source should propagate to the subscriber immediately upon subscription"); + await Assert.That(results.HasCompleted).IsFalse(); } - [Theory] - [InlineData(new[] { 10, 20, 30 }, 60)] - [InlineData(new[] { int.MaxValue }, int.MaxValue)] - [InlineData(new[] { int.MinValue }, int.MinValue)] - [InlineData(new[] { int.MaxValue, -1 }, int.MaxValue - 1)] - [InlineData(new[] { int.MinValue, 1 }, int.MinValue + 1)] - public void ItemsAreAdded_SumIsCorrect_ForInt(int[] values, int expectedSum) + [Test] + [Arguments(new[] { 10, 20, 30 }, 60)] + [Arguments(new[] { int.MaxValue }, int.MaxValue)] + [Arguments(new[] { int.MinValue }, int.MinValue)] + [Arguments(new[] { int.MaxValue, -1 }, int.MaxValue - 1)] + [Arguments(new[] { int.MinValue, 1 }, int.MinValue + 1)] + public async Task ItemsAreAdded_SumIsCorrect_ForInt(int[] values, int expectedSum) { using var source = new TestSourceList(); @@ -281,11 +272,11 @@ public void ItemsAreAdded_SumIsCorrect_ForInt(int[] values, int expectedSum) .Sum(x => x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(expectedSum, $"the int sum of [{string.Join(", ", values)}] is {expectedSum}"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(expectedSum).Because($"the int sum of [{string.Join(", ", values)}] is {expectedSum}"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableInt() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableInt() { using var source = new TestSourceList(); @@ -295,11 +286,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableInt() .Sum(x => (int?)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60, "the nullable int sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60).Because("the nullable int sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForLong() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForLong() { using var source = new TestSourceList(); @@ -309,11 +300,11 @@ public void ItemsAreAdded_SumIsCorrect_ForLong() .Sum(x => (long)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60L, "the long sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60L).Because("the long sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableLong() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableLong() { using var source = new TestSourceList(); @@ -323,11 +314,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableLong() .Sum(x => (long?)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60L, "the nullable long sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60L).Because("the nullable long sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForDouble() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForDouble() { using var source = new TestSourceList(); @@ -337,11 +328,11 @@ public void ItemsAreAdded_SumIsCorrect_ForDouble() .Sum(x => (double)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60.0, "the double sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60.0).Because("the double sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableDouble() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableDouble() { using var source = new TestSourceList(); @@ -351,11 +342,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableDouble() .Sum(x => (double?)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60.0, "the nullable double sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60.0).Because("the nullable double sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForDecimal() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForDecimal() { using var source = new TestSourceList(); @@ -365,11 +356,11 @@ public void ItemsAreAdded_SumIsCorrect_ForDecimal() .Sum(x => (decimal)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60M, "the decimal sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60M).Because("the decimal sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableDecimal() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableDecimal() { using var source = new TestSourceList(); @@ -379,11 +370,11 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableDecimal() .Sum(x => (decimal?)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60M, "the nullable decimal sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60M).Because("the nullable decimal sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForFloat() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForFloat() { using var source = new TestSourceList(); @@ -393,11 +384,11 @@ public void ItemsAreAdded_SumIsCorrect_ForFloat() .Sum(x => (float)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60F, "the float sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60F).Because("the float sum of items 10 + 20 + 30 is 60"); } - [Fact] - public void ItemsAreAdded_SumIsCorrect_ForNullableFloat() + [Test] + public async Task ItemsAreAdded_SumIsCorrect_ForNullableFloat() { using var source = new TestSourceList(); @@ -407,7 +398,7 @@ public void ItemsAreAdded_SumIsCorrect_ForNullableFloat() .Sum(x => (float?)x) .RecordValues(out var results); - results.RecordedValues[^1].Should().Be(60F, "the nullable float sum of items 10 + 20 + 30 is 60"); + await Assert.That(results.RecordedValues[^1]).IsEqualTo(60F).Because("the nullable float sum of items 10 + 20 + 30 is 60"); } } } diff --git a/src/DynamicData.Tests/AliasAndReasonCoverageFixture.cs b/src/DynamicData.Tests/AliasAndReasonCoverageFixture.cs new file mode 100644 index 000000000..65a1863c2 --- /dev/null +++ b/src/DynamicData.Tests/AliasAndReasonCoverageFixture.cs @@ -0,0 +1,168 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +using CacheAliases = DynamicData.Reactive.Alias.ObservableCacheAlias; +using ListAliases = DynamicData.Reactive.Alias.ObservableListAlias; +#else +using DynamicData.Kernel; +using CacheAliases = DynamicData.Alias.ObservableCacheAlias; +using ListAliases = DynamicData.Alias.ObservableListAlias; +#endif + +namespace DynamicData.Tests; + +public sealed class AliasAndReasonCoverageFixture +{ + [Test] + public async Task ListWhereAliasesTrackStaticAndChangingPredicates() + { + using var source = new SourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.Signal>(); + using var staticResults = ListAliases.Where(source.Connect(), static item => item % 2 == 0).AsAggregator(); + using var dynamicResults = ListAliases.Where(source.Connect(), predicates).AsAggregator(); + source.AddRange(new[] { 1, 2, 3, 4 }); + await Assert.That(dynamicResults.Data.Items).IsEmpty(); + predicates.OnNext(static item => item > 2); + await Assert.That(dynamicResults.Data.Items).IsEquivalentTo(new[] { 3, 4 }); + source.Remove(4); + predicates.OnNext(static item => item < 3); + + await Assert.That(staticResults.Data.Items).IsEquivalentTo(new[] { 2 }); + await Assert.That(dynamicResults.Data.Items).IsEquivalentTo(new[] { 1, 2 }); + } + + [Test] + public async Task ListSelectManyAliasRemovesChildrenWhenParentIsRemoved() + { + using var source = new SourceList(); + using var results = ListAliases.SelectMany(source.Connect(), static children => children).AsAggregator(); + var first = new[] { 1, 2 }; + var second = new[] { 3, 4 }; + source.AddRange(new[] { first, second }); + source.Remove(first); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 3, 4 }); + await Assert.That(results.Messages.Last().Removes).IsEqualTo(2); + source.Clear(); + await Assert.That(results.Data.Items).IsEmpty(); + } + + [Test] + public async Task CacheSelectSafeAliasSupportsForcedRetransformAndItemErrors() + { + using var source = new SourceCache(static item => item.Key); + using var force = new ReactiveUI.Primitives.Signals.Signal(); + var errors = new List>(); + var multiplier = 2; + using var results = CacheAliases.SelectSafe( + source.Connect(), + item => item.Value < 0 ? throw new InvalidOperationException("invalid value") : item.Value * multiplier, + errors.Add, + force).AsAggregator(); + source.AddOrUpdate(new KeyedItem(1, 10)); + await Assert.That(results.Data.Lookup(1).Value).IsEqualTo(20); + + multiplier = 3; + force.OnNext(Unit.Default); + source.AddOrUpdate(new KeyedItem(2, -1)); + + await Assert.That(results.Data.Lookup(1).Value).IsEqualTo(30); + await Assert.That(results.Data.Lookup(2).HasValue).IsFalse(); + await Assert.That(errors.Count).IsEqualTo(1); + await Assert.That(errors[0].Key).IsEqualTo(2); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task CacheReasonFilterSuppressesEmptyMessagesAndPreservesSelectedChanges() + { + using var source = new SourceCache(static item => item.Key); + var messages = new List>(); + using var subscription = source.Connect().WhereReasonsAre(ChangeReason.Add, ChangeReason.Remove).Subscribe(messages.Add); + source.AddOrUpdate(new KeyedItem(1, 10)); + source.AddOrUpdate(new KeyedItem(1, 20)); + source.Refresh(source.Lookup(1).Value); + source.RemoveKey(1); + + await Assert.That(messages.Count).IsEqualTo(2); + await Assert.That(messages[0].Adds).IsEqualTo(1); + await Assert.That(messages[1].Removes).IsEqualTo(1); + await Assert.That(messages[1].Single().Current.Value).IsEqualTo(20); + await Assert.That(() => source.Connect().WhereReasonsAre()).Throws(); + } + + [Test] + public async Task ExcludingListMutationsStripsIndicesWhileRefreshOnlyExclusionRetainsThem() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var stripped = new List>(); + var preserved = new List>(); + using var first = source.WhereReasonsAreNot(ListChangeReason.Remove, ListChangeReason.Add).Subscribe(stripped.Add); + using var second = source.WhereReasonsAreNot(ListChangeReason.Refresh).Subscribe(preserved.Add); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Add, 10, 2), + new(ListChangeReason.Replace, 20, ReactiveUI.Primitives.Optional.Create(10), 2, 2), + new(ListChangeReason.Refresh, 20, 2) + }); + + await Assert.That(stripped.Count).IsEqualTo(1); + await Assert.That(stripped[0].Count).IsEqualTo(2); + await Assert.That(stripped[0].First().Item.CurrentIndex).IsEqualTo(-1); + await Assert.That(stripped[0].First().Item.PreviousIndex).IsEqualTo(-1); + await Assert.That(stripped[0].Last().Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(stripped[0].Last().Item.CurrentIndex).IsEqualTo(2); + await Assert.That(stripped[0].Last().Item.Current).IsEqualTo(20); + await Assert.That(preserved.Count).IsEqualTo(1); + await Assert.That(preserved[0].Count).IsEqualTo(2); + await Assert.That(preserved[0].First().Item.CurrentIndex).IsEqualTo(2); + await Assert.That(preserved[0].Last().Item.PreviousIndex).IsEqualTo(2); + await Assert.That(() => source.WhereReasonsAreNot()).Throws(); + } + + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task RemovingIndicesRetainsRefreshSourcePositionAndOmitsMoves(bool filterReasons) + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var messages = new List>(); + var output = filterReasons + ? source.WhereReasonsAre(ListChangeReason.Refresh, ListChangeReason.Moved) + : source.RemoveIndex(); + using var subscription = output.Subscribe(messages.Add); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Refresh, 20, 2), + new(20, 1, 2) + }); + + await Assert.That(messages.Count).IsEqualTo(1); + await Assert.That(messages[0].Count).IsEqualTo(1); + var refresh = messages[0].Single(); + await Assert.That(refresh.Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(refresh.Item.Current).IsEqualTo(20); + await Assert.That(refresh.Item.CurrentIndex).IsEqualTo(2); + } + + [Test] + public async Task StartWithKeyedItemEmitsInitialAddThenSourceUpdate() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var initial = new KeyedItem(7, 10); + var replacement = new KeyedItem(7, 20); + using var results = source.StartWithItem(initial).AsAggregator(); + await Assert.That(results.Data.Lookup(7).Value).IsSameReferenceAs(initial); + + source.OnNext(new ChangeSet + { + new(ChangeReason.Update, 7, replacement, ReactiveUI.Primitives.Optional.Create(initial)) + }); + + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Updates).IsEqualTo(1); + await Assert.That(results.Data.Lookup(7).Value).IsSameReferenceAs(replacement); + } + + private sealed record KeyedItem(int Key, int Value) : IKey; +} diff --git a/src/DynamicData.Tests/AsyncCancellationRegressionFixture.cs b/src/DynamicData.Tests/AsyncCancellationRegressionFixture.cs new file mode 100644 index 000000000..080b1e0e4 --- /dev/null +++ b/src/DynamicData.Tests/AsyncCancellationRegressionFixture.cs @@ -0,0 +1,83 @@ +namespace DynamicData.Tests; + +public class AsyncCancellationRegressionFixture +{ + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task CacheTransformDisposalCancelsFactoryWithoutNotifyingObserver(bool handleErrors) + { + using var source = new SourceCache(value => value); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var cancelled = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var notifications = 0; + Func, int, CancellationToken, Task> factory = + async (value, previous, key, cancellationToken) => + { + started.TrySetResult(cancellationToken); + try + { + await Task.Delay(Timeout.InfiniteTimeSpan, cancellationToken); + return value.ToString(); + } + catch (OperationCanceledException) + { + cancelled.TrySetResult(); + throw; + } + }; + var changes = handleErrors + ? source.Connect().TransformSafeAsync(factory, _ => Interlocked.Increment(ref notifications), new TransformAsyncOptions()) + : source.Connect().TransformAsync(factory, new TransformAsyncOptions()); + using var subscription = changes.Subscribe( + _ => Interlocked.Increment(ref notifications), + _ => Interlocked.Increment(ref notifications), + () => Interlocked.Increment(ref notifications)); + + source.AddOrUpdate(1); + var token = await started.Task.WaitAsync(TimeSpan.FromSeconds(10)); + subscription.Dispose(); + await cancelled.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(token.CanBeCanceled).IsTrue(); + await Assert.That(token.IsCancellationRequested).IsTrue(); + await Assert.That(Volatile.Read(ref notifications)).IsEqualTo(0); + } + + [Test] + public async Task ListTransformDisposalCancelsFactoryWithoutNotifyingObserver() + { + using var source = new SourceList(); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var cancelled = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var notifications = 0; + Func, int, CancellationToken, Task> factory = + async (value, previous, index, cancellationToken) => + { + started.TrySetResult(cancellationToken); + try + { + await Task.Delay(Timeout.InfiniteTimeSpan, cancellationToken); + return value.ToString(); + } + catch (OperationCanceledException) + { + cancelled.TrySetResult(); + throw; + } + }; + using var subscription = source.Connect().TransformAsync(factory).Subscribe( + _ => Interlocked.Increment(ref notifications), + _ => Interlocked.Increment(ref notifications), + () => Interlocked.Increment(ref notifications)); + + source.Add(1); + var token = await started.Task.WaitAsync(TimeSpan.FromSeconds(10)); + subscription.Dispose(); + await cancelled.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(token.CanBeCanceled).IsTrue(); + await Assert.That(token.IsCancellationRequested).IsTrue(); + await Assert.That(Volatile.Read(ref notifications)).IsEqualTo(0); + } +} diff --git a/src/DynamicData.Tests/AutoRefreshFilter.cs b/src/DynamicData.Tests/AutoRefreshFilter.cs index 94226edb9..301faf96f 100644 --- a/src/DynamicData.Tests/AutoRefreshFilter.cs +++ b/src/DynamicData.Tests/AutoRefreshFilter.cs @@ -1,40 +1,37 @@ -using System; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests; public class AutoRefreshFilter { - [Fact] - public void Bind_Transform_and_FilterOnObservable() + [Test] + public async Task Bind_Transform_and_FilterOnObservable() { var count = 3; - var list = new SourceList(); + using var list = new SourceList(); list.AddRange(Enumerable.Range(1, count).Select(c => $"item {c}")); - + var bindedList = new ObservableCollectionExtended(); - - list.Connect() + + Exception? error = null; + using var subscription = list.Connect() .FilterOnObservable(_ => Observable.Return(true)) .Transform(str => str) .Bind(bindedList) .Subscribe( _ => { }, - ex => {Assert.Fail("There should be no error");} + ex => error = ex ); + await Assert.That(error).IsNull(); + await Assert.That(bindedList).IsEquivalentTo(list.Items); } - - [Fact] - public void Test() + [Test] + public async Task Test() { var a0 = new Item("A0"); var i1 = new Item("I1"); @@ -46,20 +43,20 @@ public void Test() var obsListDerived = obsList.Connect().AutoRefresh(x => x.Name).Filter(x => x.Name.Contains("I")).AsObservableList(); - obsListDerived.Count.Should().Be(3); - obsListDerived.Items.Should().BeEquivalentTo(new []{ i1, i2, i3}); + await Assert.That(obsListDerived.Count).IsEqualTo(3); + await Assert.That(obsListDerived.Items).IsEquivalentTo(new[] { i1, i2, i3 }); i1.Name = "X2"; - obsListDerived.Count.Should().Be(2); - obsListDerived.Items.Should().BeEquivalentTo(new[] { i2, i3}); + await Assert.That(obsListDerived.Count).IsEqualTo(2); + await Assert.That(obsListDerived.Items).IsEquivalentTo(new[] { i2, i3 }); a0.Name = "I0"; - obsListDerived.Count.Should().Be(3); - obsListDerived.Items.Should().BeEquivalentTo(new[] { a0, i2, i3}); + await Assert.That(obsListDerived.Count).IsEqualTo(3); + await Assert.That(obsListDerived.Items).IsEquivalentTo(new[] { a0, i2, i3 }); } - [Fact] - public void AutoRefreshWithObservablePredicate1() + [Test] + public async Task AutoRefreshWithObservablePredicate1() { var item1 = new ActivableItem { @@ -69,7 +66,7 @@ public void AutoRefreshWithObservablePredicate1() var items = new SourceList(); items.Add(item1); - var filterSubject = new BehaviorSubject>(_ => false); + var filterSubject = new ReactiveUI.Primitives.Signals.StateSignal>(_ => false); var obsListDerived = items .Connect() @@ -80,30 +77,30 @@ public void AutoRefreshWithObservablePredicate1() // Default filter predicate denies all items // The binding collection should stay empty, until the predicate changes - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); item1.Activated = true; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); item1.Activated = false; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); item1.Activated = true; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); // Changing predicate, all "Activated" items should added to the binding collection filterSubject.OnNext(i => i.Activated); - obsListDerived.Count.Should().Be(1); - obsListDerived.Items.Should().BeEquivalentTo(new[] { item1 }); + await Assert.That(obsListDerived.Count).IsEqualTo(1); + await Assert.That(obsListDerived.Items).IsEquivalentTo(new[] { item1 }); // Changing property value item1.Activated = false; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); } - [Fact] - public void AutoRefreshWithObservablePredicate2() + [Test] + public async Task AutoRefreshWithObservablePredicate2() { var item1 = new ActivableItem { @@ -113,7 +110,7 @@ public void AutoRefreshWithObservablePredicate2() var items = new ObservableCollection(); items.Add(item1); - var filterSubject = new BehaviorSubject>(_ => false); + var filterSubject = new ReactiveUI.Primitives.Signals.StateSignal>(_ => false); var obsListDerived = items .ToObservableChangeSet() @@ -123,30 +120,30 @@ public void AutoRefreshWithObservablePredicate2() // Default filter predicate denies all items // The binding collection should stay empty, until the predicate changes - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); item1.Activated = true; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); item1.Activated = false; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); item1.Activated = true; - obsListDerived.Count.Should().Be(0); + await Assert.That(obsListDerived.Count).IsEqualTo(0); // Changing predicate, all "Activated" items should added to the binding collection filterSubject.OnNext(i => i.Activated); - obsListDerived.Count.Should().Be(1); - obsListDerived.Items.Should().BeEquivalentTo(new[] { item1 }); + await Assert.That(obsListDerived.Count).IsEqualTo(1); + await Assert.That(obsListDerived.Items).IsEquivalentTo(new[] { item1 }); // Changing property value multiple times item1.Activated = false; item1.Activated = true; item1.Activated = false; item1.Activated = true; - obsListDerived.Count.Should().Be(1); - obsListDerived.Items.Should().BeEquivalentTo(new[] { item1 }); + await Assert.That(obsListDerived.Count).IsEqualTo(1); + await Assert.That(obsListDerived.Items).IsEquivalentTo(new[] { item1 }); } } diff --git a/src/DynamicData.Tests/Binding/AvaloniaDictionaryFixture.cs b/src/DynamicData.Tests/Binding/AvaloniaDictionaryFixture.cs index 478fa6807..d2f78cfdd 100644 --- a/src/DynamicData.Tests/Binding/AvaloniaDictionaryFixture.cs +++ b/src/DynamicData.Tests/Binding/AvaloniaDictionaryFixture.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.ComponentModel; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using DynamicData.Binding; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Binding; @@ -21,25 +17,25 @@ public class AvaloniaDictionaryFixture public AvaloniaDictionaryFixture() { _collection = new AvaloniaDictionary(); - _results = _collection.ToObservableChangeSet, KeyValuePair>() - .Transform(x=>x.Value) + _results = _collection.ToObservableChangeSet, KeyValuePair>() + .Transform(x => x.Value) .AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { - var person = new Person("Someone",10, "M"); + var person = new Person("Someone", 10, "M"); _collection.Add("Someone", person); - _results.Messages.Count.Should().Be(2); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(person); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { var person1 = new Person("Someone", 10, "M"); var person2 = new Person("Someone", 11, "M"); @@ -47,24 +43,22 @@ public void Replace() _collection.Add("Someone", person1); _collection["Someone"] = person2; - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(person2); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person2); } - - [Fact] - public void Remove() + [Test] + public async Task Remove() { var person = new Person("Someone", 10, "M"); _collection.Add("Someone", person); _collection.Remove(person.Key); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } } - public interface IAvaloniaDictionary : IDictionary, IAvaloniaReadOnlyDictionary, @@ -73,7 +67,6 @@ public interface IAvaloniaDictionary { } - public interface IAvaloniaReadOnlyDictionary : IReadOnlyDictionary, INotifyCollectionChanged, @@ -82,7 +75,6 @@ public interface IAvaloniaReadOnlyDictionary { } - /* Copied from Avalionia because an issue was raised due to compatibility issues with ToObservableChangeSet(). @@ -202,7 +194,6 @@ public void Clear() PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Count))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(CommonPropertyNames.IndexerName)); - if (CollectionChanged != null) { var e = new NotifyCollectionChangedEventArgs( @@ -294,7 +285,6 @@ private void NotifyAdd(TKey key, TValue value) PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Count))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"{CommonPropertyNames.IndexerName}[{key}]")); - if (CollectionChanged != null) { var e = new NotifyCollectionChangedEventArgs( diff --git a/src/DynamicData.Tests/Binding/BindingBoundaryCoverageFixture.cs b/src/DynamicData.Tests/Binding/BindingBoundaryCoverageFixture.cs new file mode 100644 index 000000000..014a5309c --- /dev/null +++ b/src/DynamicData.Tests/Binding/BindingBoundaryCoverageFixture.cs @@ -0,0 +1,324 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else +using DynamicData.Cache.Internal; +#endif +using System.Collections.Specialized; +using System.Linq.Expressions; +using System.Reflection; +using ReactiveUI.Primitives.Signals; + +namespace DynamicData.Tests.Binding; + +public sealed class BindingBoundaryCoverageFixture +{ + [Test] + public async Task SortExpressionComparerOrdersNullObjectsNullValuesAndDescendingTieBreakers() + { + var comparer = SortExpressionComparer.Ascending(PrimarySortValue) + .ThenByDescending(static item => item.Secondary!); + + await Assert.That(comparer.Compare(null, null)).IsEqualTo(0); + await Assert.That(comparer.Compare(null, new SortableBoundaryItem(1, "a"))).IsEqualTo(-1); + await Assert.That(comparer.Compare(new SortableBoundaryItem(1, "a"), null)).IsEqualTo(1); + await Assert.That(comparer.Compare(new SortableBoundaryItem(null, "a"), new SortableBoundaryItem(1, "a"))).IsEqualTo(-1); + await Assert.That(comparer.Compare(new SortableBoundaryItem(1, "a"), new SortableBoundaryItem(null, "a"))).IsEqualTo(1); + await Assert.That(comparer.Compare(new SortableBoundaryItem(1, "z"), new SortableBoundaryItem(1, "a"))).IsLessThan(0); + } + + [Test] + public async Task ObservableCollectionExtendedConstructorsAndRemoveRangePreserveItemsAndNotifications() + { + var fromList = new ObservableCollectionExtended(new List { 1, 2 }); + var fromEnumerable = new ObservableCollectionExtended(Enumerable.Range(3, 2)); + var collection = new ObservableCollectionExtended(new List { 1, 2, 3, 4 }); + var actions = new List(); + + collection.CollectionChanged += (_, args) => actions.Add(args.Action); + collection.RemoveRange(1, 2); + + await Assert.That(fromList).IsEquivalentTo(new[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(fromEnumerable).IsEquivalentTo(new[] { 3, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(collection).IsEquivalentTo(new[] { 1, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(actions).IsEquivalentTo(new[] { NotifyCollectionChangedAction.Remove, NotifyCollectionChangedAction.Remove }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task SinglePropertyObservationRoutesAccessorFailureToError() + { + var source = new ThrowingNode(); + Exception? error = null; + + using var subscription = source.WhenPropertyChanged(static node => node.Danger, notifyOnInitialValue: false) + .Subscribe(_ => { }, ex => error = ex); + + source.ThrowOnDanger = true; + source.RaiseDangerChanged(); + + await Assert.That(error).IsTypeOf(); + await Assert.That(error!.Message).IsEqualTo("danger unavailable"); + } + + [Test] + public async Task DeepPropertyObservationRoutesInitialAccessorFailureToError() + { + var source = new ThrowingNode + { + Child = new ThrowingNode { ThrowOnDanger = true } + }; + Exception? error = null; + + using var subscription = source.WhenPropertyChanged(static node => node.Child!.Danger, notifyOnInitialValue: true) + .Subscribe(_ => { }, ex => error = ex); + + await Assert.That(error).IsTypeOf(); + await Assert.That(error!.InnerException).IsTypeOf(); + await Assert.That(error.InnerException!.Message).IsEqualTo("danger unavailable"); + } + + [Test] + public async Task BindingListAdaptorAddsUpdateWhenPreviousItemIsMissingAndRefreshesExistingItems() + { + var first = new SortableBoundaryItem(1, "first"); + var missingPrevious = new SortableBoundaryItem(99, "missing"); + var updated = new SortableBoundaryItem(2, "updated"); + var list = new BindingList(); + var adaptor = new BindingListAdaptor(list, refreshThreshold: 10); + var notifications = new List(); + list.ListChanged += (_, args) => notifications.Add(args.ListChangedType); + + adaptor.Adapt(new ChangeSet { new(ChangeReason.Add, first.Id, first) }); + notifications.Clear(); + + adaptor.Adapt(new ChangeSet + { + new(ChangeReason.Update, updated.Id, updated, ReactiveUI.Primitives.Optional.Create(missingPrevious)) + }); + adaptor.Adapt(new ChangeSet { new(ChangeReason.Refresh, first.Id, first) }); + + await Assert.That(list).IsEquivalentTo(new[] { first, updated }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notifications).Contains(ListChangedType.ItemAdded); + await Assert.That(notifications).Contains(ListChangedType.ItemChanged); + } + + [Test] + public async Task UnkeyedBindingListAdaptorAppliesIncrementalChangesAfterInitialLoad() + { + var list = new BindingList(); + var adaptor = new BindingListAdaptor(list, refreshThreshold: 10); + var notifications = new List(); + list.ListChanged += (_, args) => notifications.Add(args.ListChangedType); + + adaptor.Adapt(new ChangeSet { new(ListChangeReason.Add, 1) }); + notifications.Clear(); + adaptor.Adapt(new ChangeSet { new(ListChangeReason.Add, 2) }); + + await Assert.That(list).IsEquivalentTo(new[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notifications).IsEquivalentTo(new[] { ListChangedType.ItemAdded }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task SortedBindingListAdaptorResetsWhenDataChangedBatchExceedsThreshold() + { + using var cache = new SourceCache(static item => item.Id); + var list = new BindingList(); + var comparer = SortExpressionComparer.Ascending(PrimarySortValue); + var notifications = new List(); + + using var subscription = cache.Connect().Sort(comparer).Bind(list, resetThreshold: 1).Subscribe(); + list.ListChanged += (_, args) => notifications.Add(args.ListChangedType); + + cache.AddOrUpdate(new[] + { + new SortableBoundaryItem(3, "three"), + new SortableBoundaryItem(1, "one"), + new SortableBoundaryItem(2, "two") + }); + + notifications.Clear(); + cache.AddOrUpdate(new[] + { + new SortableBoundaryItem(5, "five"), + new SortableBoundaryItem(4, "four") + }); + + await Assert.That(list.Select(static item => item.Id)).IsEquivalentTo(new[] { 1, 2, 3, 4, 5 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notifications).IsEquivalentTo(new[] { ListChangedType.Reset }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task SortedBindingListAdaptorMovesAndAddsMissingUpdateDuringReorderChanges() + { + var first = new SortableBoundaryItem(1, "one"); + var second = new SortableBoundaryItem(2, "two"); + var moved = new SortableBoundaryItem(3, "moved"); + var missingPrevious = new SortableBoundaryItem(99, "missing"); + var added = new SortableBoundaryItem(4, "added"); + var list = new BindingList { first, second, moved }; + var adaptor = new SortedBindingListAdaptor(list, refreshThreshold: 10); + var changes = new SortedChangeSet( + new KeyValueCollection( + new[] + { + new KeyValuePair(moved.Id, moved), + new KeyValuePair(first.Id, first), + new KeyValuePair(second.Id, second), + new KeyValuePair(added.Id, added) + }, + new KeyValueComparer(), + SortReason.Reorder, + SortOptimisations.None), + new ChangeSet + { + new(moved.Id, moved, 0, 2), + new(ChangeReason.Update, added.Id, added, ReactiveUI.Primitives.Optional.Create(missingPrevious), 3, 3) + }); + + adaptor.Adapt(changes); + + await Assert.That(list.Select(static item => item.Id)).IsEquivalentTo(new[] { 3, 1, 2, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task SortAndBindWithSchedulerResetsBindingListTargetsWithoutPerItemEvents() + { + using var cache = new SourceCache(static item => item.Id); + var list = new BindingList(); + var comparer = SortExpressionComparer.Ascending(PrimarySortValue); + var options = new SortAndBindOptions + { + ResetOnFirstTimeLoad = true, + ResetThreshold = 1, + Scheduler = Scheduler.Immediate + }; + var notifications = new List(); + list.ListChanged += (_, args) => notifications.Add(args.ListChangedType); + + using var subscription = cache.Connect().SortAndBind(list, comparer, options).Subscribe(); + cache.AddOrUpdate(new[] + { + new SortableBoundaryItem(2, "two"), + new SortableBoundaryItem(1, "one"), + new SortableBoundaryItem(3, "three") + }); + + await Assert.That(list.Select(static item => item.Id)).IsEquivalentTo(new[] { 1, 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notifications).IsEquivalentTo(new[] { ListChangedType.Reset }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task SortAndBindObservableComparerWithSchedulerSortsAfterComparerSignal() + { + using var cache = new SourceCache(static item => item.Id); + using var comparer = new StateSignal>(SortExpressionComparer.Ascending(PrimarySortValue)); + var list = new List(); + var options = new SortAndBindOptions { Scheduler = Scheduler.Immediate }; + + using var subscription = cache.Connect().SortAndBind(list, comparer, options).Subscribe(); + cache.AddOrUpdate(new[] + { + new SortableBoundaryItem(2, "two"), + new SortableBoundaryItem(1, "one"), + new SortableBoundaryItem(3, "three") + }); + comparer.OnNext(SortExpressionComparer.Descending(PrimarySortValue)); + + await Assert.That(list.Select(static item => item.Id)).IsEquivalentTo(new[] { 3, 2, 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task ExpressionBuilderHandlesNullPropertiesFieldsConversionsCallsAndInvalidBodies() + { + Expression>? nullExpression = null; + Expression> convertedProperty = static node => node.Danger; + Expression> methodCall = static node => node.ToString(); + Expression> binary = static node => node.Danger + 1; + Expression> field = static node => node.Field; + + var convertedMember = convertedProperty.GetMember(); + var method = methodCall.GetMember(); + var stepProperty = convertedProperty.SplitIntoSteps().OfType().Single().GetProperty(); + + await Assert.That(convertedMember.Name).IsEqualTo(nameof(ThrowingNode.Danger)); + await Assert.That(method).IsTypeOf(); + await Assert.That(stepProperty.Name).IsEqualTo(nameof(ThrowingNode.Danger)); + await Assert.That(() => nullExpression!.GetMember()).Throws(); + await Assert.That(() => field.GetProperty()).Throws(); + await Assert.That(() => binary.GetMember()).Throws(); + await Assert.That(() => binary.SplitIntoSteps().ToArray()).Throws(); + } + + private static IComparable PrimarySortValue(SortableBoundaryItem item) => item.Primary.HasValue ? item.Primary.Value : null!; + + private sealed class SortableBoundaryItem + { + public SortableBoundaryItem(int id, string secondary) + : this(id, id, secondary) + { + } + + public SortableBoundaryItem(int? primary, string? secondary) + : this(primary ?? -1, primary, secondary) + { + } + + private SortableBoundaryItem(int id, int? primary, string? secondary) + { + Id = id; + Primary = primary; + Secondary = secondary; + } + + public int Id { get; } + + public int? Primary { get; } + + public string? Secondary { get; } + } + + private sealed class ThrowingNode : INotifyPropertyChanged + { + private ThrowingNode? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public string Field = string.Empty; + + public ThrowingNode? Child + { + get => _child; + set + { + if (ReferenceEquals(_child, value)) + { + return; + } + + _child = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); + } + } + + public bool ThrowOnDanger { get; set; } + + public int Danger + { + get + { + if (ThrowOnDanger) + { + throw new InvalidOperationException("danger unavailable"); + } + + return 42; + } + } + + public void RaiseDangerChanged() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Danger))); + } +} diff --git a/src/DynamicData.Tests/Binding/BindingCoverageFixture.cs b/src/DynamicData.Tests/Binding/BindingCoverageFixture.cs new file mode 100644 index 000000000..ff58a13e5 --- /dev/null +++ b/src/DynamicData.Tests/Binding/BindingCoverageFixture.cs @@ -0,0 +1,422 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive; +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +using System.Linq.Expressions; +using System.Reflection; +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.Binding; + +public sealed class BindingCoverageFixture +{ + [Test] + public async Task WhenChangedCombinesTwoPropertiesAndUsesFallback() + { + var source = new NotifyingNode { A = 1, B = 2 }; + + using var subscription = source.WhenChanged( + node => node.Child!.A, + node => node.B, + static (_, childA, b) => $"{childA}:{b}", + static () => -1) + .RecordValues(out var results); + + await Assert.That(results.RecordedValues).IsEquivalentTo(new string?[] { "-1:2" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var child = new NotifyingNode { A = 10 }; + source.Child = child; + child.A = 11; + source.B = 3; + + await Assert.That(results.RecordedValues).IsEquivalentTo(new string?[] { "-1:2", "10:2", "11:2", "11:3" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task WhenChangedCombinesThreeProperties() + { + var source = new NotifyingNode { A = 1, B = 2, C = 3 }; + + using var subscription = source.WhenChanged( + node => node.A, + node => node.B, + node => node.C, + static (_, a, b, c) => a + b + c) + .RecordValues(out var results); + + source.C = 4; + + await Assert.That(results.RecordedValues).IsEquivalentTo(new[] { 6, 7 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task WhenChangedCombinesFourProperties() + { + var source = new NotifyingNode { A = 1, B = 2, C = 3, D = 4 }; + + using var subscription = source.WhenChanged( + node => node.A, + node => node.B, + node => node.C, + node => node.D, + static (_, a, b, c, d) => a + b + c + d) + .RecordValues(out var results); + + source.D = 5; + + await Assert.That(results.RecordedValues).IsEquivalentTo(new[] { 10, 11 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task WhenChangedCombinesFiveProperties() + { + var source = new NotifyingNode { A = 1, B = 2, C = 3, D = 4, E = 5 }; + + using var subscription = source.WhenChanged( + node => node.A, + node => node.B, + node => node.C, + node => node.D, + node => node.E, + static (_, a, b, c, d, e) => a + b + c + d + e) + .RecordValues(out var results); + + source.E = 6; + + await Assert.That(results.RecordedValues).IsEquivalentTo(new[] { 15, 16 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task WhenChangedCombinesSixProperties() + { + var source = new NotifyingNode { A = 1, B = 2, C = 3, D = 4, E = 5, F = 6 }; + + using var subscription = source.WhenChanged( + node => node.A, + node => node.B, + node => node.C, + node => node.D, + node => node.E, + node => node.F, + static (_, a, b, c, d, e, f) => a + b + c + d + e + f) + .RecordValues(out var results); + + source.F = 7; + + await Assert.That(results.RecordedValues).IsEquivalentTo(new[] { 21, 22 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task WhenChangedRejectsNullArgumentsBeforeSubscribing() + { + var source = new NotifyingNode(); + + await Assert.That(() => NotifyPropertyChangedEx.WhenChanged(null!, node => node.A, node => node.B, static (_, a, b) => a + b)).Throws(); + await Assert.That(() => source.WhenChanged(null!, node => node.B, static (_, a, b) => a + b)).Throws(); + await Assert.That(() => source.WhenChanged(node => node.A, null!, static (_, a, b) => a + b)).Throws(); + await Assert.That(() => source.WhenChanged(node => node.A, node => node.B, null!)).Throws(); + } + + [Test] + public async Task BindingListCloneReplaysIndexedAndUnindexedItemChanges() + { + var list = new BindingList { "b", "c" }; + var changes = new ChangeSet + { + new(ListChangeReason.Add, "a", 0), + new(ListChangeReason.Add, "d"), + new(ListChangeReason.Replace, "bb", ReactiveUI.Primitives.Optional.Create("b"), 1, -1), + new(ListChangeReason.Replace, "ee", ReactiveUI.Primitives.Optional.Create("missing"), -1, -1), + new(ListChangeReason.Remove, "d"), + new(ListChangeReason.Remove, "missing"), + new(ListChangeReason.RemoveRange, new[] { "c" }), + }; + + BindingListEx.Clone(list, changes); + + await Assert.That(list).IsEquivalentTo(new[] { "a", "bb", "ee" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task BindingListCloneReplaysRangeClearRefreshAndMoveChanges() + { + var list = new BindingList { "a", "b", "c" }; + var notifications = new List(); + list.ListChanged += (_, args) => notifications.Add(args.ListChangedType); + + BindingListEx.Clone( + list, + new ChangeSet { new(ListChangeReason.AddRange, new[] { "d", "e" }, 1) }); + + await Assert.That(list).IsEquivalentTo(new[] { "a", "d", "e", "b", "c" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + BindingListEx.Clone( + list, + new ChangeSet { new(ListChangeReason.Refresh, "a", 0) }); + + await Assert.That(list).IsEquivalentTo(new[] { "a", "d", "e", "b", "c" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notifications).Contains(ListChangedType.ItemChanged); + + BindingListEx.Clone( + list, + new ChangeSet { new("c", 0, 4) }); + + await Assert.That(list).IsEquivalentTo(new[] { "c", "a", "d", "e", "b" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + BindingListEx.Clone( + list, + new ChangeSet { new(ListChangeReason.Clear, new[] { "c", "a", "d", "e", "b" }) }); + + await Assert.That(list).IsEmpty(); + await Assert.That(notifications).Contains(ListChangedType.ItemDeleted); + await Assert.That(notifications).Contains(ListChangedType.Reset); + + BindingListEx.Clone( + list, + new ChangeSet { new(ListChangeReason.Refresh, "missing", 0) }); + + await Assert.That(list).IsEmpty(); + } + + [Test] + public async Task BindingListCloneThrowsWhenMoveHasNoIndex() + { + var list = new BindingList { "a" }; + var changes = new ChangeSet { new(ListChangeReason.Moved, "a") }; + + await Assert.That(() => BindingListEx.Clone(list, changes)).Throws(); + } + + [Test] + public async Task BindingListKeyedObservableChangeSetTracksAddsAndRefreshes() + { + var list = new BindingList(); + + using var results = list.ToObservableChangeSet(person => person.Name).AsAggregator(); + list.Add(new Person("A", 1)); + list.Add(new Person("B", 2)); + list.ResetBindings(); + + await Assert.That(results.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Lookup("A").HasValue).IsTrue(); + await Assert.That(results.Messages.Last().Removes).IsEqualTo(2); + await Assert.That(results.Messages.Last().Adds).IsEqualTo(2); + } + + [Test] + public async Task ExpressionBuilderCreatesInvokerForSupportedExpressions() + { + var source = new ExpressionSubject { Name = "Alpha" }; + var propertyInvoker = Expression.Property(Expression.Parameter(typeof(ExpressionSubject), "source"), nameof(ExpressionSubject.Name)).CreateInvoker(); + var convertInvoker = Expression.Convert(Expression.Parameter(typeof(ExpressionSubject), "source"), typeof(object)).CreateInvoker(); + + await Assert.That(propertyInvoker(source)).IsEqualTo("Alpha"); + await Assert.That(convertInvoker(source)).IsEqualTo(source); + } + + [Test] + public async Task ExpressionBuilderInvokerRejectsUnsupportedMembersAndNodes() + { + var parameter = Expression.Parameter(typeof(ExpressionSubject), "source"); + var field = Expression.Field(parameter, nameof(ExpressionSubject.Field)); + var staticProperty = Expression.Property(null, typeof(ExpressionSubject).GetProperty(nameof(ExpressionSubject.StaticName))!); + Expression? nullExpression = null; + + await Assert.That(() => field.CreateInvoker()).Throws(); + await Assert.That(() => Expression.Property(parameter, typeof(ExpressionSubject).GetProperty(nameof(ExpressionSubject.WriteOnly))!).CreateInvoker()).Throws(); + await Assert.That(() => staticProperty.CreateInvoker()).Throws(); + await Assert.That(() => nullExpression!.CreateInvoker()).Throws(); + await Assert.That(() => Expression.Constant(1).CreateInvoker()).Throws(); + } + + [Test] + public async Task ExpressionBuilderSplitsAndRejectsExpressionSteps() + { + Expression> convertedProperty = subject => subject.Number; + Expression> methodCall = subject => subject.Name.ToString(); + + var steps = convertedProperty.SplitIntoSteps().ToArray(); + + await Assert.That(steps.Length).IsEqualTo(2); + await Assert.That(steps[0].NodeType).IsEqualTo(ExpressionType.Convert); + await Assert.That(steps[1].NodeType).IsEqualTo(ExpressionType.MemberAccess); + await Assert.That(() => methodCall.SplitIntoSteps().ToArray()).Throws(); + } + + [Test] + public async Task ExpressionBuilderGetsPropertiesMembersAndCacheKeys() + { + Expression> convertedProperty = subject => subject.Number; + Expression> fieldExpression = subject => subject.Field; + Expression> methodCall = subject => subject.Name.ToString(); + Expression> nestedProperty = subject => subject.Child!.Number; + + await Assert.That(convertedProperty.GetProperty().Name).IsEqualTo(nameof(ExpressionSubject.Number)); + await Assert.That(methodCall.GetMember()).IsTypeOf(); + await Assert.That(() => fieldExpression.GetProperty()).Throws(); + await Assert.That(() => methodCall.GetProperty()).Throws(); + await Assert.That(nestedProperty.ToCacheKey()).Contains($"{nameof(ExpressionSubject.Child)}.{nameof(ExpressionSubject.Number)}"); + } + + [Test] + public async Task ExpressionBuilderMemberPropertyRejectsFields() + { + var parameter = Expression.Parameter(typeof(ExpressionSubject), "source"); + var field = Expression.Field(parameter, nameof(ExpressionSubject.Field)); + + await Assert.That(() => field.GetProperty()).Throws(); + } + + [Test] + public async Task ExpressionBuilderPropertyChangedFactoryObservesOnlyMatchingProperty() + { + Expression> expression = subject => subject.Name; + var subject = new ExpressionSubject { Name = "Alpha", Number = 1 }; + var hits = 0; + + using var subscription = expression.Body.CreatePropertyChangedFactory()(subject).Subscribe(_ => hits++); + subject.Number = 2; + subject.Name = "Beta"; + + await Assert.That(hits).IsEqualTo(1); + } + + [Test] + public async Task ExpressionBuilderPropertyChangedFactoryReturnsNeverForNonNotifyProperty() + { + var parameter = Expression.Parameter(typeof(PlainSubject), "source"); + var expression = Expression.Property(parameter, nameof(PlainSubject.Name)); + var subject = new PlainSubject { Name = "Alpha" }; + var hits = 0; + + using var subscription = expression.CreatePropertyChangedFactory()(subject).Subscribe(_ => hits++); + subject.Name = "Beta"; + + await Assert.That(hits).IsEqualTo(0); + } + + private sealed class NotifyingNode : INotifyPropertyChanged + { + private int _a; + private int _b; + private int _c; + private int _d; + private int _e; + private int _f; + private NotifyingNode? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public int A + { + get => _a; + set => SetProperty(ref _a, value, nameof(A)); + } + + public int B + { + get => _b; + set => SetProperty(ref _b, value, nameof(B)); + } + + public int C + { + get => _c; + set => SetProperty(ref _c, value, nameof(C)); + } + + public int D + { + get => _d; + set => SetProperty(ref _d, value, nameof(D)); + } + + public int E + { + get => _e; + set => SetProperty(ref _e, value, nameof(E)); + } + + public int F + { + get => _f; + set => SetProperty(ref _f, value, nameof(F)); + } + + public NotifyingNode? Child + { + get => _child; + set => SetProperty(ref _child, value, nameof(Child)); + } + + private void SetProperty(ref T field, T value, string propertyName) + { + if (EqualityComparer.Default.Equals(field, value)) + { + return; + } + + field = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + } + + private sealed class ExpressionSubject : INotifyPropertyChanged + { + private string _name = string.Empty; + private int _number; + private ExpressionSubject? _child; + + public string Field = string.Empty; + + public event PropertyChangedEventHandler? PropertyChanged; + + public static string StaticName => "Static"; + + public string Name + { + get => _name; + set => SetProperty(ref _name, value, nameof(Name)); + } + + public int Number + { + get => _number; + set => SetProperty(ref _number, value, nameof(Number)); + } + + public ExpressionSubject? Child + { + get => _child; + set => SetProperty(ref _child, value, nameof(Child)); + } + + public int WriteOnly + { + set => _number = value; + } + + private void SetProperty(ref T field, T value, string propertyName) + { + if (EqualityComparer.Default.Equals(field, value)) + { + return; + } + + field = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + } + + private sealed class PlainSubject + { + public string Name { get; set; } = string.Empty; + } +} diff --git a/src/DynamicData.Tests/Binding/BindingEdgeCoverageFixture.cs b/src/DynamicData.Tests/Binding/BindingEdgeCoverageFixture.cs new file mode 100644 index 000000000..44b430c81 --- /dev/null +++ b/src/DynamicData.Tests/Binding/BindingEdgeCoverageFixture.cs @@ -0,0 +1,211 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; + +namespace DynamicData.Tests.Binding; + +public sealed class BindingEdgeCoverageFixture +{ + [Test] + public async Task ObservableCollectionChangeSetTreatsUnknownIndexAddAsAppendRange() + { + var source = new ManualNotifyCollection(); + using var results = source.ToObservableChangeSet, int>().AsAggregator(); + + source.AddRangeWithUnknownIndex(1, 2); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Last().Adds).IsEqualTo(2); + } + + [Test] + public async Task ObservableCollectionChangeSetRemovesUnknownIndexItemsByValue() + { + var source = new ManualNotifyCollection(1, 2, 3); + using var results = source.ToObservableChangeSet, int>().AsAggregator(); + + source.RemoveWithUnknownIndex(2); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Last().Removes).IsEqualTo(1); + } + + [Test] + public async Task ObservableCollectionChangeSetRemovesKnownIndexRange() + { + var source = new ManualNotifyCollection(1, 2, 3, 4); + using var results = source.ToObservableChangeSet, int>().AsAggregator(); + + source.RemoveRangeAt(1, 2); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Last().Removes).IsEqualTo(2); + } + + [Test] + public async Task ObservableCollectionChangeSetReplacesUnknownIndexItemByOldValue() + { + var source = new ManualNotifyCollection(1, 2, 3); + using var results = source.ToObservableChangeSet, int>().AsAggregator(); + + source.ReplaceWithUnknownIndex(2, 20); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1, 20, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Last().Replaced).IsEqualTo(1); + } + + [Test] + public async Task ObservableCollectionChangeSetRejectsMoveWithoutOldIndex() + { + var source = new ManualNotifyCollection(1, 2); + Exception? error = null; + + using var subscription = source.ToObservableChangeSet, int>().Subscribe(_ => { }, ex => error = ex); +#if REACTIVE_TESTS + source.RaiseMoveWithoutOldIndex(2, 0); + await Assert.That(error).IsTypeOf(); +#else + // Primitives invokes its accumulator inline; Rx routes its exception through OnError. + await Assert.That(() => source.RaiseMoveWithoutOldIndex(2, 0)).Throws(); + await Assert.That(error).IsNull(); +#endif + } + + [Test] + public async Task ObserveCollectionChangesStopsAfterDisposal() + { + var source = new ObservableCollection(); + var actions = new List(); + + var subscription = source.ObserveCollectionChanges().Subscribe(pattern => actions.Add(pattern.EventArgs.Action)); + source.Add(1); + subscription.Dispose(); + source.Add(2); + + await Assert.That(actions).IsEquivalentTo(new[] { NotifyCollectionChangedAction.Add }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task WhenAnyPropertyChangedFiltersNamesAndStopsAfterDisposal() + { + var source = new NotifyingItem(); + var notifications = new List(); + + var subscription = source.WhenAnyPropertyChanged(nameof(NotifyingItem.A)).Subscribe(notifications.Add); + source.B = 1; + source.A = 2; + subscription.Dispose(); + source.A = 3; + + await Assert.That(notifications).IsEquivalentTo(new NotifyingItem?[] { source }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task WhenValueChangedSuppressesUnobtainableValueUntilPathExists() + { + var source = new NotifyingItem(); + using var subscription = source.WhenValueChanged(item => item.Child!.A).RecordValues(out var results); + + source.B = 1; + source.Child = new NotifyingItem { A = 7 }; + source.Child.A = 8; + + await Assert.That(results.RecordedValues).IsEquivalentTo(new[] { 7, 8 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + private sealed class ManualNotifyCollection : Collection, INotifyCollectionChanged + { + public ManualNotifyCollection(params T[] items) + { + foreach (var item in items) + { + Items.Add(item); + } + } + + public event NotifyCollectionChangedEventHandler? CollectionChanged; + + public void AddRangeWithUnknownIndex(params T[] items) + { + foreach (var item in items) + { + Items.Add(item); + } + + CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, items, -1)); + } + + public void RemoveWithUnknownIndex(T item) + { + Items.Remove(item); + CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item, -1)); + } + + public void RemoveRangeAt(int index, int count) + { + var removed = Items.Skip(index).Take(count).ToArray(); + for (var i = 0; i < count; i++) + { + Items.RemoveAt(index); + } + + CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, removed, index)); + } + + public void ReplaceWithUnknownIndex(T oldItem, T newItem) + { + var index = Items.IndexOf(oldItem); + Items[index] = newItem; + + CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, new[] { newItem }, new[] { oldItem }, -1)); + } + + public void RaiseMoveWithoutOldIndex(T item, int newIndex) => + CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move, item, newIndex, -1)); + + } + + private sealed class NotifyingItem : INotifyPropertyChanged + { + private int _a; + private int _b; + private NotifyingItem? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public int A + { + get => _a; + set => SetField(ref _a, value, nameof(A)); + } + + public int B + { + get => _b; + set => SetField(ref _b, value, nameof(B)); + } + + public NotifyingItem? Child + { + get => _child; + set => SetField(ref _child, value, nameof(Child)); + } + + private void SetField(ref T field, T value, string propertyName) + { + if (EqualityComparer.Default.Equals(field, value)) + { + return; + } + + field = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + } +} diff --git a/src/DynamicData.Tests/Binding/BindingLIstBindListFixture.cs b/src/DynamicData.Tests/Binding/BindingLIstBindListFixture.cs index 750aaf1ae..1d2fa3246 100644 --- a/src/DynamicData.Tests/Binding/BindingLIstBindListFixture.cs +++ b/src/DynamicData.Tests/Binding/BindingLIstBindListFixture.cs @@ -1,15 +1,7 @@ #if SUPPORTS_BINDINGLIST -using System; -using System.ComponentModel; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding { public class BindingLIstBindListFixture : IDisposable @@ -32,39 +24,37 @@ public BindingLIstBindListFixture() .Subscribe(); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { var people = _generator.Take(100).ToList(); _source.AddRange(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.Add(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } - - - [Fact] - public void Refresh() + [Test] + public async Task Refresh() { var people = _generator.Take(100).ToList(); _source.AddRange(people); @@ -78,32 +68,31 @@ public void Refresh() people[10].Age = 100; - args.Should().NotBeNull(); - args.ListChangedType.Should().Be(ListChangedType.ItemChanged); - args.NewIndex.Should().Be(10); + await Assert.That(args).IsNotNull(); + await Assert.That(args.ListChangedType).IsEqualTo(ListChangedType.ItemChanged); + await Assert.That(args.NewIndex).IsEqualTo(10); } - - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.Add(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.Add(person); _source.Replace(person, personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } public void Dispose() diff --git a/src/DynamicData.Tests/Binding/BindingListBindCacheFixture.cs b/src/DynamicData.Tests/Binding/BindingListBindCacheFixture.cs index f76ff68bf..9628d4310 100644 --- a/src/DynamicData.Tests/Binding/BindingListBindCacheFixture.cs +++ b/src/DynamicData.Tests/Binding/BindingListBindCacheFixture.cs @@ -1,15 +1,7 @@ -#if SUPPORTS_BINDINGLIST - -using System; -using System.ComponentModel; -using System.Linq; +#if SUPPORTS_BINDINGLIST using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding { public class BindingListCacheFixture : IDisposable @@ -28,48 +20,47 @@ public BindingListCacheFixture() _binder = _source.Connect().Bind(_collection).Subscribe(); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } - - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void Refresh() + [Test] + public async Task Refresh() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); @@ -83,21 +74,21 @@ public void Refresh() _source.Refresh(people[10]); - args.Should().NotBeNull(); - args.ListChangedType.Should().Be(ListChangedType.ItemChanged); - args.NewIndex.Should().Be(10); + await Assert.That(args).IsNotNull(); + await Assert.That(args.ListChangedType).IsEqualTo(ListChangedType.ItemChanged); + await Assert.That(args.NewIndex).IsEqualTo(10); } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } public void Dispose() diff --git a/src/DynamicData.Tests/Binding/BindingListBindCacheSortedFixture.cs b/src/DynamicData.Tests/Binding/BindingListBindCacheSortedFixture.cs index a706c4aea..4b0ba92dc 100644 --- a/src/DynamicData.Tests/Binding/BindingListBindCacheSortedFixture.cs +++ b/src/DynamicData.Tests/Binding/BindingListBindCacheSortedFixture.cs @@ -1,17 +1,12 @@ #if SUPPORTS_BINDINGLIST -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding { public class BindingListBindCacheSortedFixture : IDisposable @@ -33,63 +28,64 @@ public BindingListBindCacheSortedFixture() _binder = _source.Connect().Sort(_comparer, resetThreshold: 25).Bind(_collection).Subscribe(); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } - [Fact] - public void CollectionIsInSortOrder() + [Test] + public async Task CollectionIsInSortOrder() { _source.AddOrUpdate(_generator.Take(100)); var sorted = _source.Items.OrderBy(p => p, _comparer).ToList(); - sorted.Should().BeEquivalentTo(_collection.ToList()); + await Assert.That(sorted).IsEquivalentTo(_collection.ToList()); } - - [Fact] - public void LargeUpdateInvokesAReset() + [Test] + public async Task LargeUpdateInvokesAReset() { //update once as initial load is always a reset _source.AddOrUpdate(new Person("Me", 21)); var invoked = false; + ListChangedType? listChangedType = null; _collection.ListChanged += (sender, e) => { invoked = true; - e.ListChangedType.Should().Be(ListChangedType.Reset); + listChangedType = e.ListChangedType; }; _source.AddOrUpdate(_generator.Take(100)); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); + await Assert.That(listChangedType).IsEqualTo(ListChangedType.Reset); } - [Fact] - public void Refresh() + [Test] + public async Task Refresh() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); @@ -103,25 +99,24 @@ public void Refresh() _source.Refresh(people[10]); - args.Should().NotBeNull(); - args.ListChangedType.Should().Be(ListChangedType.ItemChanged); + await Assert.That(args).IsNotNull(); + await Assert.That(args.ListChangedType).IsEqualTo(ListChangedType.ItemChanged); - _collection[args.NewIndex].Should().Be(people[10]); + await Assert.That(_collection[args.NewIndex]).IsEqualTo(people[10]); } - - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void SmallChangeDoesNotInvokeReset() + [Test] + public async Task SmallChangeDoesNotInvokeReset() { //update once as initial load is always a reset _source.AddOrUpdate(new Person("Me", 21)); @@ -138,12 +133,12 @@ public void SmallChangeDoesNotInvokeReset() }; _source.AddOrUpdate(_generator.Take(24)); - invoked.Should().BeTrue(); - resetInvoked.Should().BeFalse(); + await Assert.That(invoked).IsTrue(); + await Assert.That(resetInvoked).IsFalse(); } - [Fact] - public void TreatMovesAsRemoveAdd() + [Test] + public async Task TreatMovesAsRemoveAdd() { var cache = new SourceCache(p => p.Name); @@ -172,32 +167,31 @@ public void TreatMovesAsRemoveAdd() } importantGuy.Age += 200; - latestSetWithoutMoves.Should().NotBeNull(); - latestSetWithoutMoves.Removes.Should().Be(1); - latestSetWithoutMoves.Adds.Should().Be(1); - latestSetWithoutMoves.Moves.Should().Be(0); - latestSetWithoutMoves.Updates.Should().Be(0); - - latestSetWithMoves.Moves.Should().Be(1); - latestSetWithMoves.Updates.Should().Be(0); - latestSetWithMoves.Removes.Should().Be(0); - latestSetWithMoves.Adds.Should().Be(0); + await Assert.That(latestSetWithoutMoves).IsNotNull(); + await Assert.That(latestSetWithoutMoves.Removes).IsEqualTo(1); + await Assert.That(latestSetWithoutMoves.Adds).IsEqualTo(1); + await Assert.That(latestSetWithoutMoves.Moves).IsEqualTo(0); + await Assert.That(latestSetWithoutMoves.Updates).IsEqualTo(0); + + await Assert.That(latestSetWithMoves.Moves).IsEqualTo(1); + await Assert.That(latestSetWithMoves.Updates).IsEqualTo(0); + await Assert.That(latestSetWithMoves.Removes).IsEqualTo(0); + await Assert.That(latestSetWithMoves.Adds).IsEqualTo(0); } } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } - public void Dispose() { _binder.Dispose(); @@ -205,6 +199,5 @@ public void Dispose() } } - } #endif diff --git a/src/DynamicData.Tests/Binding/BindingListToChangeSetFixture.cs b/src/DynamicData.Tests/Binding/BindingListToChangeSetFixture.cs index b9818d8bc..988b051a3 100644 --- a/src/DynamicData.Tests/Binding/BindingListToChangeSetFixture.cs +++ b/src/DynamicData.Tests/Binding/BindingListToChangeSetFixture.cs @@ -1,12 +1,8 @@ -using System; -using System.ComponentModel; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Binding; @@ -22,43 +18,43 @@ public BindingListToChangeSetFixture() _results = _collection.ToObservableChangeSet().AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _collection.Add(1); - _results.Messages.Count.Should().Be(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } public void Dispose() => _results.Dispose(); - [Fact] - public void Duplicates() + [Test] + public async Task Duplicates() { _collection.Add(1); _collection.Add(1); - _results.Data.Count.Should().Be(2); + await Assert.That(_results.Data.Count).IsEqualTo(2); } - [Fact] - public void RaiseListChangedEvents() + [Test] + public async Task RaiseListChangedEvents() { _collection.RaiseListChangedEvents = true; _collection.Add(1); - _results.Messages.Count.Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); _collection.RaiseListChangedEvents = false; _collection.Add(1); - _results.Messages.Count.Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); } - [Fact] - public void RefreshCausesReplace() + [Test] + public async Task RefreshCausesReplace() { // Arrange var sourceCache = new SourceCache(item => item.Id); @@ -76,63 +72,61 @@ public void RefreshCausesReplace() item1.Name = "New Name"; // Source cache received add and refresh - sourceCacheResults.Messages.Count.Should().Be(2); - sourceCacheResults.Messages.First().Adds.Should().Be(1); - sourceCacheResults.Messages.Last().Refreshes.Should().Be(1); - + await Assert.That(sourceCacheResults.Messages.Count).IsEqualTo(2); + await Assert.That(sourceCacheResults.Messages.First().Adds).IsEqualTo(1); + await Assert.That(sourceCacheResults.Messages.Last().Refreshes).IsEqualTo(1); /* List receives add and replace instead of refresh (and as of 23/02/2023 it receives a refresh too!) */ - collectionResults.Messages.Count.Should().Be(3); - collectionResults.Messages.First().Adds.Should().Be(1); - collectionResults.Messages.First().Refreshes.Should().Be(0); - collectionResults.Messages.Last().Replaced.Should().Be(1); - collectionResults.Messages.Last().Refreshes.Should().Be(0); + await Assert.That(collectionResults.Messages.Count).IsEqualTo(3); + await Assert.That(collectionResults.Messages.First().Adds).IsEqualTo(1); + await Assert.That(collectionResults.Messages.First().Refreshes).IsEqualTo(0); + await Assert.That(collectionResults.Messages.Last().Replaced).IsEqualTo(1); + await Assert.That(collectionResults.Messages.Last().Refreshes).IsEqualTo(0); sourceCache.Dispose(); sourceCacheResults.Dispose(); collectionResults.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Remove(3); - _results.Data.Count.Should().Be(9); - _results.Data.Items.Contains(3).Should().BeFalse(); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Count).IsEqualTo(9); + await Assert.That(_results.Data.Items.Contains(3)).IsFalse(); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { _collection.AddRange(Enumerable.Range(1, 10)); _collection[8] = 20; - _results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); } - [Fact] - public void ResetFiresClearsAndAdds() + [Test] + public async Task ResetFiresClearsAndAdds() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Reset(); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); var resetNotification = _results.Messages.Last(); - resetNotification.Removes.Should().Be(10); - resetNotification.Adds.Should().Be(10); + await Assert.That(resetNotification.Removes).IsEqualTo(10); + await Assert.That(resetNotification.Adds).IsEqualTo(10); } - - [Fact] - public void InsertInto() + [Test] + public async Task InsertInto() { //Fixes https://github.com/reactivemarbles/DynamicData/issues/507 var target = new ObservableCollectionExtended(); @@ -144,7 +138,7 @@ public void InsertInto() bindingList.Insert(2, "Z at index 2"); - target.Should().BeEquivalentTo("a", "b", "Z at index 2", "c", "d"); + await Assert.That(target).IsEquivalentTo(new[] { "a", "b", "Z at index 2", "c", "d" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } private class TestBindingList : BindingList diff --git a/src/DynamicData.Tests/Binding/DeeplyNestedNotifyPropertyChangedFixture.cs b/src/DynamicData.Tests/Binding/DeeplyNestedNotifyPropertyChangedFixture.cs index e233c5c6a..4bbfd7260 100644 --- a/src/DynamicData.Tests/Binding/DeeplyNestedNotifyPropertyChangedFixture.cs +++ b/src/DynamicData.Tests/Binding/DeeplyNestedNotifyPropertyChangedFixture.cs @@ -1,21 +1,17 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Reactive.Linq; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Binding; public class DeeplyNestedNotifyPropertyChangedFixture { - [Fact] - public void DepthOfOne() + [Test] + public async Task DepthOfOne() { var instance = new ClassA { Name = "Someone" }; @@ -24,21 +20,21 @@ public void DepthOfOne() var subscription = chain.Subscribe(notification => result = notification?.Value); - result.Should().Be("Someone"); + await Assert.That(result).IsEqualTo("Someone"); instance.Name = "Else"; - result.Should().Be("Else"); + await Assert.That(result).IsEqualTo("Else"); instance.Name = null; - result.Should().Be(null); + await Assert.That(result).IsNull(); instance.Name = "NotNull"; - result.Should().Be("NotNull"); + await Assert.That(result).IsEqualTo("NotNull"); } // Covers https://github.com/reactivemarbles/DynamicData/issues/671 - [Fact] - public void NonObservableChildWithInitialValue() + [Test] + public async Task NonObservableChildWithInitialValue() { var source = new ClassC() { @@ -59,30 +55,30 @@ public void NonObservableChildWithInitialValue() onError: e => error = e, onCompleted: () => isCompleted = true); - error.Should().BeNull(); - isCompleted.Should().BeFalse(); - notifications.Count.Should().Be(1, "a notification was requested for the initial value"); - notifications[0].Value.Should().Be(source.Child!.Value, "the child object's data value should have been published"); + await Assert.That(error).IsNull(); + await Assert.That(isCompleted).IsFalse(); + await Assert.That(notifications.Count).IsEqualTo(1).Because("a notification was requested for the initial value"); + await Assert.That(notifications[0].Value).IsEqualTo(source.Child!.Value).Because("the child object's data value should have been published"); source.Child.Value = 2; - error.Should().BeNull(); - isCompleted.Should().BeFalse(); - notifications.Count.Should().Be(1, "the object that was changed does not publish notifications"); + await Assert.That(error).IsNull(); + await Assert.That(isCompleted).IsFalse(); + await Assert.That(notifications.Count).IsEqualTo(1).Because("the object that was changed does not publish notifications"); source.Child = new() { Value = 3 }; - error.Should().BeNull(); - isCompleted.Should().BeFalse(); - notifications.Count.Should().Be(2, "the parent object should have published a notification for its child being changed"); - notifications[1].Value.Should().Be(source.Child!.Value, "the child object's data value should have been published"); + await Assert.That(error).IsNull(); + await Assert.That(isCompleted).IsFalse(); + await Assert.That(notifications.Count).IsEqualTo(2).Because("the parent object should have published a notification for its child being changed"); + await Assert.That(notifications[1].Value).IsEqualTo(source.Child!.Value).Because("the child object's data value should have been published"); } - [Fact] - public void NonObservableChildWithoutInitialValue() + [Test] + public async Task NonObservableChildWithoutInitialValue() { var source = new ClassC() { @@ -103,29 +99,29 @@ public void NonObservableChildWithoutInitialValue() onError: e => error = e, onCompleted: () => isCompleted = true); - error.Should().BeNull(); - isCompleted.Should().BeFalse(); - notifications.Should().BeEmpty("no changes have been made"); + await Assert.That(error).IsNull(); + await Assert.That(isCompleted).IsFalse(); + await Assert.That(notifications).IsEmpty(); source.Child.Value = 2; - error.Should().BeNull(); - isCompleted.Should().BeFalse(); - notifications.Should().BeEmpty("the object that was changed does not publish notifications"); + await Assert.That(error).IsNull(); + await Assert.That(isCompleted).IsFalse(); + await Assert.That(notifications).IsEmpty(); source.Child = new() { Value = 3 }; - error.Should().BeNull(); - isCompleted.Should().BeFalse(); - notifications.Count.Should().Be(1, "the parent object should have published a notification for its child being changed"); - notifications[0].Value.Should().Be(source.Child!.Value, "the child object's data value should have been published"); + await Assert.That(error).IsNull(); + await Assert.That(isCompleted).IsFalse(); + await Assert.That(notifications.Count).IsEqualTo(1).Because("the parent object should have published a notification for its child being changed"); + await Assert.That(notifications[0].Value).IsEqualTo(source.Child!.Value).Because("the child object's data value should have been published"); } - [Fact] - public void NotifiesInitialValue_WithFallback() + [Test] + public async Task NotifiesInitialValue_WithFallback() { var instance = new ClassA { Child = new ClassB { Age = 10 } }; @@ -136,25 +132,25 @@ public void NotifiesInitialValue_WithFallback() var subscription = chain.Subscribe(age => result = age); - result.Should().Be(10); + await Assert.That(result).IsEqualTo(10); instance.Child.Age = 22; - result.Should().Be(22); + await Assert.That(result).IsEqualTo(22); instance.Child = new ClassB { Age = 25 }; - result.Should().Be(25); + await Assert.That(result).IsEqualTo(25); instance.Child.Age = 26; - result.Should().Be(26); + await Assert.That(result).IsEqualTo(26); instance.Child = null; - result.Should().Be(-1); + await Assert.That(result).IsEqualTo(-1); instance.Child = new ClassB { Age = 21 }; - result.Should().Be(21); + await Assert.That(result).IsEqualTo(21); } - [Fact] - public void NotifiesInitialValueAndNullChild() + [Test] + public async Task NotifiesInitialValueAndNullChild() { var instance = new ClassA(); @@ -162,24 +158,24 @@ public void NotifiesInitialValueAndNullChild() int? result = null; var subscription = chain.Subscribe(notification => result = notification?.Value); - result.Should().Be(null); + await Assert.That(result).IsNull(); instance.Child = new ClassB { Age = 10 }; - result.Should().Be(10); + await Assert.That(result).IsEqualTo(10); instance.Child.Age = 22; - result.Should().Be(22); + await Assert.That(result).IsEqualTo(22); instance.Child = new ClassB { Age = 25 }; - result.Should().Be(25); + await Assert.That(result).IsEqualTo(25); instance.Child.Age = 26; - result.Should().Be(26); + await Assert.That(result).IsEqualTo(26); instance.Child = null; } - [Fact] - public void NullChildWithInitialValue() + [Test] + public async Task NullChildWithInitialValue() { var instance = new ClassA(); @@ -188,23 +184,23 @@ public void NullChildWithInitialValue() var subscription = chain.Subscribe(notification => result = notification?.Value); - result.Should().Be(null); + await Assert.That(result).IsNull(); instance.Child = new ClassB { Age = 21 }; - result.Should().Be(21); + await Assert.That(result).IsEqualTo(21); instance.Child.Age = 22; - result.Should().Be(22); + await Assert.That(result).IsEqualTo(22); instance.Child = new ClassB { Age = 25 }; - result.Should().Be(25); + await Assert.That(result).IsEqualTo(25); instance.Child.Age = 30; - result.Should().Be(30); + await Assert.That(result).IsEqualTo(30); } - [Fact] - public void NullChildWithoutInitialValue() + [Test] + public async Task NullChildWithoutInitialValue() { var instance = new ClassA(); @@ -213,23 +209,23 @@ public void NullChildWithoutInitialValue() var subscription = chain.Subscribe(notification => result = notification.Value); - result.Should().Be(null); + await Assert.That(result).IsNull(); instance.Child = new ClassB { Age = 21 }; - result.Should().Be(21); + await Assert.That(result).IsEqualTo(21); instance.Child.Age = 22; - result.Should().Be(22); + await Assert.That(result).IsEqualTo(22); instance.Child = new ClassB { Age = 25 }; - result.Should().Be(25); + await Assert.That(result).IsEqualTo(25); instance.Child.Age = 30; - result.Should().Be(30); + await Assert.That(result).IsEqualTo(30); } - [Fact] - public void WithoutInitialValue() + [Test] + public async Task WithoutInitialValue() { var instance = new ClassA { Name = "TestClass", Child = new ClassB { Age = 10 } }; @@ -238,18 +234,18 @@ public void WithoutInitialValue() var subscription = chain.Subscribe(notification => result = notification.Value); - result.Should().Be(null); + await Assert.That(result).IsNull(); instance.Child.Age = 22; - result.Should().Be(22); + await Assert.That(result).IsEqualTo(22); instance.Child = new ClassB { Age = 25 }; - result.Should().Be(25); + await Assert.That(result).IsEqualTo(25); instance.Child.Age = 30; - result.Should().Be(30); + await Assert.That(result).IsEqualTo(30); } - // [Fact] + // [Test] // [Trait("Manual run for benchmarking","xx")] [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "Manual run for benchmarking")] @@ -262,7 +258,7 @@ private void StressIt() var sw = new Stopwatch(); - // var factory = + // var factory = var myObservable = list.Connect().Do(_ => sw.Start()).WhenPropertyChanged(a => a!.Child!.Age, false).Do(_ => sw.Stop()).Subscribe(); diff --git a/src/DynamicData.Tests/Binding/IObservableListBindCacheFixture.cs b/src/DynamicData.Tests/Binding/IObservableListBindCacheFixture.cs index 2c01a256d..be9e73e87 100644 --- a/src/DynamicData.Tests/Binding/IObservableListBindCacheFixture.cs +++ b/src/DynamicData.Tests/Binding/IObservableListBindCacheFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding; public class IObservableListBindCacheFixture : IDisposable @@ -30,33 +27,33 @@ public IObservableListBindCacheFixture() _listNotifications = _list.Connect().AsAggregator(); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _list.Count.Should().Be(1, "Should be 1 item in the collection"); - _list.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_list.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_list.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _list.Count.Should().Be(100, "Should be 100 items in the collection"); - _list.Should().BeEquivalentTo(_list, "Collections should be equivalent"); + await Assert.That(_list.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_list.Items).IsEquivalentTo(people).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _list.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_list.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } public void Dispose() @@ -66,37 +63,37 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void ListRecievesRefresh() + [Test] + public async Task ListRecievesRefresh() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); person.Age = 60; - _listNotifications.Messages.Count.Should().Be(2); - _listNotifications.Messages.Last().First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(_listNotifications.Messages.Count).IsEqualTo(2); + await Assert.That(_listNotifications.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Refresh); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _list.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_list.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _list.Count.Should().Be(1, "Should be 1 item in the collection"); - _list.Items[0].Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_list.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_list.Items[0]).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/Binding/IObservableListBindCacheSortedFixture.cs b/src/DynamicData.Tests/Binding/IObservableListBindCacheSortedFixture.cs index 35aa4eb1f..18b29c423 100644 --- a/src/DynamicData.Tests/Binding/IObservableListBindCacheSortedFixture.cs +++ b/src/DynamicData.Tests/Binding/IObservableListBindCacheSortedFixture.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding; public class IObservableListBindCacheSortedFixture : IDisposable @@ -18,7 +13,7 @@ public class IObservableListBindCacheSortedFixture : IDisposable private static readonly IComparer _comparerNameDesc = SortExpressionComparer.Descending(p => p.Name); - private readonly BehaviorSubject> _comparer = new(_comparerAgeAscThanNameAsc); + private readonly ReactiveUI.Primitives.Signals.StateSignal> _comparer = new(_comparerAgeAscThanNameAsc); private readonly RandomPersonGenerator _generator = new(); @@ -38,43 +33,43 @@ public IObservableListBindCacheSortedFixture() _listNotifications = _list.Connect().AsAggregator(); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _list.Count.Should().Be(1, "Should be 1 item in the collection"); - _list.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_list.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_list.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(15).ToList(); _source.AddOrUpdate(people); var sorted = people.OrderBy(p => p, _comparerAgeAscThanNameAsc).ToList(); - _list.Count.Should().Be(15, "Should be 15 items in the collection"); - _list.Items.Should().Equal(sorted, "Collections should be equivalent"); + await Assert.That(_list.Count).IsEqualTo(15).Because("Should be 15 items in the collection"); + await Assert.That(_list.Items).IsEquivalentTo(sorted, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _list.Count.Should().Be(0, "Should be 0 items in the collection"); + await Assert.That(_list.Count).IsEqualTo(0).Because("Should be 0 items in the collection"); } - [Fact] - public void CollectionIsInSortOrder() + [Test] + public async Task CollectionIsInSortOrder() { _source.AddOrUpdate(_generator.Take(100)); var sorted = _source.Items.OrderBy(p => p, _comparerAgeAscThanNameAsc).ToList(); - sorted.Should().Equal(_list.Items); + await Assert.That(sorted).IsEquivalentTo(_list.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching); } public void Dispose() @@ -85,8 +80,8 @@ public void Dispose() _comparer.Dispose(); } - [Fact] - public void InitialBindWithExistingData() + [Test] + public async Task InitialBindWithExistingData() { var source = new SourceCache(p => p.Name); @@ -101,9 +96,9 @@ public void InitialBindWithExistingData() var listNotifications = list.Connect().AsAggregator(); // Assert - listNotifications.Messages.Count.Should().Be(1); - listNotifications.Messages.First().First().Reason.Should().Be(ListChangeReason.AddRange); - list.Items.Should().Equal(person1, person2); + await Assert.That(listNotifications.Messages.Count).IsEqualTo(1); + await Assert.That(listNotifications.Messages.First().First().Reason).IsEqualTo(ListChangeReason.AddRange); + await Assert.That(list.Items).IsEquivalentTo(new[] { person1, person2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); // Clean up source.Dispose(); @@ -112,8 +107,8 @@ public void InitialBindWithExistingData() list.Dispose(); } - [Fact] - public void ListRecievesMoves() + [Test] + public async Task ListRecievesMoves() { var person1 = new Person("Person1", 10); var person2 = new Person("Person2", 20); @@ -125,52 +120,52 @@ public void ListRecievesMoves() person3.Age = 1; // 1 ChangeSet with AddRange & 1 ChangeSet with Refresh & Move - _listNotifications.Messages.Count.Should().Be(2); + await Assert.That(_listNotifications.Messages.Count).IsEqualTo(2); // Assert AddRange var addChangeSet = _listNotifications.Messages.First(); - addChangeSet.First().Reason.Should().Be(ListChangeReason.AddRange); + await Assert.That(addChangeSet.First().Reason).IsEqualTo(ListChangeReason.AddRange); // Assert Refresh & Move var refreshAndMoveChangeSet = _listNotifications.Messages.Last(); - refreshAndMoveChangeSet.Count.Should().Be(2); + await Assert.That(refreshAndMoveChangeSet.Count).IsEqualTo(2); var refreshChange = refreshAndMoveChangeSet.First(); - refreshChange.Reason.Should().Be(ListChangeReason.Refresh); - refreshChange.Item.Current.Should().Be(person3); + await Assert.That(refreshChange.Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(refreshChange.Item.Current).IsEqualTo(person3); var moveChange = refreshAndMoveChangeSet.Last(); - moveChange.Reason.Should().Be(ListChangeReason.Moved); - moveChange.Item.Current.Should().Be(person3); - moveChange.Item.PreviousIndex.Should().Be(2); - moveChange.Item.CurrentIndex.Should().Be(0); + await Assert.That(moveChange.Reason).IsEqualTo(ListChangeReason.Moved); + await Assert.That(moveChange.Item.Current).IsEqualTo(person3); + await Assert.That(moveChange.Item.PreviousIndex).IsEqualTo(2); + await Assert.That(moveChange.Item.CurrentIndex).IsEqualTo(0); } - [Fact] - public void ListRecievesRefresh() + [Test] + public async Task ListRecievesRefresh() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); person.Age = 60; - _listNotifications.Messages.Count.Should().Be(2); - _listNotifications.Messages.Last().First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(_listNotifications.Messages.Count).IsEqualTo(2); + await Assert.That(_listNotifications.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Refresh); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _list.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_list.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void Reset() + [Test] + public async Task Reset() { var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToArray(); @@ -180,17 +175,17 @@ public void Reset() var sorted = people.OrderBy(p => p, _comparerNameDesc).ToList(); - _list.Items.Should().Equal(sorted); + await Assert.That(_list.Items).IsEquivalentTo(sorted, TUnit.Assertions.Enums.CollectionOrdering.Matching); - _listNotifications.Messages.Count.Should().Be(2); // Initial loading change set and a reset change due to a change over the reset threshold. - _listNotifications.Messages[0].First().Reason.Should().Be(ListChangeReason.AddRange); // initial loading - _listNotifications.Messages[1].Count.Should().Be(2); // Reset - _listNotifications.Messages[1].First().Reason.Should().Be(ListChangeReason.Clear); // reset - _listNotifications.Messages[1].Last().Reason.Should().Be(ListChangeReason.AddRange); // reset + await Assert.That(_listNotifications.Messages.Count).IsEqualTo(2); // Initial loading change set and a reset change due to a change over the reset threshold. + await Assert.That(_listNotifications.Messages[0].First().Reason).IsEqualTo(ListChangeReason.AddRange); // initial loading + await Assert.That(_listNotifications.Messages[1].Count).IsEqualTo(2); // Reset + await Assert.That(_listNotifications.Messages[1].First().Reason).IsEqualTo(ListChangeReason.Clear); // reset + await Assert.That(_listNotifications.Messages[1].Last().Reason).IsEqualTo(ListChangeReason.AddRange); // reset } - [Fact] - public void TreatMovesAsRemoveAdd() + [Test] + public async Task TreatMovesAsRemoveAdd() { var cache = new SourceCache(p => p.Name); @@ -217,20 +212,20 @@ public void TreatMovesAsRemoveAdd() throw new InvalidOperationException(nameof(latestSetWithMoves)); } - latestSetWithoutMoves.Removes.Should().Be(1); - latestSetWithoutMoves.Adds.Should().Be(1); - latestSetWithoutMoves.Moves.Should().Be(0); - latestSetWithoutMoves.Updates.Should().Be(0); + await Assert.That(latestSetWithoutMoves.Removes).IsEqualTo(1); + await Assert.That(latestSetWithoutMoves.Adds).IsEqualTo(1); + await Assert.That(latestSetWithoutMoves.Moves).IsEqualTo(0); + await Assert.That(latestSetWithoutMoves.Updates).IsEqualTo(0); - latestSetWithMoves.Moves.Should().Be(1); - latestSetWithMoves.Updates.Should().Be(0); - latestSetWithMoves.Removes.Should().Be(0); - latestSetWithMoves.Adds.Should().Be(0); + await Assert.That(latestSetWithMoves.Moves).IsEqualTo(1); + await Assert.That(latestSetWithMoves.Updates).IsEqualTo(0); + await Assert.That(latestSetWithMoves.Removes).IsEqualTo(0); + await Assert.That(latestSetWithMoves.Adds).IsEqualTo(0); } } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person1 = new Person("Adult1", 20); var person2 = new Person("Adult2", 30); @@ -239,10 +234,10 @@ public void UpdateToSourceUpdatesTheDestination() _source.AddOrUpdate(person1); _source.AddOrUpdate(person2); - _list.Items.Should().Equal(person1, person2); + await Assert.That(_list.Items).IsEquivalentTo(new[] { person1, person2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); _source.AddOrUpdate(personUpdated1); - _list.Items.Should().Equal(person2, personUpdated1); + await Assert.That(_list.Items).IsEquivalentTo(new[] { person2, personUpdated1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } } diff --git a/src/DynamicData.Tests/Binding/IObservableListBindListFixture.cs b/src/DynamicData.Tests/Binding/IObservableListBindListFixture.cs index 9dceabfb2..f2ab609a5 100644 --- a/src/DynamicData.Tests/Binding/IObservableListBindListFixture.cs +++ b/src/DynamicData.Tests/Binding/IObservableListBindListFixture.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Linq; -using System.Reactive.Linq; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding; public class IObservableListBindListFixture : IDisposable @@ -32,8 +27,8 @@ public IObservableListBindListFixture() _observableListNotifications = _list.Connect().AsAggregator(); } - [Fact] - public void ResetThresholdsForBinding_ObservableCollection() + [Test] + public async Task ResetThresholdsForBinding_ObservableCollection() { var people = _generator.Take(100).ToArray(); @@ -43,11 +38,10 @@ public void ResetThresholdsForBinding_ObservableCollection() var test3 = Test(new BindingOptions(105, ResetOnFirstTimeLoad: false)); var test4 = Test(BindingOptions.NeverFireReset()); - - test1.action.Should().Be(NotifyCollectionChangedAction.Reset); - test2.action.Should().Be(NotifyCollectionChangedAction.Reset); - test3.action.Should().Be(NotifyCollectionChangedAction.Add); - test4.action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(test1.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test2.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test3.action).IsEqualTo(NotifyCollectionChangedAction.Add); + await Assert.That(test4.action).IsEqualTo(NotifyCollectionChangedAction.Add); return; @@ -65,7 +59,6 @@ public void ResetThresholdsForBinding_ObservableCollection() result = events; }); - var binder = options == null ? _source.Connect().Bind(list).Subscribe() : _source.Connect().Bind(list, options.Value).Subscribe(); @@ -77,23 +70,21 @@ public void ResetThresholdsForBinding_ObservableCollection() } } - [Fact] - public void ResetThresholdsForBinding_ReadonlyObservableCollection() + [Test] + public async Task ResetThresholdsForBinding_ReadonlyObservableCollection() { var people = _generator.Take(100).ToArray(); - // check whether reset is fired with different params var test1 = Test(); var test2 = Test(new BindingOptions(95)); var test3 = Test(new BindingOptions(105, ResetOnFirstTimeLoad: false)); var test4 = Test(BindingOptions.NeverFireReset()); - - test1.action.Should().Be(NotifyCollectionChangedAction.Reset); - test2.action.Should().Be(NotifyCollectionChangedAction.Reset); - test3.action.Should().Be(NotifyCollectionChangedAction.Add); - test4.action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(test1.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test2.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test3.action).IsEqualTo(NotifyCollectionChangedAction.Add); + await Assert.That(test4.action).IsEqualTo(NotifyCollectionChangedAction.Add); return; @@ -122,35 +113,33 @@ public void ResetThresholdsForBinding_ReadonlyObservableCollection() } } - - - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { var people = _generator.Take(100).ToList(); _source.AddRange(people); - _list.Count.Should().Be(100, "Should be 100 items in the collection"); - _list.Should().BeEquivalentTo(_list, "Collections should be equivalent"); + await Assert.That(_list.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_list.Items).IsEquivalentTo(people).Because("Collections should be equivalent"); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.Add(person); - _list.Count.Should().Be(1, "Should be 1 item in the collection"); - _list.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_list.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_list.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.Clear(); - _list.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_list.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } public void Dispose() @@ -160,37 +149,37 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void ListRecievesRefresh() + [Test] + public async Task ListRecievesRefresh() { var person = new Person("Adult1", 50); _source.Add(person); person.Age = 60; - _observableListNotifications.Messages.Count.Should().Be(2); - _observableListNotifications.Messages.Last().First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(_observableListNotifications.Messages.Count).IsEqualTo(2); + await Assert.That(_observableListNotifications.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Refresh); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.Add(person); _source.Remove(person); - _list.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_list.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.Add(person); _source.Replace(person, personUpdated); - _list.Count.Should().Be(1, "Should be 1 item in the collection"); - _list.Items[0].Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_list.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_list.Items[0]).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/Binding/NotifyPropertyChangedExFixture.cs b/src/DynamicData.Tests/Binding/NotifyPropertyChangedExFixture.cs index 2de2402f2..3457fe4cc 100644 --- a/src/DynamicData.Tests/Binding/NotifyPropertyChangedExFixture.cs +++ b/src/DynamicData.Tests/Binding/NotifyPropertyChangedExFixture.cs @@ -1,23 +1,18 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; using System.Runtime.CompilerServices; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Binding; public class NotifyPropertyChangedExFixture { - [Theory, InlineData(true), InlineData(false)] - public void SubscribeToPropertyChangeForAllItemsInList(bool notifyOnInitialValue) + [Test, Arguments(true), Arguments(false)] + public async Task SubscribeToPropertyChangeForAllItemsInList(bool notifyOnInitialValue) { var lastChange = new PropertyValue(new Person(), -1); var source = new SourceList(); @@ -29,25 +24,25 @@ public void SubscribeToPropertyChangeForAllItemsInList(bool notifyOnInitialValue if (notifyOnInitialValue) { - anotherPerson.Should().Be(lastChange.Sender); - lastChange.Value.Should().Be(10); + await Assert.That(anotherPerson).IsEqualTo(lastChange.Sender); + await Assert.That(lastChange.Value).IsEqualTo(10); } else { - lastChange.Sender.Name.Should().Be("unknown"); - lastChange.Value.Should().Be(-1); + await Assert.That(lastChange.Sender.Name).IsEqualTo("unknown"); + await Assert.That(lastChange.Value).IsEqualTo(-1); } person.Age = 12; - lastChange.Sender.Should().Be(person); - lastChange.Value.Should().Be(12); + await Assert.That(lastChange.Sender).IsEqualTo(person); + await Assert.That(lastChange.Value).IsEqualTo(12); anotherPerson.Age = 13; - lastChange.Sender.Should().Be(anotherPerson); - lastChange.Value.Should().Be(13); + await Assert.That(lastChange.Sender).IsEqualTo(anotherPerson); + await Assert.That(lastChange.Value).IsEqualTo(13); } - [Theory, InlineData(true), InlineData(false)] - public void SubscribeToProperyChangedOnASingleItem(bool notifyOnInitialValue) + [Test, Arguments(true), Arguments(false)] + public async Task SubscribeToProperyChangedOnASingleItem(bool notifyOnInitialValue) { var lastChange = new PropertyValue(new Person(), -1); var person = new Person("Name", 10); @@ -55,39 +50,39 @@ public void SubscribeToProperyChangedOnASingleItem(bool notifyOnInitialValue) if (notifyOnInitialValue) { - lastChange.Sender.Should().Be(person); - lastChange.Value.Should().Be(10); + await Assert.That(lastChange.Sender).IsEqualTo(person); + await Assert.That(lastChange.Value).IsEqualTo(10); } else { - lastChange.Sender.Name.Should().Be("unknown"); - lastChange.Value.Should().Be(-1); + await Assert.That(lastChange.Sender.Name).IsEqualTo("unknown"); + await Assert.That(lastChange.Value).IsEqualTo(-1); } person.Age = 12; - lastChange.Sender.Should().Be(person); - lastChange.Value.Should().Be(12); + await Assert.That(lastChange.Sender).IsEqualTo(person); + await Assert.That(lastChange.Value).IsEqualTo(12); person.Age = 13; - lastChange.Sender.Should().Be(person); - lastChange.Value.Should().Be(13); + await Assert.That(lastChange.Sender).IsEqualTo(person); + await Assert.That(lastChange.Value).IsEqualTo(13); } - [Theory, InlineData(true), InlineData(false)] - public void SubscribeToValueChangedOnASingleItem(bool notifyOnInitialValue) + [Test, Arguments(true), Arguments(false)] + public async Task SubscribeToValueChangedOnASingleItem(bool notifyOnInitialValue) { var age = -1; var person = new Person("Name", 10); person.WhenValueChanged(p => p.Age, notifyOnInitialValue).Subscribe(i => age = i); - (notifyOnInitialValue ? 10 : -1).Should().Be(age); + await Assert.That((notifyOnInitialValue ? 10 : -1)).IsEqualTo(age); person.Age = 12; - age.Should().Be(12); + await Assert.That(age).IsEqualTo(12); person.Age = 13; - age.Should().Be(13); + await Assert.That(age).IsEqualTo(13); } - [Theory, InlineData(true), InlineData(false)] - public void SubscribeToValueChangeForAllItemsInList(bool notifyOnInitialValue) + [Test, Arguments(true), Arguments(false)] + public async Task SubscribeToValueChangeForAllItemsInList(bool notifyOnInitialValue) { var lastAgeChange = -1; var source = new SourceList(); @@ -97,80 +92,80 @@ public void SubscribeToValueChangeForAllItemsInList(bool notifyOnInitialValue) source.Add(person); source.Add(anotherPerson); - (notifyOnInitialValue ? 10 : -1).Should().Be(lastAgeChange); + await Assert.That((notifyOnInitialValue ? 10 : -1)).IsEqualTo(lastAgeChange); person.Age = 12; - lastAgeChange.Should().Be(12); + await Assert.That(lastAgeChange).IsEqualTo(12); anotherPerson.Age = 13; - lastAgeChange.Should().Be(13); + await Assert.That(lastAgeChange).IsEqualTo(13); } - - [Fact] - public void CastToNullable() + + [Test] + public async Task CastToNullable() { var parent = new TestEntity() { Id = 1, Age = 10 }; - + using var subscription = parent.WhenValueChanged( - propertyAccessor: static entity => (int?)entity.Child.Age, - notifyOnInitialValue: true, - fallbackValue: static () => null) + propertyAccessor: static entity => (int?)entity.Child.Age, + notifyOnInitialValue: true, + fallbackValue: static () => null) .RecordValues(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("additional changes could be made"); - results.RecordedValues.Should().ContainSingle("an initial value should have been published"); - results.RecordedValues[0].Should().Be(null, "the target entity has no child"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues).HasSingleItem(); + await Assert.That(results.RecordedValues[0]).IsNull().Because("the target entity has no child"); + var child = new TestEntity() { Id = 2, Age = 5 }; parent.Child = child; - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("additional changes could be made"); - results.RecordedValues.Skip(1).Should().ContainSingle("a single change was performed"); - results.RecordedValues.Skip(1).First().Should().Be(child.Age, "a child of age 5 was added"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues.Skip(1)).HasSingleItem(); + await Assert.That(results.RecordedValues.Skip(1).First()).IsEqualTo(child.Age).Because("a child of age 5 was added"); + child.Age = 6; - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("additional changes could be made"); - results.RecordedValues.Skip(2).Should().ContainSingle("a single change was performed"); - results.RecordedValues.Skip(2).First().Should().Be(child.Age, "the child entity's age was changed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedValues.Skip(2)).HasSingleItem(); + await Assert.That(results.RecordedValues.Skip(2).First()).IsEqualTo(child.Age).Because("the child entity's age was changed"); } - + public class TestEntity : INotifyPropertyChanged { public long Id { get; init; } - + public int Age { get; set => SetPropertyField(ref field, value); } - + public TestEntity? Child { get; set => SetPropertyField(ref field, value); - } - + } + public event PropertyChangedEventHandler? PropertyChanged; - + protected void SetPropertyField( - ref T field, - T value, - [CallerMemberName] string? propertyName = null) + ref T field, + T value, + [CallerMemberName] string? propertyName = null) { if (EqualityComparer.Default.Equals(field, value)) return; - + field = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); diff --git a/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheFixture.cs b/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheFixture.cs index 6d68b12c0..d245e25fe 100644 --- a/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheFixture.cs +++ b/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheFixture.cs @@ -1,16 +1,10 @@ -using System; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Linq; -using System.Reactive.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding; public class ObservableCollectionBindCacheFixture : IDisposable @@ -29,24 +23,21 @@ public ObservableCollectionBindCacheFixture() _binder = _source.Connect().Bind(_collection).Subscribe(); } - [Fact] - public void ResetThresholdsForBinding_ObservableCollection() + [Test] + public async Task ResetThresholdsForBinding_ObservableCollection() { var people = _generator.Take(100).ToArray(); - - // check whether reset is fired with different params var test1 = Test(); var test2 = Test(new BindingOptions(95)); var test3 = Test(new BindingOptions(105, ResetOnFirstTimeLoad: false)); var test4 = Test(BindingOptions.NeverFireReset()); - - test1.action.Should().Be(NotifyCollectionChangedAction.Reset); - test2.action.Should().Be(NotifyCollectionChangedAction.Reset); - test3.action.Should().Be(NotifyCollectionChangedAction.Add); - test4.action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(test1.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test2.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test3.action).IsEqualTo(NotifyCollectionChangedAction.Add); + await Assert.That(test4.action).IsEqualTo(NotifyCollectionChangedAction.Add); return; @@ -64,7 +55,6 @@ public void ResetThresholdsForBinding_ObservableCollection() result = events; }); - var binder = options == null ? _source.Connect().Bind(list).Subscribe() : _source.Connect().Bind(list, options.Value).Subscribe(); @@ -76,23 +66,21 @@ public void ResetThresholdsForBinding_ObservableCollection() } } - [Fact] - public void ResetThresholdsForBinding_ReadonlyObservableCollection() + [Test] + public async Task ResetThresholdsForBinding_ReadonlyObservableCollection() { var people = _generator.Take(100).ToArray(); - // check whether reset is fired with different params var test1 = Test(); var test2 = Test(new BindingOptions(95)); var test3 = Test(new BindingOptions(105, ResetOnFirstTimeLoad: false)); var test4 = Test(BindingOptions.NeverFireReset()); - - test1.action.Should().Be(NotifyCollectionChangedAction.Reset); - test2.action.Should().Be(NotifyCollectionChangedAction.Reset); - test3.action.Should().Be(NotifyCollectionChangedAction.Add); - test4.action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(test1.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test2.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test3.action).IsEqualTo(NotifyCollectionChangedAction.Add); + await Assert.That(test4.action).IsEqualTo(NotifyCollectionChangedAction.Add); return; @@ -121,34 +109,33 @@ public void ResetThresholdsForBinding_ReadonlyObservableCollection() } } - - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } public void Dispose() @@ -157,31 +144,29 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceSendsReplaceOnDestination() + [Test] + public async Task UpdateToSourceSendsReplaceOnDestination() { - RunTest(true); - RunTest(false); - + await RunTest(true); + await RunTest(false); - void RunTest(bool useReplace) + async Task RunTest(bool useReplace) { var collection = new ObservableCollectionExtended(); - using var source = new SourceCache(p => p.Name); + using var source = new SourceCache(p => p.Name); using var binder = source.Connect().Bind(collection, new ObservableCollectionAdaptor(useReplaceForUpdates: useReplace)).Subscribe(); - NotifyCollectionChangedAction action = default; source.AddOrUpdate(new Person("Adult1", 50)); @@ -192,24 +177,24 @@ void RunTest(bool useReplace) if (useReplace) { - action.Should().Be(NotifyCollectionChangedAction.Replace); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Replace); } else { - action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Add); } } } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheSortedFixture.cs b/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheSortedFixture.cs index c5df8ce24..0801bbbe8 100644 --- a/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheSortedFixture.cs +++ b/src/DynamicData.Tests/Binding/ObservableCollectionBindCacheSortedFixture.cs @@ -1,16 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Linq; -using System.Reactive.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Binding; public class ObservableCollectionBindCacheSortedFixture : IDisposable @@ -32,25 +26,21 @@ public ObservableCollectionBindCacheSortedFixture() _binder = _source.Connect().Sort(_comparer, resetThreshold: 25).Bind(_collection).Subscribe(); } - - [Fact] - public void ResetThresholdsForBinding_ObservableCollection() + [Test] + public async Task ResetThresholdsForBinding_ObservableCollection() { var people = _generator.Take(100).ToArray(); - - // check whether reset is fired with different params var test1 = Test(); var test2 = Test(new BindingOptions(95)); var test3 = Test(new BindingOptions(105, ResetOnFirstTimeLoad: false)); var test4 = Test(BindingOptions.NeverFireReset()); - - test1.action.Should().Be(NotifyCollectionChangedAction.Reset); - test2.action.Should().Be(NotifyCollectionChangedAction.Reset); - test3.action.Should().Be(NotifyCollectionChangedAction.Add); - test4.action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(test1.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test2.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test3.action).IsEqualTo(NotifyCollectionChangedAction.Add); + await Assert.That(test4.action).IsEqualTo(NotifyCollectionChangedAction.Add); return; @@ -68,7 +58,6 @@ public void ResetThresholdsForBinding_ObservableCollection() result = events; }); - var binder = options == null ? _source.Connect().Sort(_comparer).Bind(list).Subscribe() : _source.Connect().Sort(_comparer).Bind(list, options.Value).Subscribe(); @@ -80,23 +69,21 @@ public void ResetThresholdsForBinding_ObservableCollection() } } - [Fact] - public void ResetThresholdsForBinding_ReadonlyObservableCollection() + [Test] + public async Task ResetThresholdsForBinding_ReadonlyObservableCollection() { var people = _generator.Take(100).ToArray(); - // check whether reset is fired with different params var test1 = Test(); var test2 = Test(new BindingOptions(95)); var test3 = Test(new BindingOptions(105, ResetOnFirstTimeLoad: false)); var test4 = Test(BindingOptions.NeverFireReset()); - - test1.action.Should().Be(NotifyCollectionChangedAction.Reset); - test2.action.Should().Be(NotifyCollectionChangedAction.Reset); - test3.action.Should().Be(NotifyCollectionChangedAction.Add); - test4.action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(test1.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test2.action).IsEqualTo(NotifyCollectionChangedAction.Reset); + await Assert.That(test3.action).IsEqualTo(NotifyCollectionChangedAction.Add); + await Assert.That(test4.action).IsEqualTo(NotifyCollectionChangedAction.Add); return; @@ -108,8 +95,8 @@ public void ResetThresholdsForBinding_ReadonlyObservableCollection() ReadOnlyObservableCollection list; //var list = new ObservableCollectionExtended(); - var binder = options == null - ? _source.Connect().Sort(_comparer).Bind(out list).Subscribe() + var binder = options == null + ? _source.Connect().Sort(_comparer).Bind(out list).Subscribe() : _source.Connect().Sort(_comparer).Bind(out list, options.Value).Subscribe(); using var listEvents = list.ObserveCollectionChanges().Take(1) @@ -125,41 +112,41 @@ public void ResetThresholdsForBinding_ReadonlyObservableCollection() } } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } - [Fact] - public void CollectionIsInSortOrder() + [Test] + public async Task CollectionIsInSortOrder() { _source.AddOrUpdate(_generator.Take(100)); var sorted = _source.Items.OrderBy(p => p, _comparer).ToList(); - sorted.Should().BeEquivalentTo(_collection.ToList()); + await Assert.That(sorted).IsEquivalentTo(_collection.ToList()); } public void Dispose() @@ -168,35 +155,37 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void LargeUpdateInvokesAReset() + [Test] + public async Task LargeUpdateInvokesAReset() { //update once as initial load is always a reset _source.AddOrUpdate(new Person("Me", 21)); var invoked = false; + NotifyCollectionChangedAction? action = null; _collection.CollectionChanged += (sender, e) => { invoked = true; - e.Action.Should().Be(NotifyCollectionChangedAction.Reset); + action = e.Action; }; _source.AddOrUpdate(_generator.Take(100)); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Reset); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void SmallChangeDoesNotInvokeReset() + [Test] + public async Task SmallChangeDoesNotInvokeReset() { //update once as initial load is always a reset _source.AddOrUpdate(new Person("Me", 21)); @@ -213,12 +202,12 @@ public void SmallChangeDoesNotInvokeReset() }; _source.AddOrUpdate(_generator.Take(24)); - invoked.Should().BeTrue(); - resetInvoked.Should().BeFalse(); + await Assert.That(invoked).IsTrue(); + await Assert.That(resetInvoked).IsFalse(); } - [Fact] - public void TreatMovesAsRemoveAdd() + [Test] + public async Task TreatMovesAsRemoveAdd() { var cache = new SourceCache(p => p.Name); @@ -248,20 +237,20 @@ public void TreatMovesAsRemoveAdd() throw new InvalidOperationException(nameof(latestSetWithMoves)); } - latestSetWithoutMoves.Removes.Should().Be(1); - latestSetWithoutMoves.Adds.Should().Be(1); - latestSetWithoutMoves.Moves.Should().Be(0); - latestSetWithoutMoves.Updates.Should().Be(0); + await Assert.That(latestSetWithoutMoves.Removes).IsEqualTo(1); + await Assert.That(latestSetWithoutMoves.Adds).IsEqualTo(1); + await Assert.That(latestSetWithoutMoves.Moves).IsEqualTo(0); + await Assert.That(latestSetWithoutMoves.Updates).IsEqualTo(0); - latestSetWithMoves.Moves.Should().Be(1); - latestSetWithMoves.Updates.Should().Be(0); - latestSetWithMoves.Removes.Should().Be(0); - latestSetWithMoves.Adds.Should().Be(0); + await Assert.That(latestSetWithMoves.Moves).IsEqualTo(1); + await Assert.That(latestSetWithMoves.Updates).IsEqualTo(0); + await Assert.That(latestSetWithMoves.Removes).IsEqualTo(0); + await Assert.That(latestSetWithMoves.Adds).IsEqualTo(0); } } - [Fact] - public void UpdateToSourceSendsRemoveAndAddIfSortingIsAffected() + [Test] + public async Task UpdateToSourceSendsRemoveAndAddIfSortingIsAffected() { var person1 = new Person("Adult1", 10); var person2 = new Person("Adult2", 11); @@ -282,18 +271,17 @@ public void UpdateToSourceSendsRemoveAndAddIfSortingIsAffected() } } - actions.Should().Equal(NotifyCollectionChangedAction.Remove, NotifyCollectionChangedAction.Add); - collection.Should().Equal(person2Updated, person1); + await Assert.That(actions).IsEquivalentTo(new[] { NotifyCollectionChangedAction.Remove, NotifyCollectionChangedAction.Add }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(collection).IsEquivalentTo(new[] { person2Updated, person1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void UpdateToSourceSendsReplaceIfSortingIsNotAffected() + [Test] + public async Task UpdateToSourceSendsReplaceIfSortingIsNotAffected() { - RunTest(true); - RunTest(false); - + await RunTest(true); + await RunTest(false); - void RunTest(bool useReplace) + async Task RunTest(bool useReplace) { var collection = new ObservableCollectionExtended(); @@ -316,26 +304,26 @@ void RunTest(bool useReplace) if (useReplace) { - action.Should().Be(NotifyCollectionChangedAction.Replace, "The notification type should be Replace"); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Replace).Because("The notification type should be Replace"); } else { - action.Should().Be(NotifyCollectionChangedAction.Add, "The notification type should be Add"); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Add).Because("The notification type should be Add"); } - collection.Should().Equal(person1, person2Updated); + await Assert.That(collection).IsEquivalentTo(new[] { person1, person2Updated }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/Binding/ObservableCollectionBindListFixture.cs b/src/DynamicData.Tests/Binding/ObservableCollectionBindListFixture.cs index 8e71766e3..9d62cc405 100644 --- a/src/DynamicData.Tests/Binding/ObservableCollectionBindListFixture.cs +++ b/src/DynamicData.Tests/Binding/ObservableCollectionBindListFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Binding; public class ObservableCollectionBindListFixture : IDisposable @@ -27,33 +24,33 @@ public ObservableCollectionBindListFixture() _binder = _source.Connect().Bind(_collection).Subscribe(); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { var people = _generator.Take(100).ToList(); _source.AddRange(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.Add(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } public void Dispose() @@ -62,25 +59,25 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.Add(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.Add(person); _source.Replace(person, personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/Binding/ObservableCollectionExtendedToChangeSetFixture.cs b/src/DynamicData.Tests/Binding/ObservableCollectionExtendedToChangeSetFixture.cs index a3d89a0d1..20ace55b8 100644 --- a/src/DynamicData.Tests/Binding/ObservableCollectionExtendedToChangeSetFixture.cs +++ b/src/DynamicData.Tests/Binding/ObservableCollectionExtendedToChangeSetFixture.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Binding; @@ -25,62 +21,62 @@ public ObservableCollectionExtendedToChangeSetFixture() _results = _target.ToObservableChangeSet().AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _collection.Add(1); - _results.Messages.Count.Should().Be(2); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } public void Dispose() => _results.Dispose(); - [Fact] - public void Duplicates() + [Test] + public async Task Duplicates() { _collection.Add(1); _collection.Add(1); - _results.Data.Count.Should().Be(2); + await Assert.That(_results.Data.Count).IsEqualTo(2); } - [Fact] - public void Move() + [Test] + public async Task Move() { _collection.AddRange(Enumerable.Range(1, 10)); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); _collection.Move(5, 8); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); _collection.Move(7, 1); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Remove(3); - _results.Data.Count.Should().Be(9); - _results.Data.Items.Contains(3).Should().BeFalse(); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Count).IsEqualTo(9); + await Assert.That(_results.Data.Items.Contains(3)).IsFalse(); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { _collection.AddRange(Enumerable.Range(1, 10)); _collection[8] = 20; - _results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); } - //[Fact] + //[Test] //public void ResetFiresClearsAndAdds() //{ // _collection.AddRange(Enumerable.Range(1, 10)); diff --git a/src/DynamicData.Tests/Binding/ObservableCollectionToChangeSetFixture.cs b/src/DynamicData.Tests/Binding/ObservableCollectionToChangeSetFixture.cs index da7252cef..2374abf25 100644 --- a/src/DynamicData.Tests/Binding/ObservableCollectionToChangeSetFixture.cs +++ b/src/DynamicData.Tests/Binding/ObservableCollectionToChangeSetFixture.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Binding; @@ -23,72 +18,72 @@ public ObservableCollectionToChangeSetFixture() _results = _collection.ToObservableChangeSet().AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _collection.Add(1); - _results.Messages.Count.Should().BeGreaterThanOrEqualTo(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Messages.Count).IsGreaterThanOrEqualTo(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } public void Dispose() => _results.Dispose(); - [Fact] - public void Duplicates() + [Test] + public async Task Duplicates() { _collection.Add(1); _collection.Add(1); - _results.Data.Count.Should().Be(2); + await Assert.That(_results.Data.Count).IsEqualTo(2); } - [Fact] - public void Move() + [Test] + public async Task Move() { _collection.AddRange(Enumerable.Range(1, 10)); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); _collection.Move(5, 8); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); _collection.Move(7, 1); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Remove(3); - _results.Data.Count.Should().Be(9); - _results.Data.Items.Contains(3).Should().BeFalse(); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Count).IsEqualTo(9); + await Assert.That(_results.Data.Items.Contains(3)).IsFalse(); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { _collection.AddRange(Enumerable.Range(1, 10)); _collection[8] = 20; - _results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); } - [Fact] - public void ResetFiresClearsAndAdds() + [Test] + public async Task ResetFiresClearsAndAdds() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Reset(); - _results.Data.Items.Should().BeEquivalentTo(_collection); + await Assert.That(_results.Data.Items).IsEquivalentTo(_collection); var resetNotification = _results.Messages.Last(); - resetNotification.Removes.Should().Be(10); - resetNotification.Adds.Should().Be(10); + await Assert.That(resetNotification.Removes).IsEqualTo(10); + await Assert.That(resetNotification.Adds).IsEqualTo(10); } private class TestObservableCollection : ObservableCollection diff --git a/src/DynamicData.Tests/Binding/ReadOnlyObservableCollectionToChangeSetFixture.cs b/src/DynamicData.Tests/Binding/ReadOnlyObservableCollectionToChangeSetFixture.cs index 13efc2a87..f0dba15a6 100644 --- a/src/DynamicData.Tests/Binding/ReadOnlyObservableCollectionToChangeSetFixture.cs +++ b/src/DynamicData.Tests/Binding/ReadOnlyObservableCollectionToChangeSetFixture.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Binding; @@ -26,42 +21,42 @@ public ReadOnlyObservableCollectionToChangeSetFixture() _results = _target.ToObservableChangeSet().AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _collection.Add(1); - _results.Messages.Count.Should().Be(2); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } public void Dispose() => _results.Dispose(); - [Fact] - public void Duplicates() + [Test] + public async Task Duplicates() { _collection.Add(1); _collection.Add(1); - _results.Data.Count.Should().Be(2); + await Assert.That(_results.Data.Count).IsEqualTo(2); } - [Fact] - public void Move() + [Test] + public async Task Move() { _collection.AddRange(Enumerable.Range(1, 10)); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); _collection.Move(5, 8); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); _collection.Move(7, 1); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); } - [Fact] - public void RefreshNotSupported() + [Test] + public async Task RefreshNotSupported() { // Arrange var sourceCache = new SourceCache(item => item.Id); @@ -77,53 +72,53 @@ public void RefreshNotSupported() item1.Name = "New Name"; // Source cache received add and refresh - sourceCacheResults.Messages.Count.Should().Be(2); - sourceCacheResults.Messages.First().Adds.Should().Be(1); - sourceCacheResults.Messages.Last().Refreshes.Should().Be(1); + await Assert.That(sourceCacheResults.Messages.Count).IsEqualTo(2); + await Assert.That(sourceCacheResults.Messages.First().Adds).IsEqualTo(1); + await Assert.That(sourceCacheResults.Messages.Last().Refreshes).IsEqualTo(1); // Collection only receives add and NOT refresh // System.Collections.Specialized.NotifyCollectionChangedAction does not have an enum to describe the same item being refreshed. // https://docs.microsoft.com/en-us/dotnet/api/system.collections.specialized.notifycollectionchangedaction - collectionResults.Messages.Count.Should().Be(1); - collectionResults.Messages.First().Adds.Should().Be(1); + await Assert.That(collectionResults.Messages.Count).IsEqualTo(1); + await Assert.That(collectionResults.Messages.First().Adds).IsEqualTo(1); sourceCache.Dispose(); sourceCacheResults.Dispose(); collectionResults.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Remove(3); - _results.Data.Count.Should().Be(9); - _results.Data.Items.Contains(3).Should().BeFalse(); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Count).IsEqualTo(9); + await Assert.That(_results.Data.Items.Contains(3)).IsFalse(); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { _collection.AddRange(Enumerable.Range(1, 10)); _collection[8] = 20; - _results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 }); } - [Fact] - public void ResetFiresClearsAndAdds() + [Test] + public async Task ResetFiresClearsAndAdds() { _collection.AddRange(Enumerable.Range(1, 10)); _collection.Reset(); - _results.Data.Items.Should().BeEquivalentTo(_target); + await Assert.That(_results.Data.Items).IsEquivalentTo(_target); var resetNotification = _results.Messages.Last(); - resetNotification.Removes.Should().Be(10); - resetNotification.Adds.Should().Be(10); + await Assert.That(resetNotification.Removes).IsEqualTo(10); + await Assert.That(resetNotification.Adds).IsEqualTo(10); } private class TestObservableCollection : ObservableCollection diff --git a/src/DynamicData.Tests/Binding/ReadonlyCollectionBindCacheFixture.cs b/src/DynamicData.Tests/Binding/ReadonlyCollectionBindCacheFixture.cs index 492448b73..b5d7e7221 100644 --- a/src/DynamicData.Tests/Binding/ReadonlyCollectionBindCacheFixture.cs +++ b/src/DynamicData.Tests/Binding/ReadonlyCollectionBindCacheFixture.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Linq; -using System.Reactive.Linq; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Binding; @@ -23,33 +20,33 @@ public ReadonlyCollectionBindCacheFixture() _binder = _source.Connect().Bind(out _collection).Subscribe(); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } public void Dispose() @@ -58,24 +55,23 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceSendsReplaceOnDestination() + [Test] + public async Task UpdateToSourceSendsReplaceOnDestination() { - RunTest(true); - RunTest(false); + await RunTest(true); + await RunTest(false); - - void RunTest(bool useReplace) + async Task RunTest(bool useReplace) { using var source = new SourceCache(p => p.Name); using var binder = source.Connect().Bind(out var collection, useReplaceForUpdates: useReplace).Subscribe(); @@ -90,24 +86,24 @@ void RunTest(bool useReplace) if (useReplace) { - action.Should().Be(NotifyCollectionChangedAction.Replace); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Replace); } else { - action.Should().Be(NotifyCollectionChangedAction.Add); + await Assert.That(action).IsEqualTo(NotifyCollectionChangedAction.Add); } } } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/Binding/WhenPropertyChangedBehaviorFixture.cs b/src/DynamicData.Tests/Binding/WhenPropertyChangedBehaviorFixture.cs index 718df9537..385911968 100644 --- a/src/DynamicData.Tests/Binding/WhenPropertyChangedBehaviorFixture.cs +++ b/src/DynamicData.Tests/Binding/WhenPropertyChangedBehaviorFixture.cs @@ -1,309 +1,271 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using DynamicData.Binding; -using DynamicData.Tests.Utilities; -using FluentAssertions; - -using Xunit; - -namespace DynamicData.Tests.Binding; - -/// -/// Single-threaded contract tests for : -/// handler attachment ordering, no-dedup semantics, deep-chain re-walks on swaps. -/// -public sealed class WhenPropertyChangedBehaviorFixture -{ - [Fact] - public void Shallow_NotifyInitialFalse_SubscribesHandlerBeforeReturning() - { - // notifyOnInitialValue=false: Subscribe must return only after the PropertyChanged handler - // is attached. A setter that fires immediately after Subscribe returns must reach the - // observer. - var model = new TestModel { Value = 10 }; - var emissions = new List(); - - using var sub = model.WhenPropertyChanged(m => m.Value, notifyOnInitialValue: false) - .Subscribe(pv => emissions.Add(pv.Value)); - - model.Value = 20; - - emissions.Should().Equal(new[] { 20 }); - } - - [Fact] - public void Shallow_NotifyInitialTrue_DoesNotDedupSameValuedEvents() - { - var model = new TestModel { Value = 10 }; - var emissions = new List(); - - using var sub = model.WhenPropertyChanged(m => m.Value, notifyOnInitialValue: true) - .Subscribe(pv => emissions.Add(pv.Value)); - - model.Value = 10; - model.Value = 10; - model.Value = 10; - - emissions.Should().Equal(new[] { 10, 10, 10, 10 }); - } - - [Fact] - public void Shallow_NotifyInitialFalse_DoesNotDedupSameValuedEvents() - { - var model = new TestModel { Value = 10 }; - var emissions = new List(); - - using var sub = model.WhenPropertyChanged(m => m.Value, notifyOnInitialValue: false) - .Subscribe(pv => emissions.Add(pv.Value)); - - model.Value = 42; - model.Value = 42; - - emissions.Should().Equal(new[] { 42, 42 }); - } - - [Fact] - public void DeepChain_NotifyInitialTrue_DoesNotDedupSameValuedEvents() - { - var parent = new ParentModel { Child = new ChildModel { Age = 1 } }; - var emissions = new List(); - - using var sub = parent.WhenPropertyChanged(p => p.Child!.Age, notifyOnInitialValue: true) - .Subscribe(pv => emissions.Add(pv.Value)); - - parent.Child!.Age = 1; - parent.Child!.Age = 1; - parent.Child!.Age = 1; - - emissions.Should().Equal(new[] { 1, 1, 1, 1 }); - } - - [Fact] - public void DeepChain_NotifyInitialFalse_DoesNotDedupSameValuedEvents() - { - var parent = new ParentModel { Child = new ChildModel { Age = 1 } }; - var emissions = new List(); - - using var sub = parent.WhenPropertyChanged(p => p.Child!.Age, notifyOnInitialValue: false) - .Subscribe(pv => emissions.Add(pv.Value)); - - parent.Child!.Age = 7; - parent.Child!.Age = 7; - - emissions.Should().Equal(new[] { 7, 7 }); - } - - [Fact] - public void DeepChain_PostSwap_LeafEventOnNewChild_Captured() - { - // After parent.Child is reassigned, the leaf-level subscription must be re-attached - // against the new child. A subsequent leaf mutation on the new child must be captured. - var parent = new ParentModel { Child = new ChildModel { Age = 10 } }; - var emissions = new List(); - - using var sub = parent.WhenPropertyChanged(p => p.Child!.Age, notifyOnInitialValue: true) - .Subscribe(pv => emissions.Add(pv.Value)); - - var newChild = new ChildModel { Age = 20 }; - parent.Child = newChild; - newChild.Age = 30; - - emissions.Should().Equal(new[] { 10, 20, 30 }); - } - - [Fact] - public void DeepChain_MidChainSwap_DeeperLevelsRetargetCorrectly() - { - // Mid-chain swap on a 4-level chain. When level 3 is reassigned, the leaf subscription - // must re-attach against the new subtree; events on the old subtree must be ignored - // (its notifier subscription was disposed). - var l1 = new Level1 - { - Child = new Level2 - { - Child = new Level3 - { - Child = new Level4 { Leaf = 10 }, - }, - }, - }; - - var emissions = new List(); - using var sub = l1.WhenPropertyChanged(x => x.Child!.Child!.Child!.Leaf, notifyOnInitialValue: true) - .Subscribe(pv => emissions.Add(pv.Value)); - - emissions.Should().Equal(new[] { 10 }, "initial emission"); - - var originalLeaf = l1.Child!.Child!.Child!; - - var newL4 = new Level4 { Leaf = 20 }; - l1.Child!.Child!.Child = newL4; - - emissions.Should().Equal(new[] { 10, 20 }, "mid-chain swap emits the new leaf value"); - - newL4.Leaf = 30; - emissions.Should().Equal(new[] { 10, 20, 30 }, "leaf event on new subtree is captured"); - - originalLeaf.Leaf = 999; - emissions.Should().Equal(new[] { 10, 20, 30 }, "leaf event on detached subtree is ignored"); - } - - // https://github.com/reactivemarbles/DynamicData/issues/1149 - [Fact] - public void ExpressionContainsImplicitInterfaceCast() - { - var child = new ChildModel() - { - Age = 10 - }; - - using var subscription = ObserveAge(child) - .RecordValues(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Should().ContainSingle("the initial value of the observed expression should have been published"); - results.RecordedValues[0].Should().Be(child.Age, "the initial value of the observed expression should have been published"); - - ++child.Age; - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Skip(1).Should().ContainSingle("the value of the observed expression changed once"); - results.RecordedValues[1].Should().Be(child.Age, "the correct value should have been published"); - - static IObservable ObserveAge(T source) - where T : IHasAge - => source.WhenValueChanged(source => source.Age); - } - - private interface IHasAge - : INotifyPropertyChanged - { - int Age { get; } - } - - private sealed class TestModel : INotifyPropertyChanged - { - private int _value; - - public event PropertyChangedEventHandler? PropertyChanged; - - public int Value - { - get => _value; - set - { - _value = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value))); - } - } - } - - private sealed class ParentModel : INotifyPropertyChanged - { - private ChildModel? _child; - - public event PropertyChangedEventHandler? PropertyChanged; - - public ChildModel? Child - { - get => _child; - set - { - _child = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); - } - } - } - - private sealed class ChildModel - : IHasAge - { - private int _age; - - public event PropertyChangedEventHandler? PropertyChanged; - - public int Age - { - get => _age; - set - { - _age = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Age))); - } - } - } - - private sealed class Level1 : INotifyPropertyChanged - { - private Level2? _child; - - public event PropertyChangedEventHandler? PropertyChanged; - - public Level2? Child - { - get => _child; - set - { - _child = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); - } - } - } - - private sealed class Level2 : INotifyPropertyChanged - { - private Level3? _child; - - public event PropertyChangedEventHandler? PropertyChanged; - - public Level3? Child - { - get => _child; - set - { - _child = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); - } - } - } - - private sealed class Level3 : INotifyPropertyChanged - { - private Level4? _child; - - public event PropertyChangedEventHandler? PropertyChanged; - - public Level4? Child - { - get => _child; - set - { - _child = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); - } - } - } - - private sealed class Level4 : INotifyPropertyChanged - { - private int _leaf; - - public event PropertyChangedEventHandler? PropertyChanged; - - public int Leaf - { - get => _leaf; - set - { - _leaf = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Leaf))); - } - } - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif + +namespace DynamicData.Tests.Binding; + +/// +/// Single-threaded contract tests for : +/// handler attachment ordering, no-dedup semantics, deep-chain re-walks on swaps. +/// +public sealed class WhenPropertyChangedBehaviorFixture +{ + [Test] + public async Task Shallow_NotifyInitialFalse_SubscribesHandlerBeforeReturning() + { + // notifyOnInitialValue=false: Subscribe must return only after the PropertyChanged handler + // is attached. A setter that fires immediately after Subscribe returns must reach the + // observer. + var model = new TestModel { Value = 10 }; + var emissions = new List(); + + using var sub = model.WhenPropertyChanged(m => m.Value, notifyOnInitialValue: false) + .Subscribe(pv => emissions.Add(pv.Value)); + + model.Value = 20; + + await Assert.That(emissions).IsEquivalentTo(new[] { 20 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task Shallow_NotifyInitialTrue_DoesNotDedupSameValuedEvents() + { + var model = new TestModel { Value = 10 }; + var emissions = new List(); + + using var sub = model.WhenPropertyChanged(m => m.Value, notifyOnInitialValue: true) + .Subscribe(pv => emissions.Add(pv.Value)); + + model.Value = 10; + model.Value = 10; + model.Value = 10; + + await Assert.That(emissions).IsEquivalentTo(new[] { 10, 10, 10, 10 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task Shallow_NotifyInitialFalse_DoesNotDedupSameValuedEvents() + { + var model = new TestModel { Value = 10 }; + var emissions = new List(); + + using var sub = model.WhenPropertyChanged(m => m.Value, notifyOnInitialValue: false) + .Subscribe(pv => emissions.Add(pv.Value)); + + model.Value = 42; + model.Value = 42; + + await Assert.That(emissions).IsEquivalentTo(new[] { 42, 42 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task DeepChain_NotifyInitialTrue_DoesNotDedupSameValuedEvents() + { + var parent = new ParentModel { Child = new ChildModel { Age = 1 } }; + var emissions = new List(); + + using var sub = parent.WhenPropertyChanged(p => p.Child!.Age, notifyOnInitialValue: true) + .Subscribe(pv => emissions.Add(pv.Value)); + + parent.Child!.Age = 1; + parent.Child!.Age = 1; + parent.Child!.Age = 1; + + await Assert.That(emissions).IsEquivalentTo(new[] { 1, 1, 1, 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task DeepChain_NotifyInitialFalse_DoesNotDedupSameValuedEvents() + { + var parent = new ParentModel { Child = new ChildModel { Age = 1 } }; + var emissions = new List(); + + using var sub = parent.WhenPropertyChanged(p => p.Child!.Age, notifyOnInitialValue: false) + .Subscribe(pv => emissions.Add(pv.Value)); + + parent.Child!.Age = 7; + parent.Child!.Age = 7; + + await Assert.That(emissions).IsEquivalentTo(new[] { 7, 7 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task DeepChain_PostSwap_LeafEventOnNewChild_Captured() + { + // After parent.Child is reassigned, the leaf-level subscription must be re-attached + // against the new child. A subsequent leaf mutation on the new child must be captured. + var parent = new ParentModel { Child = new ChildModel { Age = 10 } }; + var emissions = new List(); + + using var sub = parent.WhenPropertyChanged(p => p.Child!.Age, notifyOnInitialValue: true) + .Subscribe(pv => emissions.Add(pv.Value)); + + var newChild = new ChildModel { Age = 20 }; + parent.Child = newChild; + newChild.Age = 30; + + await Assert.That(emissions).IsEquivalentTo(new[] { 10, 20, 30 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task DeepChain_MidChainSwap_DeeperLevelsRetargetCorrectly() + { + // Mid-chain swap on a 4-level chain. When level 3 is reassigned, the leaf subscription + // must re-attach against the new subtree; events on the old subtree must be ignored + // (its notifier subscription was disposed). + var l1 = new Level1 + { + Child = new Level2 + { + Child = new Level3 + { + Child = new Level4 { Leaf = 10 }, + }, + }, + }; + + var emissions = new List(); + using var sub = l1.WhenPropertyChanged(x => x.Child!.Child!.Child!.Leaf, notifyOnInitialValue: true) + .Subscribe(pv => emissions.Add(pv.Value)); + + await Assert.That(emissions).IsEquivalentTo(new[] { 10 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("initial emission"); + + var originalLeaf = l1.Child!.Child!.Child!; + + var newL4 = new Level4 { Leaf = 20 }; + l1.Child!.Child!.Child = newL4; + + await Assert.That(emissions).IsEquivalentTo(new[] { 10, 20 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("mid-chain swap emits the new leaf value"); + + newL4.Leaf = 30; + await Assert.That(emissions).IsEquivalentTo(new[] { 10, 20, 30 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("leaf event on new subtree is captured"); + + originalLeaf.Leaf = 999; + await Assert.That(emissions).IsEquivalentTo(new[] { 10, 20, 30 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("leaf event on detached subtree is ignored"); + } + + private sealed class TestModel : INotifyPropertyChanged + { + private int _value; + + public event PropertyChangedEventHandler? PropertyChanged; + + public int Value + { + get => _value; + set + { + _value = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value))); + } + } + } + + private sealed class ParentModel : INotifyPropertyChanged + { + private ChildModel? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public ChildModel? Child + { + get => _child; + set + { + _child = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); + } + } + } + + private sealed class ChildModel : INotifyPropertyChanged + { + private int _age; + + public event PropertyChangedEventHandler? PropertyChanged; + + public int Age + { + get => _age; + set + { + _age = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Age))); + } + } + } + + private sealed class Level1 : INotifyPropertyChanged + { + private Level2? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public Level2? Child + { + get => _child; + set + { + _child = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); + } + } + } + + private sealed class Level2 : INotifyPropertyChanged + { + private Level3? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public Level3? Child + { + get => _child; + set + { + _child = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); + } + } + } + + private sealed class Level3 : INotifyPropertyChanged + { + private Level4? _child; + + public event PropertyChangedEventHandler? PropertyChanged; + + public Level4? Child + { + get => _child; + set + { + _child = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Child))); + } + } + } + + private sealed class Level4 : INotifyPropertyChanged + { + private int _leaf; + + public event PropertyChangedEventHandler? PropertyChanged; + + public int Leaf + { + get => _leaf; + set + { + _leaf = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Leaf))); + } + } + } +} diff --git a/src/DynamicData.Tests/Binding/WhenPropertyChangedRaceFixture.cs b/src/DynamicData.Tests/Binding/WhenPropertyChangedRaceFixture.cs index 5c8d073c8..415b0b1b0 100644 --- a/src/DynamicData.Tests/Binding/WhenPropertyChangedRaceFixture.cs +++ b/src/DynamicData.Tests/Binding/WhenPropertyChangedRaceFixture.cs @@ -1,36 +1,26 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading; -using System.Threading.Tasks; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Binding; /// /// Multi-threaded race tests for . /// Each test forces concurrency between the operator's subscribe call (or chain re-walk) and one or more -/// notifiers firing on other threads. +/// notifiers firing on other threads. /// +[NotInParallel] public sealed class WhenPropertyChangedRaceFixture { private static readonly TimeSpan ConditionTimeout = TimeSpan.FromSeconds(30); - [Fact] + [Test] public async Task Shallow_ConcurrentMutationDuringInitialEmit_NotDropped() { var item = new Item() @@ -43,8 +33,8 @@ public async Task Shallow_ConcurrentMutationDuringInitialEmit_NotDropped() var whenValueChanged = new ManualResetEventSlim(); var source = item.WhenPropertyChanged( - propertyAccessor: static item => item.Value, - notifyOnInitialValue: true); + propertyAccessor: static item => item.Value, + notifyOnInitialValue: true); var observedValues = new List(); var observer = Observer.Create>(propertyValue => @@ -69,13 +59,12 @@ await Task.WhenAll( whenValueChanged.Set(); })); - observedValues.Should().BeEquivalentTo( - expectation: new [] { 10, 20 }, - config: options => options.WithStrictOrdering(), - because: "All change events occurring after publication of the initial value should be captured and forwarded."); + await Assert.That(observedValues).IsEquivalentTo( + new[] { 10, 20 }, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("All change events occurring after publication of the initial value should be captured and forwarded."); } - [Fact] + [Test] public async Task DeepChain_ConcurrentLeafMutationDuringInitialEmit_NotDropped() { // Deep-chain version of the above. The observer blocks inside its OnNext for the initial @@ -107,10 +96,10 @@ await Task.WhenAll( whenValueChanged.Set(); })).WaitAsync(ConditionTimeout); - emissions.Should().Equal(new[] { 10, 20 }); + await Assert.That(emissions).IsEquivalentTo(new[] { 10, 20 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] + [Test] public async Task DeepChain_ConcurrentParentSwap_LeafEventOnWinnerNotDropped() { // Two threads concurrently swap parent.Child. After both swaps complete, a leaf mutation @@ -155,10 +144,10 @@ public async Task DeepChain_ConcurrentParentSwap_LeafEventOnWinnerNotDropped() } } - losses.Should().Be(0, $"out of {iterations} iterations, {losses} dropped the leaf event on the post-swap winner"); + await Assert.That(losses).IsEqualTo(0).Because($"out of {iterations} iterations, {losses} dropped the leaf event on the post-swap winner"); } - [Fact] + [Test] public async Task DeepChain_FiveLevels_AllLevelsMutatedConcurrently_FinalEmissionMatchesActual() { // Torture: five worker threads each mutating at a different level of a 5-level chain. @@ -252,25 +241,29 @@ public async Task DeepChain_FiveLevels_AllLevelsMutatedConcurrently_FinalEmissio legal.Add(iterSeed + 40_000 + i); } + List emissionsSnapshot; + lock (emissions) { - emissions.Should().NotBeEmpty($"iter {iter}: notifyOnInitialValue=true requires at least the initial emission"); - emissions[0].Should().Be(0, $"iter {iter}: first emission must be the initial value"); + emissionsSnapshot = emissions.ToList(); - var illegal = emissions.Where(v => !legal.Contains(v)).ToList(); - illegal.Should().BeEmpty($"iter {iter}: every emission must be a value some thread wrote; saw {string.Join(",", illegal.Take(5))}"); - - if (emissions.Count == 0 || emissions[^1] != actualFinal) + if (emissionsSnapshot.Count == 0 || emissionsSnapshot[^1] != actualFinal) { mismatches++; } } + + await Assert.That(emissionsSnapshot).IsNotEmpty(); + await Assert.That(emissionsSnapshot[0]).IsEqualTo(0).Because($"iter {iter}: first emission must be the initial value"); + + var illegal = emissionsSnapshot.Where(v => !legal.Contains(v)).ToList(); + await Assert.That(illegal).IsEmpty(); } - mismatches.Should().Be(0, $"out of {iterations} iterations, {mismatches} ended with the last emission not matching the actual final chain leaf"); + await Assert.That(mismatches).IsEqualTo(0).Because($"out of {iterations} iterations, {mismatches} ended with the last emission not matching the actual final chain leaf"); } - [Fact(Skip = "AutoRefresh has a separate concurrency bug; tracked separately")] + [Test] public async Task AutoRefreshThenFilter_ConcurrentAddsAndPropertyActivation_AllItemsObserved() { // One adder thread sequentially adds items to the cache while a single flipper thread @@ -319,12 +312,12 @@ public async Task AutoRefreshThenFilter_ConcurrentAddsAndPropertyActivation_AllI WaitForCondition(() => results.Data.Keys.ToHashSet().SetEquals(expected)); var actual = results.Data.Keys.ToHashSet(); - actual.Should().BeEquivalentTo(expected, $"iter {iter}: every item ends Activated=true and must appear in the filter (missing: {string.Join(",", expected.Except(actual))})"); - results.Error.Should().BeNull($"iter {iter}: pipeline must not error"); + await Assert.That(actual).IsEquivalentTo(expected).Because($"iter {iter}: every item ends Activated=true and must appear in the filter (missing: {string.Join(",", expected.Except(actual))})"); + await Assert.That(results.Error).IsNull(); } } - [Fact(Skip = "AutoRefresh has a separate concurrency bug; tracked separately")] + [Test] public async Task AutoRefreshThenFilter_DualSubscribers_AllItemsObserved() { // Two independent cache subscribers running on the ThreadPool: @@ -369,8 +362,8 @@ public async Task AutoRefreshThenFilter_DualSubscribers_AllItemsObserved() WaitForCondition(() => results.Data.Keys.ToHashSet().SetEquals(expected)); var actual = results.Data.Keys.ToHashSet(); - actual.Should().BeEquivalentTo(expected, $"iter {iter}: every item was flipped to Activated=true by the mutator and must appear in the filter (missing: {string.Join(",", expected.Except(actual))})"); - results.Error.Should().BeNull($"iter {iter}: pipeline must not error"); + await Assert.That(actual).IsEquivalentTo(expected).Because($"iter {iter}: every item was flipped to Activated=true by the mutator and must appear in the filter (missing: {string.Join(",", expected.Except(actual))})"); + await Assert.That(results.Error).IsNull(); } } diff --git a/src/DynamicData.Tests/Cache/AndFixture.cs b/src/DynamicData.Tests/Cache/AndFixture.cs index 0f0ec2ad0..2e4461ea0 100644 --- a/src/DynamicData.Tests/Cache/AndFixture.cs +++ b/src/DynamicData.Tests/Cache/AndFixture.cs @@ -1,20 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; +[InheritsTests] public class AndFixture : AndFixtureBase { - protected override IObservable> CreateObservable() => _source1.Connect().And(_source2.Connect()); + protected override IObservable> CreateObservable() + { +#if REACTIVE_TESTS + return DynamicData.Reactive.ObservableCacheEx.And(_source1.Connect(), _source2.Connect()); +#else + return DynamicData.ObservableCacheEx.And(_source1.Connect(), _source2.Connect()); +#endif + } } +[InheritsTests] public class AndCollectionFixture : AndFixtureBase { protected override IObservable> CreateObservable() @@ -47,42 +48,42 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemovingFromOneRemovesFromResult() + [Test] + public async Task RemovingFromOneRemovesFromResult() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void StartingWithNonEmptySourceProducesNoResult() + [Test] + public async Task StartingWithNonEmptySourceProducesNoResult() { var person = new Person("Adult", 50); _source1.AddOrUpdate(person); using var result = CreateObservable().AsAggregator(); - _results.Messages.Count.Should().Be(0, "Should have no updates"); - result.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no updates"); + await Assert.That(result.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void UpdatingBothProducesResults() + [Test] + public async Task UpdatingBothProducesResults() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should have no updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void UpdatingOneProducesOnlyOneUpdate() + [Test] + public async Task UpdatingOneProducesOnlyOneUpdate() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); @@ -90,19 +91,19 @@ public void UpdatingOneProducesOnlyOneUpdate() var personUpdated = new Person("Adult1", 51); _source2.AddOrUpdate(personUpdated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(personUpdated).Because("Should be updated person"); } - [Fact] - public void UpdatingOneSourceOnlyProducesNoResults() + [Test] + public async Task UpdatingOneSourceOnlyProducesNoResults() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(0, "Should have no updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.IntegrationTests.cs b/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.IntegrationTests.cs index 3fe7de711..8e78cf8f3 100644 --- a/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.IntegrationTests.cs @@ -1,16 +1,8 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; @@ -19,31 +11,35 @@ public static partial class AsyncDisposeManyFixture public class IntegrationTests : IntegrationTestFixtureBase { - [Theory(Timeout = 5_000)] - [InlineData(ItemType.Disposable)] - [InlineData(ItemType.AsyncDisposable)] - [InlineData(ItemType.ImmediateAsyncDisposable)] - public async Task ItemDisposalErrors_ErrorPropagatesToDisposalsCompleted(ItemType itemType) + [Test, Timeout(5_000)] + [Arguments(ItemType.Disposable)] + [Arguments(ItemType.AsyncDisposable)] + [Arguments(ItemType.ImmediateAsyncDisposable)] + public async Task ItemDisposalErrors_ErrorPropagatesToDisposalsCompleted(ItemType itemType, CancellationToken cancellationToken) { using var source = new SourceCache(static item => item.Id); - using var sourceCompletionSource = new Subject(); + using var sourceCompletionSource = new ReactiveUI.Primitives.Signals.Signal(); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; using var subscription = source .Connect() .TakeUntil(sourceCompletionSource) - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); source.AddOrUpdate(new[] { @@ -52,15 +48,14 @@ public async Task ItemDisposalErrors_ErrorPropagatesToDisposalsCompleted(ItemTyp ItemBase.Create(type: itemType, id: 3, version: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added"); - results.HasCompleted.Should().BeFalse(); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("no disposals should have occurred"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("no disposals should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("no disposals should have occurred"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("no disposals should have occurred"); var error = new Exception("Test"); source.Items.ElementAt(1).FailDisposal(error); @@ -68,42 +63,46 @@ public async Task ItemDisposalErrors_ErrorPropagatesToDisposalsCompleted(ItemTyp sourceCompletionSource.OnNext(Unit.Default); // RX and TPL don't guarantee Task continuations run synchronously with antecedent completion - await disposalsCompletedResults.WhenFinalized; + await disposalsCompletedResults.WhenFinalized.WaitAsync(cancellationToken); - results.Error.Should().BeNull("disposal errors should be propagated on disposalsCompleted"); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items were changed"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.Error).IsNull().Because("disposal errors should be propagated on disposalsCompleted"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items were changed"); + await Assert.That(results.HasCompleted).IsTrue(); - disposalsCompletedResults.Error.Should().Be(error, "disposal errors should be caught and propagated on disposalsCompleted"); + await Assert.That(disposalsCompletedResults.Error).IsEqualTo(error).Because("disposal errors should be caught and propagated on disposalsCompleted"); } - [Theory(Timeout = 5_000)] - [InlineData(ItemType.Plain)] - [InlineData(ItemType.Disposable)] - [InlineData(ItemType.AsyncDisposable)] - [InlineData(ItemType.ImmediateAsyncDisposable)] - public async Task ItemDisposalsComplete_DisposalsCompletedOccursAndCompletes(ItemType itemType) + [Test, Timeout(5_000)] + [Arguments(ItemType.Plain)] + [Arguments(ItemType.Disposable)] + [Arguments(ItemType.AsyncDisposable)] + [Arguments(ItemType.ImmediateAsyncDisposable)] + public async Task ItemDisposalsComplete_DisposalsCompletedOccursAndCompletes(ItemType itemType, CancellationToken cancellationToken) { using var source = new SourceCache(static item => item.Id); - using var sourceCompletionSource = new Subject(); + using var sourceCompletionSource = new ReactiveUI.Primitives.Signals.Signal(); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; using var subscription = source .Connect() .TakeUntil(sourceCompletionSource) - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); source.AddOrUpdate(new[] { @@ -112,75 +111,78 @@ public async Task ItemDisposalsComplete_DisposalsCompletedOccursAndCompletes(Ite ItemBase.Create(type: itemType, id: 3, version: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added"); - results.HasCompleted.Should().BeFalse(); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); sourceCompletionSource.OnNext(Unit.Default); foreach (var item in source.Items) item.CompleteDisposal(); // RX and TPL don't guarantee Task continuations run synchronously with antecedent completion - await disposalsCompletedResults.WhenFinalized; + await disposalsCompletedResults.WhenFinalized.WaitAsync(cancellationToken); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items were changed"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items were changed"); + await Assert.That(results.HasCompleted).IsTrue(); - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Count.Should().Be(1, "the source and all disposals have completed"); - disposalsCompletedResults.HasCompleted.Should().BeTrue("the source and all disposals have completed"); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues.Count).IsEqualTo(1).Because("the source and all disposals have completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsTrue().Because("the source and all disposals have completed"); } - [Fact(Timeout = 30_000)] - public async Task ItemDisposalsOccurOnMultipleThreads_DisposalIsThreadSafe() + [Test, Timeout(30_000)] + public async Task ItemDisposalsOccurOnMultipleThreads_DisposalIsThreadSafe(CancellationToken cancellationToken) { using var source = new SourceCache(static item => item.Id); - using var sourceCompletionSource = new Subject(); + using var sourceCompletionSource = new ReactiveUI.Primitives.Signals.Signal(); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; using var subscription = source .Connect() .TakeUntil(sourceCompletionSource) - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); var items = Enumerable.Range(1, 100_000) .Select(id => new AsyncDisposableItem() { - Id = id, + Id = id, Version = 1 }) .ToArray(); source.AddOrUpdate(items); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "items were added"); - results.HasCompleted.Should().BeFalse(); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Count).IsEqualTo(source.Count); + await Assert.That(source.Items.All(item => results.RecordedItemsByKey.TryGetValue(item.Id, out var actual) && ReferenceEquals(actual, item))).IsTrue().Because("each added item should retain its identity"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); sourceCompletionSource.OnNext(); await Task.WhenAll(items @@ -188,22 +190,26 @@ await Task.WhenAll(items .Select(group => Task.Run(() => { foreach (var item in group) + { + cancellationToken.ThrowIfCancellationRequested(); item.CompleteDisposal(); - }))); + } + }, cancellationToken))); // RX and TPL don't guarantee Task continuations run synchronously with antecedent completion - await disposalsCompletedResults.WhenFinalized; + await disposalsCompletedResults.WhenFinalized.WaitAsync(cancellationToken); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "no items were removed"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Count).IsEqualTo(items.Length); + await Assert.That(items.All(item => results.RecordedItemsByKey.TryGetValue(item.Id, out var actual) && ReferenceEquals(actual, item))).IsTrue().Because("no items were removed or replaced"); + await Assert.That(results.HasCompleted).IsTrue(); - items.Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeTrue(), "disposable items should be disposed upon source completion"); + foreach (var item in items) { await Assert.That(item.HasBeenDisposed).IsTrue().Because("disposable items should be disposed upon source completion"); } - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Count.Should().Be(1, "the source and all disposals have completed"); - disposalsCompletedResults.HasCompleted.Should().BeTrue("the source and all disposals have completed"); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues.Count).IsEqualTo(1).Because("the source and all disposals have completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsTrue().Because("the source and all disposals have completed"); } } } diff --git a/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.UnitTests.cs b/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.UnitTests.cs index c6eea36b0..f92c23ae2 100644 --- a/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.UnitTests.cs @@ -1,17 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; -using DynamicData.Kernel; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; @@ -19,30 +10,35 @@ public static partial class AsyncDisposeManyFixture { public class UnitTests { - [Theory] - [InlineData(ItemType.Plain)] - [InlineData(ItemType.Disposable)] - [InlineData(ItemType.AsyncDisposable)] - [InlineData(ItemType.ImmediateAsyncDisposable)] - public void ItemsAreAddedMovedOrRefreshed_ItemsAreNotDisposed(ItemType itemType) + [Test] + [Arguments(ItemType.Plain)] + [Arguments(ItemType.Disposable)] + [Arguments(ItemType.AsyncDisposable)] + [Arguments(ItemType.ImmediateAsyncDisposable)] + public async Task ItemsAreAddedMovedOrRefreshed_ItemsAreNotDisposed(ItemType itemType) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; + using var subscription = source - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); - // Addition var items = new List() { @@ -53,103 +49,105 @@ public void ItemsAreAddedMovedOrRefreshed_ItemsAreNotDisposed(ItemType itemType) source.OnNext(new ChangeSet(items .Select((item, index) => new Change( - reason: ChangeReason.Add, - key: item.Id, - current: item, - index: index)))); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - items, - options => options.WithStrictOrdering(), - "3 items were added"); - results.HasCompleted.Should().BeFalse(); + reason: ChangeReason.Add, + key: item.Id, + current: item, + index: index)))); - items.Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeFalse(), "items should not be disposed upon add"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + foreach (var item in items) { await Assert.That(item.HasBeenDisposed).IsFalse().Because("items should not be disposed upon add"); } + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); // Movement items.Move(2, 0, items[2]); items.Move(2, 1, items[2]); source.OnNext(new ChangeSet() { - new(reason: ChangeReason.Moved, key: items[0].Id, current: items[0], previous: Optional.None(), currentIndex: 0, previousIndex: 2), - new(reason: ChangeReason.Moved, key: items[1].Id, current: items[1], previous: Optional.None(), currentIndex: 1, previousIndex: 2) + new(reason: ChangeReason.Moved, key: items[0].Id, current: items[0], previous: ReactiveUI.Primitives.Optional.None, currentIndex: 0, previousIndex: 2), + new(reason: ChangeReason.Moved, key: items[1].Id, current: items[1], previous: ReactiveUI.Primitives.Optional.None, currentIndex: 1, previousIndex: 2) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - items, - options => options.WithStrictOrdering(), - "3 items were added"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); - items.Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeFalse(), "items should not be disposed upon movement"); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + foreach (var item in items) { await Assert.That(item.HasBeenDisposed).IsFalse().Because("items should not be disposed upon movement"); } + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); // Refreshing source.OnNext(new ChangeSet(items .Select((item, index) => new Change( - reason: ChangeReason.Refresh, - key: item.Id, - current: item, - index: index)))); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - items, - options => options.WithStrictOrdering(), - "3 items were added"); - results.HasCompleted.Should().BeFalse(); - - items.Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeFalse(), "items should not be disposed upon refresh"); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + reason: ChangeReason.Refresh, + key: item.Id, + current: item, + index: index)))); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); + + foreach (var item in items) { await Assert.That(item.HasBeenDisposed).IsFalse().Because("items should not be disposed upon refresh"); } + + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(ItemType.Plain)] - [InlineData(ItemType.Disposable)] - [InlineData(ItemType.AsyncDisposable)] - [InlineData(ItemType.ImmediateAsyncDisposable)] - public void ItemsAreRemoved_ItemsAreDisposedAfterDownstreamProcessing(ItemType itemType) + [Test] + [Arguments(ItemType.Plain)] + [Arguments(ItemType.Disposable)] + [Arguments(ItemType.AsyncDisposable)] + [Arguments(ItemType.ImmediateAsyncDisposable)] + public async Task ItemsAreRemoved_ItemsAreDisposedAfterDownstreamProcessing(ItemType itemType) { + var itemsDisposedBeforeDownstreamProcessing = new List(); using var source = new SourceCache(static item => item.Id); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; using var subscription = source .Connect() - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } + disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .Do(changes => { foreach (var change in changes) + { if (change.Reason is ChangeReason.Remove) - change.Current.HasBeenDisposed.Should().BeFalse("disposal should only occur after downstream processing has completed"); + { + if (change.Current.HasBeenDisposed) + { + itemsDisposedBeforeDownstreamProcessing.Add(change.Current); + } + } + } }) .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); source.AddOrUpdate(new[] { @@ -158,61 +156,74 @@ public void ItemsAreRemoved_ItemsAreDisposedAfterDownstreamProcessing(ItemType i ItemBase.Create(type: itemType, id: 3, version: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added"); - results.HasCompleted.Should().BeFalse(); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); var items = source.Items.ToArray(); source.Clear(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEmpty("all items were removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsNull(); + await Assert.That(itemsDisposedBeforeDownstreamProcessing).IsEmpty().Because("disposal should only occur after downstream processing has completed"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("all items were removed"); + await Assert.That(results.HasCompleted).IsFalse(); - items.Where(static item => item.CanBeDisposed).Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeTrue(), "disposable items should be disposed after removal"); + foreach (var item in items.Where(static item => item.CanBeDisposed)) { await Assert.That(item.HasBeenDisposed).IsTrue().Because("disposable items should be disposed after removal"); } - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(ItemType.Plain)] - [InlineData(ItemType.Disposable)] - [InlineData(ItemType.AsyncDisposable)] - [InlineData(ItemType.ImmediateAsyncDisposable)] - public void ItemsAreUpdated_PreviousItemsAreDisposedAfterDownstreamProcessing(ItemType itemType) + [Test] + [Arguments(ItemType.Plain)] + [Arguments(ItemType.Disposable)] + [Arguments(ItemType.AsyncDisposable)] + [Arguments(ItemType.ImmediateAsyncDisposable)] + public async Task ItemsAreUpdated_PreviousItemsAreDisposedAfterDownstreamProcessing(ItemType itemType) { using var source = new SourceCache(static item => item.Id); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; + var itemsDisposedBeforeDownstreamProcessing = new List(); using var subscription = source .Connect() - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } + disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .Do(changes => { foreach (var change in changes) + { if (change.Reason is ChangeReason.Remove) - change.Current.HasBeenDisposed.Should().BeFalse("disposal should only occur after downstream processing has completed"); + { + if (change.Current.HasBeenDisposed) + { + itemsDisposedBeforeDownstreamProcessing.Add(change.Current); + } + } + } }) .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); source.AddOrUpdate(new[] { @@ -221,15 +232,14 @@ public void ItemsAreUpdated_PreviousItemsAreDisposedAfterDownstreamProcessing(It ItemBase.Create(type: itemType, id: 3, version: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added"); - results.HasCompleted.Should().BeFalse(); - - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); var previousItems = source.Items.ToArray(); source.AddOrUpdate(new[] @@ -239,30 +249,29 @@ public void ItemsAreUpdated_PreviousItemsAreDisposedAfterDownstreamProcessing(It ItemBase.Create(type: itemType, id: 3, version: 2) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "all items were replaced"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsNull(); + await Assert.That(itemsDisposedBeforeDownstreamProcessing).IsEmpty().Because("disposal should only occur after downstream processing has completed"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("all items were replaced"); + await Assert.That(results.HasCompleted).IsFalse(); - previousItems.Where(static item => item.CanBeDisposed).Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeTrue(), "disposable items should be disposed after replacement"); + foreach (var item in previousItems.Where(static item => item.CanBeDisposed)) { await Assert.That(item.HasBeenDisposed).IsTrue().Because("disposable items should be disposed after replacement"); } - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Should().BeEmpty("the source has not completed"); - disposalsCompletedResults.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues).IsEmpty().Because("the source has not completed"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void OnDisposalsCompletedIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.AsyncDisposeMany( - source: Observable.Empty>(), - disposalsCompletedAccessor: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(SourceType.Subject)] - [InlineData(SourceType.Immediate)] - public void SourceCompletes_ItemsAreDisposedAndCompletionPropagates(SourceType sourceType) + [Test] + public async Task OnDisposalsCompletedIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.AsyncDisposeMany( + source: Observable.Empty>(), + disposalsCompletedAccessor: null!)).Throws(); + + [Test] + [Arguments(SourceType.Subject)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletes_ItemsAreDisposedAndCompletionPropagates(SourceType sourceType) { var items = new[] { @@ -276,46 +285,49 @@ public void SourceCompletes_ItemsAreDisposedAndCompletionPropagates(SourceType s IObservable> source = (sourceType is SourceType.Immediate) ? Observable.Return(changeSet) - : new Subject>(); - + : new ReactiveUI.Primitives.Signals.Signal>(); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; using var subscription = source - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) { subject.OnNext(changeSet); subject.OnCompleted(); } - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "3 items were added"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("3 items were added"); + await Assert.That(results.HasCompleted).IsTrue(); - items.Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeTrue(), "disposable items should be disposed upon source completion"); + foreach (var item in items) { await Assert.That(item.HasBeenDisposed).IsTrue().Because("disposable items should be disposed upon source completion"); } - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Count.Should().Be(1, "all items have completed disposal"); - disposalsCompletedResults.HasCompleted.Should().BeTrue("all items have completed disposal"); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues.Count).IsEqualTo(1).Because("all items have completed disposal"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsTrue().Because("all items have completed disposal"); } - [Theory] - [InlineData(SourceType.Subject)] - [InlineData(SourceType.Immediate)] - public void SourceErrors_ItemsAreDisposedAndErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Subject)] + [Arguments(SourceType.Immediate)] + public async Task SourceErrors_ItemsAreDisposedAndErrorPropagates(SourceType sourceType) { var items = new[] { @@ -332,47 +344,48 @@ public void SourceErrors_ItemsAreDisposedAndErrorPropagates(SourceType sourceTyp IObservable> source = (sourceType is SourceType.Immediate) ? Observable.Return(changeSet) .Concat(Observable.Throw>(error)) - : new Subject>(); - + : new ReactiveUI.Primitives.Signals.Signal>(); ValueRecordingObserver? disposalsCompletedResults = null; + var disposalsCompletedAccessorInvokedMoreThanOnce = false; using var subscription = source - .AsyncDisposeMany(disposalsCompleted => + .AsyncDisposeMany(disposalsCompleted => { - disposalsCompletedResults.Should().BeNull("disposalsCompletedAccessor should only be invoked once per subscription"); + if (disposalsCompletedResults is not null) + { + disposalsCompletedAccessorInvokedMoreThanOnce = true; + } disposalsCompleted.RecordValues(out disposalsCompletedResults); }) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results); - disposalsCompletedResults.Should().NotBeNull("disposalsCompletedAccessor should have been invoked"); - + await Assert.That(disposalsCompletedResults).IsNotNull().Because("disposalsCompletedAccessor should have been invoked"); + await Assert.That(disposalsCompletedAccessorInvokedMoreThanOnce).IsFalse().Because("disposalsCompletedAccessor should only be invoked once per subscription"); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) { subject.OnNext(changeSet); subject.OnError(error); } - results.Error.Should().Be(error); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "3 items were added"); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("3 items were added"); - items.Should().AllSatisfy(item => item.HasBeenDisposed.Should().BeTrue(), "disposable items should be disposed upon source failure"); + foreach (var item in items) { await Assert.That(item.HasBeenDisposed).IsTrue().Because("disposable items should be disposed upon source failure"); } - disposalsCompletedResults.Error.Should().BeNull(); - disposalsCompletedResults.RecordedValues.Count.Should().Be(1, "all items have completed disposal"); - disposalsCompletedResults.HasCompleted.Should().BeTrue("all items have completed disposal"); + await Assert.That(disposalsCompletedResults.Error).IsNull(); + await Assert.That(disposalsCompletedResults.RecordedValues.Count).IsEqualTo(1).Because("all items have completed disposal"); + await Assert.That(disposalsCompletedResults.HasCompleted).IsTrue().Because("all items have completed disposal"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.AsyncDisposeMany( - source: null!, - disposalsCompletedAccessor: static _ => { })) - .Should() - .Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.AsyncDisposeMany( + source: null!, + disposalsCompletedAccessor: static _ => { })).Throws(); } } diff --git a/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.cs b/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.cs index 38da53d5d..f0ed5fab5 100644 --- a/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.cs +++ b/src/DynamicData.Tests/Cache/AsyncDisposeManyFixture.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading.Tasks; - namespace DynamicData.Tests.Cache; public static partial class AsyncDisposeManyFixture @@ -22,32 +19,32 @@ public enum ItemType public abstract record ItemBase { public static ItemBase Create( - ItemType type, - int id, - int version) + ItemType type, + int id, + int version) => type switch { - ItemType.Plain => new PlainItem() + ItemType.Plain => new PlainItem() { - Id = id, + Id = id, Version = version }, - ItemType.Disposable => new DisposableItem() + ItemType.Disposable => new DisposableItem() { - Id = id, + Id = id, Version = version }, - ItemType.AsyncDisposable => new AsyncDisposableItem() + ItemType.AsyncDisposable => new AsyncDisposableItem() { - Id = id, + Id = id, Version = version }, - ItemType.ImmediateAsyncDisposable => new ImmediateAsyncDisposableItem() + ItemType.ImmediateAsyncDisposable => new ImmediateAsyncDisposableItem() { - Id = id, + Id = id, Version = version }, - _ => throw new ArgumentException($"{type} is not a valid {nameof(ItemType)} value", nameof(type)) + _ => throw new ArgumentException($"{type} is not a valid {nameof(ItemType)} value", nameof(type)) }; public required int Id { get; init; } @@ -94,15 +91,15 @@ public override void FailDisposal(Exception error) public void Dispose() { if (_disposeError is not null) - #pragma warning disable CA1065 // Do not raise exceptions in unexpected locations +#pragma warning disable CA1065 // Do not raise exceptions in unexpected locations throw _disposeError; - #pragma warning restore CA1065 // Do not raise exceptions in unexpected locations +#pragma warning restore CA1065 // Do not raise exceptions in unexpected locations _hasBeenDisposed = true; } - private Exception? _disposeError; - private bool _hasBeenDisposed; + private Exception? _disposeError; + private bool _hasBeenDisposed; } public sealed record AsyncDisposableItem @@ -129,7 +126,7 @@ public ValueTask DisposeAsync() private readonly TaskCompletionSource _disposeCompletionSource = new(); - + private bool _hasBeenDisposed; } @@ -156,7 +153,7 @@ public ValueTask DisposeAsync() : ValueTask.CompletedTask; } - private Exception? _disposeError; - private bool _hasBeenDisposed; + private Exception? _disposeError; + private bool _hasBeenDisposed; } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshConcurrencyRegressionFixture.cs b/src/DynamicData.Tests/Cache/AutoRefreshConcurrencyRegressionFixture.cs new file mode 100644 index 000000000..016a2dad0 --- /dev/null +++ b/src/DynamicData.Tests/Cache/AutoRefreshConcurrencyRegressionFixture.cs @@ -0,0 +1,87 @@ +namespace DynamicData.Tests.Cache; + +public class AutoRefreshConcurrencyRegressionFixture +{ + [Test] + public async Task DisposedChildNotificationAfterRemoveIsIgnored() + { + using var source = new TestSourceCache(static item => item.Id); + + var item = new Item(1, "Initial"); + var refreshes = new ManualRefreshObservable(); + + source.AddOrUpdate(item); + + using var subscription = source.Connect() + .AutoRefreshOnObservable((_, _) => refreshes) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + source.Remove(item); + + refreshes.OnNext(Unit.Default); + + await Assert.That(refreshes.DisposeCount).IsEqualTo(1); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2); + await Assert.That(results.RecordedChangeSets[1].Removes).IsEqualTo(1); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty(); + } + + [Test] + public async Task DisposedChildNotificationAfterReplaceIsIgnoredForSameKey() + { + using var source = new TestSourceCache(static item => item.Id); + + var oldItem = new Item(1, "Old"); + var newItem = new Item(1, "New"); + var oldRefreshes = new ManualRefreshObservable(); + var newRefreshes = new ManualRefreshObservable(); + + source.AddOrUpdate(oldItem); + + using var subscription = source.Connect() + .AutoRefreshOnObservable((item, _) => ReferenceEquals(item, oldItem) ? oldRefreshes : newRefreshes) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + source.AddOrUpdate(newItem); + oldRefreshes.OnNext(Unit.Default); + newRefreshes.OnNext(Unit.Default); + + await Assert.That(oldRefreshes.DisposeCount).IsEqualTo(1); + await Assert.That(newRefreshes.DisposeCount).IsEqualTo(0); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(3); + await Assert.That(results.RecordedChangeSets[1].Updates).IsEqualTo(1); + await Assert.That(results.RecordedChangeSets[2].Refreshes).IsEqualTo(1); + await Assert.That(results.RecordedChangeSets[2].Single().Current).IsSameReferenceAs(newItem); + } + + private sealed record Item(int Id, string Name); + + private sealed class ManualRefreshObservable : IObservable + { + private IObserver? _observer; + private int _disposeCount; + + public int DisposeCount => Volatile.Read(ref _disposeCount); + + public IDisposable Subscribe(IObserver observer) + { + _observer = observer; + return new Subscription(this); + } + + public void OnNext(T value) + => _observer?.OnNext(value); + + private sealed class Subscription(ManualRefreshObservable owner) : IDisposable + { + public void Dispose() + => Interlocked.Increment(ref owner._disposeCount); + } + } +} diff --git a/src/DynamicData.Tests/Cache/AutoRefreshFixture.Base.cs b/src/DynamicData.Tests/Cache/AutoRefreshFixture.Base.cs index ebdc26950..9d4204025 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshFixture.Base.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshFixture.Base.cs @@ -1,24 +1,11 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using Microsoft.Reactive.Testing; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshFixture { public abstract class Base { - [Fact] - public void ChangeSetBufferIsGiven_PropertyChangedNotificationsAreBufferedOnScheduler() + [Test] + public async Task ChangeSetBufferIsGiven_PropertyChangedNotificationsAreBufferedOnScheduler() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -26,106 +13,97 @@ public void ChangeSetBufferIsGiven_PropertyChangedNotificationsAreBufferedOnSche var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - changeSetBuffer: TimeSpan.FromSeconds(10), - scheduler: scheduler) + source: source.Connect(), + changeSetBuffer: TimeSpan.FromSeconds(10), + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish property change notification) ++item2.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the property change notification should have been buffered"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the property change notification should have been buffered"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time, within buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(5).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the buffer window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the buffer window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + // UUT Action (advance time, to buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(10).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "a buffer window expired"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 published a property change notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("a buffer window expired"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 published a property change notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish property change notification) ++item1.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the property change notification should have been buffered"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the property change notification should have been buffered"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time, within buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(15).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the buffer window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the buffer window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish additional property change notification) ++item3.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the property change notification should have been buffered"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the property change notification should have been buffered"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time, to buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(20).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "a buffer window expired"); - results.RecordedChangeSets.Skip(2).First().Count.Should().Be(2, "2 items published a property change notification"); - results.RecordedChangeSets.Skip(2).First().Refreshes.Should().Be(2, "2 items published a property change notification"); - results.RecordedChangeSets.Skip(2).First().Select(change => change.Current).Should().BeEquivalentTo(new[] { item1, item3 }, "items #2 and #3 published property change notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("a buffer window expired"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Count).IsEqualTo(2).Because("2 items published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Refreshes).IsEqualTo(2).Because("2 items published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Select(change => change.Current)).IsEquivalentTo(new[] { item1, item3 }).Because("items #2 and #3 published property change notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (normal refresh) source.Refresh(item2); - + // Normal refreshes should not be buffered - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "one source operation was performed"); - results.RecordedChangeSets.Skip(3).First().Count.Should().Be(1, "1 item was refreshed, within the source"); - results.RecordedChangeSets.Skip(3).First().Refreshes.Should().Be(1, "1 item was refreshed, within the source"); - results.RecordedChangeSets.Skip(3).First().First().Current.Should().Be(item2, "item #2 was refreshed, within the source"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(3).First().Count).IsEqualTo(1).Because("1 item was refreshed, within the source"); + await Assert.That(results.RecordedChangeSets.Skip(3).First().Refreshes).IsEqualTo(1).Because("1 item was refreshed, within the source"); + await Assert.That(results.RecordedChangeSets.Skip(3).First().First().Current).IsEqualTo(item2).Because("item #2 was refreshed, within the source"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void ItemIsAdded_SubscribesToPropertyChanged() + + [Test] + public async Task ItemIsAdded_SubscribesToPropertyChanged() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -136,10 +114,9 @@ public void ItemIsAdded_SubscribesToPropertyChanged() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -148,28 +125,28 @@ public void ItemIsAdded_SubscribesToPropertyChanged() source.AddOrUpdate(new[] { item1, item2, item3 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - item1.HasSubscriptions.Should().BeTrue("the PropertyChanged event should be subscribed to, for each added item"); - item2.HasSubscriptions.Should().BeTrue("the PropertyChanged event should be subscribed to, for each added item"); - item3.HasSubscriptions.Should().BeTrue("the PropertyChanged event should be subscribed to, for each added item"); + await Assert.That(item1.HasSubscriptions).IsTrue().Because("the PropertyChanged event should be subscribed to, for each added item"); + await Assert.That(item2.HasSubscriptions).IsTrue().Because("the PropertyChanged event should be subscribed to, for each added item"); + await Assert.That(item3.HasSubscriptions).IsTrue().Because("the PropertyChanged event should be subscribed to, for each added item"); } - - [Fact] - public void ItemIsMoved_NotificationPropagates() + + [Test] + public async Task ItemIsMoved_NotificationPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - - var items = new [] { item1, item2, item3 }; - + + var items = new[] { item1, item2, item3 }; + var initialChangeset = new ChangeSet() { new Change(reason: ChangeReason.Add, key: item1.Id, current: item1, index: 0), @@ -183,15 +160,11 @@ public void ItemIsMoved_NotificationPropagates() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "3 items were added to the source"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - items, - options => options.WithStrictOrdering(), - "item indexes should propagate"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("3 items were added to the source"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(items).Because("item indexes should propagate"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.OnNext(new ChangeSet() @@ -200,22 +173,19 @@ public void ItemIsMoved_NotificationPropagates() key: item3.Id, current: item3, currentIndex: 0, - previousIndex: 2) + previousIndex: 2) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "an item was moved within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - new[] { item3, item1, item2 }, - options => options.WithStrictOrdering(), - "an item was moved within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("an item was moved within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(new[] { item3, item1, item2 }).Because("an item was moved within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void ItemIsRefreshed_NotificationPropagates() + + [Test] + public async Task ItemIsRefreshed_NotificationPropagates() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -223,9 +193,8 @@ public void ItemIsRefreshed_NotificationPropagates() var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut(source.Connect()) @@ -233,25 +202,25 @@ public void ItemIsRefreshed_NotificationPropagates() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Refresh(item2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item was refreshed within the source"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item was refreshed within the source"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 was refreshed within the source"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items were changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item was refreshed within the source"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item was refreshed within the source"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 was refreshed within the source"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items were changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void ItemIsRemoved_UnsubscribesFromPropertyChanged() + [Test] + public async Task ItemIsRemoved_UnsubscribesFromPropertyChanged() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -259,9 +228,8 @@ public void ItemIsRemoved_UnsubscribesFromPropertyChanged() var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut(source.Connect()) @@ -269,27 +237,26 @@ public void ItemIsRemoved_UnsubscribesFromPropertyChanged() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Remove(item2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "1 item was removed from the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - item2.HasSubscriptions.Should().BeFalse("removing an item should trigger unsubscription from its reevaluator"); - item1.HasSubscriptions.Should().BeTrue("the item was not removed from the source"); - item3.HasSubscriptions.Should().BeTrue("the item was not removed from the source"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("1 item was removed from the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + await Assert.That(item2.HasSubscriptions).IsFalse().Because("removing an item should trigger unsubscription from its reevaluator"); + await Assert.That(item1.HasSubscriptions).IsTrue().Because("the item was not removed from the source"); + await Assert.That(item3.HasSubscriptions).IsTrue().Because("the item was not removed from the source"); } - [Fact] - public void ItemIsUpdated_ReSubscribesToPropertyChanged() + [Test] + public async Task ItemIsUpdated_ReSubscribesToPropertyChanged() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -297,9 +264,8 @@ public void ItemIsUpdated_ReSubscribesToPropertyChanged() var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut(source.Connect()) @@ -307,29 +273,28 @@ public void ItemIsUpdated_ReSubscribesToPropertyChanged() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item4 = new Item() { Id = 2 }; source.AddOrUpdate(item4); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "1 item was replaced within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - item2.HasSubscriptions.Should().BeFalse("replacing an item should trigger unsubscription from its reevaluator"); - item4.HasSubscriptions.Should().BeTrue("adding an item should invoke its reevaluator and subscribe to it"); - item1.HasSubscriptions.Should().BeTrue("the item was not removed from the source"); - item3.HasSubscriptions.Should().BeTrue("the item was not removed from the source"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("1 item was replaced within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + await Assert.That(item2.HasSubscriptions).IsFalse().Because("replacing an item should trigger unsubscription from its reevaluator"); + await Assert.That(item4.HasSubscriptions).IsTrue().Because("adding an item should invoke its reevaluator and subscribe to it"); + await Assert.That(item1.HasSubscriptions).IsTrue().Because("the item was not removed from the source"); + await Assert.That(item3.HasSubscriptions).IsTrue().Because("the item was not removed from the source"); } - - [Fact] - public void PropertyChangedOccurs_ItemRefreshes() + + [Test] + public async Task PropertyChangedOccurs_ItemRefreshes() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -337,9 +302,8 @@ public void PropertyChangedOccurs_ItemRefreshes() var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut(source.Connect()) @@ -347,26 +311,25 @@ public void PropertyChangedOccurs_ItemRefreshes() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action ++item2.Value; - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 published a property change notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 published a property change notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void PropertyChangeThrottleIsGiven_PropertyChangedNotificationsAreThrottledByScheduler() + [Test] + public async Task PropertyChangeThrottleIsGiven_PropertyChangedNotificationsAreThrottledByScheduler() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -374,102 +337,93 @@ public void PropertyChangeThrottleIsGiven_PropertyChangedNotificationsAreThrottl var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), + source: source.Connect(), propertyChangeThrottle: TimeSpan.FromSeconds(10), - scheduler: scheduler) + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish property change notification) ++item2.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the throttle window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the throttle window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish additional property change notification, immediately) ++item2.Value; - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the throttle window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the throttle window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time to end of throttle window) scheduler.AdvanceTo(TimeSpan.FromSeconds(10).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "the throttle window ended"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item published property change notifications"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item published property change notifications"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 published property change notifications"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("the throttle window ended"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item published property change notifications"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item published property change notifications"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 published property change notifications"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish property change notification) ++item2.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the throttle window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the throttle window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish additional property change notification, within throttle window) scheduler.AdvanceTo(TimeSpan.FromSeconds(15).Ticks); ++item2.Value; scheduler.AdvanceBy(1); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the throttle window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the throttle window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time to end of original throttle window) scheduler.AdvanceTo(TimeSpan.FromSeconds(20).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the throttle window should have been extended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the throttle window should have been extended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time to end of throttle window) scheduler.AdvanceTo(TimeSpan.FromSeconds(25).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "the throttle window ended"); - results.RecordedChangeSets.Skip(2).First().Count.Should().Be(1, "1 item published property change notifications"); - results.RecordedChangeSets.Skip(2).First().Refreshes.Should().Be(1, "1 item published property change notifications"); - results.RecordedChangeSets.Skip(2).First().First().Current.Should().Be(item2, "item #2 published property change notifications"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("the throttle window ended"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Count).IsEqualTo(1).Because("1 item published property change notifications"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Refreshes).IsEqualTo(1).Because("1 item published property change notifications"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().First().Current).IsEqualTo(item2).Because("item #2 published property change notifications"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void SourceCompletesWhenEmpty_CompletionPropagates(NotificationStrategy notificationStrategy) + + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task SourceCompletesWhenEmpty_CompletionPropagates(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); - // UUT Initialization & Action if (notificationStrategy is NotificationStrategy.Immediate) source.Complete(); @@ -482,25 +436,24 @@ public void SourceCompletesWhenEmpty_CompletionPropagates(NotificationStrategy n if (notificationStrategy is NotificationStrategy.Asynchronous) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all notification sources have completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all notification sources have completed"); } - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void SourceCompletesWhenNotEmpty_CompletionDoesNotPropagate(NotificationStrategy notificationStrategy) + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task SourceCompletesWhenNotEmpty_CompletionDoesNotPropagate(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization & Action (source completion) if (notificationStrategy is NotificationStrategy.Immediate) @@ -514,28 +467,27 @@ public void SourceCompletesWhenNotEmpty_CompletionDoesNotPropagate(NotificationS if (notificationStrategy is NotificationStrategy.Asynchronous) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("PropertyChanged events can still publish notifications"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("PropertyChanged events can still publish notifications"); } - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void SourceFails_ErrorPropagates(NotificationStrategy notificationStrategy) + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task SourceFails_ErrorPropagates(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - + var error = new Exception("Test"); - // UUT Initialization & Action if (notificationStrategy is NotificationStrategy.Immediate) @@ -549,39 +501,36 @@ public void SourceFails_ErrorPropagates(NotificationStrategy notificationStrateg if (notificationStrategy is NotificationStrategy.Asynchronous) source.SetError(error); - results.Error.Should().Be(error, "upstream errors should propagate downstream"); + await Assert.That(results.Error).IsEqualTo(error).Because("upstream errors should propagate downstream"); if (notificationStrategy is NotificationStrategy.Immediate) - results.RecordedChangeSets.Should().BeEmpty("an error occurred before the initial changeset"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred before the initial changeset"); else { - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); } } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => BuildUut(source: null!)) - .Should() - .Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => BuildUut(source: null!)).Throws(); - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + var initialChangeset = new ChangeSet() { new Change(reason: ChangeReason.Add, key: item1.Id, current: item1), new Change(reason: ChangeReason.Add, key: item2.Id, current: item2), new Change(reason: ChangeReason.Add, key: item3.Id, current: item3) }; - // UUT Initialization using var subscription = BuildUut(source.Prepend(initialChangeset)) @@ -589,29 +538,28 @@ public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action subscription.Dispose(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - source.HasObservers.Should().BeFalse("subscription disposal should propagate"); - item1.HasSubscriptions.Should().BeFalse("subscription disposal should propagate"); - item2.HasSubscriptions.Should().BeFalse("subscription disposal should propagate"); - item3.HasSubscriptions.Should().BeFalse("subscription disposal should propagate"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate"); + await Assert.That(item1.HasSubscriptions).IsFalse().Because("subscription disposal should propagate"); + await Assert.That(item2.HasSubscriptions).IsFalse().Because("subscription disposal should propagate"); + await Assert.That(item3.HasSubscriptions).IsFalse().Because("subscription disposal should propagate"); } protected abstract IObservable> BuildUut( - IObservable> source, - TimeSpan? changeSetBuffer = null, - TimeSpan? propertyChangeThrottle = null, - IScheduler? scheduler = null); + IObservable> source, + TimeSpan? changeSetBuffer = null, + TimeSpan? propertyChangeThrottle = null, + IScheduler? scheduler = null); } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithPropertyAccessor.cs b/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithPropertyAccessor.cs index c948aedb8..6b355fb23 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithPropertyAccessor.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithPropertyAccessor.cs @@ -1,31 +1,21 @@ -using System; -using System.Linq; using System.Linq.Expressions; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; public static partial class AutoRefreshFixture { + [InheritsTests] public class WithPropertyAccessor : Base { - [Fact(Skip = "Existing defect: propertyAccessor is not null checked, throws NRE on first notification, instead")] - public void PropertyAccessorIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.AutoRefresh( - source: Observable.Never>(), - propertyAccessor: (null as Expression>)!)) - .Should() - .Throw(); - - [Fact] - public void PropertyChangedNotificationDoesNotMatchPropertyAccessor_IgnoresNotification() + [Test] + public async Task PropertyAccessorIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.AutoRefresh( + source: Observable.Never>(), + propertyAccessor: (null as Expression>)!)).Throws(); + + [Test] + public async Task PropertyChangedNotificationDoesNotMatchPropertyAccessor_IgnoresNotification() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -33,9 +23,8 @@ public void PropertyChangedNotificationDoesNotMatchPropertyAccessor_IgnoresNotif var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut(source.Connect()) @@ -43,29 +32,28 @@ public void PropertyChangedNotificationDoesNotMatchPropertyAccessor_IgnoresNotif .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action ++item2.OtherValue; - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the property change notification should have been ignored"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the property change notification should have been ignored"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - + protected override IObservable> BuildUut( - IObservable> source, - TimeSpan? changeSetBuffer = null, - TimeSpan? propertyChangeThrottle = null, - IScheduler? scheduler = null) + IObservable> source, + TimeSpan? changeSetBuffer = null, + TimeSpan? propertyChangeThrottle = null, + IScheduler? scheduler = null) => source.AutoRefresh( - propertyAccessor: static item => item.Value, - changeSetBuffer: changeSetBuffer, + propertyAccessor: static item => item.Value, + changeSetBuffer: changeSetBuffer, propertyChangeThrottle: propertyChangeThrottle, - scheduler: scheduler); + scheduler: scheduler); } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithoutPropertyAccessor.cs b/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithoutPropertyAccessor.cs index 402d175ff..af25a64f5 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithoutPropertyAccessor.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshFixture.WithoutPropertyAccessor.cs @@ -1,21 +1,13 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshFixture { + [InheritsTests] public class WithoutPropertyAccessor : Base { - [Fact] - public void PropertyChangedNotificationDoesNotSpecifyPropertyName_ItemRefreshes() + [Test] + public async Task PropertyChangedNotificationDoesNotSpecifyPropertyName_ItemRefreshes() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -23,9 +15,8 @@ public void PropertyChangedNotificationDoesNotSpecifyPropertyName_ItemRefreshes( var item1 = new Item() { Id = 1 }; var item2 = new Item() { Id = 2 }; var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut(source.Connect()) @@ -33,32 +24,31 @@ public void PropertyChangedNotificationDoesNotSpecifyPropertyName_ItemRefreshes( .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action item2.RaiseAllPropertiesChanged(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item published a property change notification"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 published a property change notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item published a property change notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 published a property change notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - + protected override IObservable> BuildUut( - IObservable> source, - TimeSpan? changeSetBuffer = null, - TimeSpan? propertyChangeThrottle = null, - IScheduler? scheduler = null) + IObservable> source, + TimeSpan? changeSetBuffer = null, + TimeSpan? propertyChangeThrottle = null, + IScheduler? scheduler = null) => source.AutoRefresh( - changeSetBuffer: changeSetBuffer, + changeSetBuffer: changeSetBuffer, propertyChangeThrottle: propertyChangeThrottle, - scheduler: scheduler); + scheduler: scheduler); } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshFixture.cs b/src/DynamicData.Tests/Cache/AutoRefreshFixture.cs index be5b936a3..0c43623b4 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshFixture.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshFixture.cs @@ -1,5 +1,3 @@ -using System.ComponentModel; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshFixture @@ -15,16 +13,16 @@ public class Item { public static int SelectId(Item item) => item.Id; - + public required int Id { get => _id; init => _id = value; } - + public bool HasSubscriptions => PropertyChanged is not null; - + public int OtherValue { get => _otherValue; @@ -32,13 +30,13 @@ public int OtherValue { if (_otherValue == value) return; - + _otherValue = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OtherValue))); } } - + public int Value { get => _value; @@ -46,20 +44,20 @@ public int Value { if (_value == value) return; - + _value = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value))); } } - + public event PropertyChangedEventHandler? PropertyChanged; - + public void RaiseAllPropertiesChanged() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty)); - + private readonly int _id; - + private int _otherValue; private int _value; } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.Base.cs b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.Base.cs index a09e0ea9c..ed7f7bc36 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.Base.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.Base.cs @@ -1,25 +1,11 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using Microsoft.Reactive.Testing; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshOnObservableFixture { public abstract class Base { - [Fact] - public void ChangeSetBufferIsGiven_ReevaluatorNotificationsAreBufferedOnScheduler() + [Test] + public async Task ChangeSetBufferIsGiven_ReevaluatorNotificationsAreBufferedOnScheduler() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -27,107 +13,98 @@ public void ChangeSetBufferIsGiven_ReevaluatorNotificationsAreBufferedOnSchedule using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged, - changeSetBuffer: TimeSpan.FromSeconds(10), - scheduler: scheduler) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged, + changeSetBuffer: TimeSpan.FromSeconds(10), + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish reevaluator notification) ++item2.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the reevaluator notification should have been buffered"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the reevaluator notification should have been buffered"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time, within buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(5).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("the buffer window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("the buffer window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + // UUT Action (advance time, to buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(10).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "a buffer window expired"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item published a reevaluator notification"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item published a reevaluator notification"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 published a reevaluator notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("a buffer window expired"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item published a reevaluator notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item published a reevaluator notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 published a reevaluator notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish reevaluator notification) ++item1.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the reevaluator notification should have been buffered"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the reevaluator notification should have been buffered"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time, within buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(15).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the buffer window has not yet ended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the buffer window has not yet ended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (publish additional reevaluator notification) ++item3.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("the reevaluator notification should have been buffered"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("the reevaluator notification should have been buffered"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (advance time, to buffer window) scheduler.AdvanceTo(TimeSpan.FromSeconds(20).Ticks); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "a buffer window expired"); - results.RecordedChangeSets.Skip(2).First().Count.Should().Be(2, "2 items published a reevaluator notification"); - results.RecordedChangeSets.Skip(2).First().Refreshes.Should().Be(2, "2 items published a reevaluator notification"); - results.RecordedChangeSets.Skip(2).First().Select(change => change.Current).Should().BeEquivalentTo(new[] { item1, item3 }, "items #2 and #3 published reevaluator notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("a buffer window expired"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Count).IsEqualTo(2).Because("2 items published a reevaluator notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Refreshes).IsEqualTo(2).Because("2 items published a reevaluator notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Select(change => change.Current)).IsEquivalentTo(new[] { item1, item3 }).Because("items #2 and #3 published reevaluator notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (normal refresh) source.Refresh(item2); - + // Normal refreshes should not be buffered - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "one source operation was performed"); - results.RecordedChangeSets.Skip(3).First().Count.Should().Be(1, "1 item was refreshed, within the source"); - results.RecordedChangeSets.Skip(3).First().Refreshes.Should().Be(1, "1 item was refreshed, within the source"); - results.RecordedChangeSets.Skip(3).First().First().Current.Should().Be(item2, "item #2 was refreshed, within the source"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items should have changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(3).First().Count).IsEqualTo(1).Because("1 item was refreshed, within the source"); + await Assert.That(results.RecordedChangeSets.Skip(3).First().Refreshes).IsEqualTo(1).Because("1 item was refreshed, within the source"); + await Assert.That(results.RecordedChangeSets.Skip(3).First().First().Current).IsEqualTo(item2).Because("item #2 was refreshed, within the source"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items should have changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void ItemIsAdded_SubscribesToReevaluator() + + [Test] + public async Task ItemIsAdded_SubscribesToReevaluator() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -135,46 +112,44 @@ public void ItemIsAdded_SubscribesToReevaluator() using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.AddOrUpdate(new[] { item1, item2, item3 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - item1.HasObservers.Should().BeTrue("the reevaluator should be invoked and subscribed to, for each added item"); - item2.HasObservers.Should().BeTrue("the reevaluator should be invoked and subscribed to, for each added item"); - item3.HasObservers.Should().BeTrue("the reevaluator should be invoked and subscribed to, for each added item"); + await Assert.That(item1.HasObservers).IsTrue().Because("the reevaluator should be invoked and subscribed to, for each added item"); + await Assert.That(item2.HasObservers).IsTrue().Because("the reevaluator should be invoked and subscribed to, for each added item"); + await Assert.That(item3.HasObservers).IsTrue().Because("the reevaluator should be invoked and subscribed to, for each added item"); } - - [Fact] - public void ItemIsMoved_NotificationPropagates() + + [Test] + public async Task ItemIsMoved_NotificationPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + var items = new[] { item1, item2, item3 }; - + var initialChangeset = new ChangeSet() { new Change(reason: ChangeReason.Add, key: item1.Id, current: item1, index: 0), @@ -184,21 +159,17 @@ public void ItemIsMoved_NotificationPropagates() // UUT Initialization using var subscription = BuildUut( - source: source.Prepend(initialChangeset), - reevaluator: Item.ObserveValueChanged) + source: source.Prepend(initialChangeset), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "3 items were added to the source"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - items, - options => options.WithStrictOrdering(), - "item indexes should propagate"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("3 items were added to the source"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(items).Because("item indexes should propagate"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.OnNext(new ChangeSet() @@ -207,22 +178,19 @@ public void ItemIsMoved_NotificationPropagates() key: item3.Id, current: item3, currentIndex: 0, - previousIndex: 2) + previousIndex: 2) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "an item was moved within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - results.RecordedItemsSorted.Should().BeEquivalentTo( - new[] { item3, item1, item2 }, - options => options.WithStrictOrdering(), - "an item was moved within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("an item was moved within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + await Assert.That(results.RecordedItemsSorted).IsEquivalentTo(new[] { item3, item1, item2 }).Because("an item was moved within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void ItemIsRefreshed_NotificationPropagates() + + [Test] + public async Task ItemIsRefreshed_NotificationPropagates() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -230,16 +198,15 @@ public void ItemIsRefreshed_NotificationPropagates() using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - + var reevaluatorInvocationCount = 0; - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: item => + source: source.Connect(), + reevaluator: item => { ++reevaluatorInvocationCount; return Item.ObserveValueChanged(item); @@ -248,29 +215,29 @@ public void ItemIsRefreshed_NotificationPropagates() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - reevaluatorInvocationCount.Should().Be(3, "the reevaluator should be invoked and subscribed to, for each added item"); + await Assert.That(reevaluatorInvocationCount).IsEqualTo(3).Because("the reevaluator should be invoked and subscribed to, for each added item"); // UUT Action source.Refresh(item2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item was refreshed within the source"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item was refreshed within the source"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 was refreshed within the source"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no items were changed, within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item was refreshed within the source"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item was refreshed within the source"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 was refreshed within the source"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no items were changed, within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - reevaluatorInvocationCount.Should().Be(3, "the reevaluator should only be invoked for items being added to the collection."); + await Assert.That(reevaluatorInvocationCount).IsEqualTo(3).Because("the reevaluator should only be invoked for items being added to the collection."); } - [Fact] - public void ItemIsRemoved_UnsubscribesFromReevaluator() + [Test] + public async Task ItemIsRemoved_UnsubscribesFromReevaluator() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -278,39 +245,37 @@ public void ItemIsRemoved_UnsubscribesFromReevaluator() using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Remove(item2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "1 item was removed from the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - item2.HasObservers.Should().BeFalse("removing an item should trigger unsubscription from its reevaluator"); - item1.HasObservers.Should().BeTrue("the item was not removed from the source"); - item3.HasObservers.Should().BeTrue("the item was not removed from the source"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("1 item was removed from the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + await Assert.That(item2.HasObservers).IsFalse().Because("removing an item should trigger unsubscription from its reevaluator"); + await Assert.That(item1.HasObservers).IsTrue().Because("the item was not removed from the source"); + await Assert.That(item3.HasObservers).IsTrue().Because("the item was not removed from the source"); } - [Fact] - public void ItemIsUpdated_ReInvokesReevaluator() + [Test] + public async Task ItemIsUpdated_ReInvokesReevaluator() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -318,73 +283,69 @@ public void ItemIsUpdated_ReInvokesReevaluator() using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action using var item4 = new Item() { Id = 2 }; source.AddOrUpdate(item4); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "1 item was replaced within the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - item2.HasObservers.Should().BeFalse("replacing an item should trigger unsubscription from its reevaluator"); - item4.HasObservers.Should().BeTrue("adding an item should invoke its reevaluator and subscribe to it"); - item1.HasObservers.Should().BeTrue("the item was not removed from the source"); - item3.HasObservers.Should().BeTrue("the item was not removed from the source"); - - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("1 item was replaced within the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + await Assert.That(item2.HasObservers).IsFalse().Because("replacing an item should trigger unsubscription from its reevaluator"); + await Assert.That(item4.HasObservers).IsTrue().Because("adding an item should invoke its reevaluator and subscribe to it"); + await Assert.That(item1.HasObservers).IsTrue().Because("the item was not removed from the source"); + await Assert.That(item3.HasObservers).IsTrue().Because("the item was not removed from the source"); + // UUT Action (updated item publishes reevaluator notification) ++item4.Value; - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 item published a reevaluation notification"); - results.RecordedChangeSets.Skip(2).First().Count.Should().Be(1, "1 item published a reevaluation notification"); - results.RecordedChangeSets.Skip(2).First().Refreshes.Should().Be(1, "1 item published a reevaluation notification"); - results.RecordedChangeSets.Skip(2).First().First().Current.Should().Be(item4, "item #4 published a reevaluation notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 item published a reevaluation notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Count).IsEqualTo(1).Because("1 item published a reevaluation notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Refreshes).IsEqualTo(1).Because("1 item published a reevaluation notification"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().First().Current).IsEqualTo(item4).Because("item #4 published a reevaluation notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void ReevaluatorCompletesWhenNotOnlyItemInSource_CompletionWaitsForSourceCompletionAndOtherReevaluatorCompletions(NotificationStrategy notificationStrategy) + + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task ReevaluatorCompletesWhenNotOnlyItemInSource_CompletionWaitsForSourceCompletionAndOtherReevaluatorCompletions(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization & Action (initial completion) if (notificationStrategy is NotificationStrategy.Immediate) item2.Complete(); using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -392,49 +353,46 @@ public void ReevaluatorCompletesWhenNotOnlyItemInSource_CompletionWaitsForSource if (notificationStrategy is NotificationStrategy.Asynchronous) item2.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("not all notification sources have completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("not all notification sources have completed"); // UUT Action (remaining reevaluator completions) item1.Complete(); item3.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + // UUT Action (source completion) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all notification sources have completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all notification sources have completed"); } - - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void ReevaluatorCompletesWhenOnlyItemInSource_CompletionWaitsForSourceCompletion(NotificationStrategy notificationStrategy) + + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task ReevaluatorCompletesWhenOnlyItemInSource_CompletionWaitsForSourceCompletion(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); using var item = new Item() { Id = 1 }; - + source.AddOrUpdate(item); - // UUT Initialization & Action (reevaluator completion) if (notificationStrategy is NotificationStrategy.Immediate) item.Complete(); using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -442,22 +400,21 @@ public void ReevaluatorCompletesWhenOnlyItemInSource_CompletionWaitsForSourceCom if (notificationStrategy is NotificationStrategy.Asynchronous) item.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "1 item was added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("1 item was added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (source completion) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all notification sources have completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all notification sources have completed"); } - - [Fact] - public void ReevaluatorEmitsAsynchronously_ItemRefreshes() + + [Test] + public async Task ReevaluatorEmitsAsynchronously_ItemRefreshes() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -465,38 +422,36 @@ public void ReevaluatorEmitsAsynchronously_ItemRefreshes() using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action ++item2.Value; - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item published a reevaluation notification"); - results.RecordedChangeSets.Skip(1).First().Count.Should().Be(1, "1 item published a reevaluation notification"); - results.RecordedChangeSets.Skip(1).First().Refreshes.Should().Be(1, "1 item published a reevaluation notification"); - results.RecordedChangeSets.Skip(1).First().First().Current.Should().Be(item2, "item #2 published a reevaluation notification"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item published a reevaluation notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Count).IsEqualTo(1).Because("1 item published a reevaluation notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().Refreshes).IsEqualTo(1).Because("1 item published a reevaluation notification"); + await Assert.That(results.RecordedChangeSets.Skip(1).First().First().Current).IsEqualTo(item2).Because("item #2 published a reevaluation notification"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact(Skip = "Existing defect, #1099")] - public void ReevaluatorEmitsImmediately_ItemDoesNotRefresh() + + [Test] + public async Task ReevaluatorEmitsImmediately_ItemDoesNotRefresh() { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -504,49 +459,47 @@ public void ReevaluatorEmitsImmediately_ItemDoesNotRefresh() using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization & Action using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValue) + source: source.Connect(), + reevaluator: Item.ObserveValue) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedChangeSets[0].Refreshes.Should().Be(0, "re-evaluation notifications should be ignored within the initial subscription frame"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedChangeSets[0].Refreshes).IsEqualTo(0).Because("re-evaluation notifications should be ignored within the initial subscription frame"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Theory(Skip = "Existing defect. Docs say that ignoring reevaluator exceptions is intentional, but it shouldn't be. Basic RX philosophy is that exceptions should basically always propagate.")] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void ReevaluatorFails_ErrorPropagates(NotificationStrategy notificationStrategy) + + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task ReevaluatorFails_ErrorIsIgnoredAndSourceContinues(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - + var error = new Exception("Test"); - // UUT Initialization & Action if (notificationStrategy is NotificationStrategy.Immediate) item2.SetError(error); using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -554,62 +507,62 @@ public void ReevaluatorFails_ErrorPropagates(NotificationStrategy notificationSt if (notificationStrategy is NotificationStrategy.Asynchronous) item2.SetError(error); - results.Error.Should().Be(error, "upstream errors should propagate downstream"); - if (notificationStrategy is NotificationStrategy.Immediate) - results.RecordedChangeSets.Should().BeEmpty("an error occurred during processing of the initial changeset"); - else - { - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - } + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.Error).IsNull().Because("per-item reevaluator errors are ignored by contract"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + using var item4 = new Item() { Id = 4 }; + source.AddOrUpdate(item4); + + await Assert.That(results.Error).IsNull().Because("per-item reevaluator errors should not terminate the stream"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("the source should continue after a per-item reevaluator error"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("new source items should continue to propagate"); } - - [Fact(Skip = "Existing defect. Docs say that ignoring reevaluator exceptions is intentional, but it shouldn't be. Basic RX philosophy is that exceptions should basically always propagate.")] - public void ReevaluatorThrows_ExceptionPropagates() + + [Test] + public async Task ReevaluatorThrows_ExceptionPropagates() { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); var error = new Exception("Test"); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - reevaluator: _ => throw error) + source: source.Connect(), + reevaluator: _ => throw error) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no initial changesets were published"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no initial changesets were published"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - // UUT Action using var item = new Item() { Id = 1 }; source.AddOrUpdate(item); - results.Error.Should().Be(error, "upstream errors should propagate downstream"); - results.RecordedChangeSets.Should().BeEmpty("an error occurred during processing of the initial changeset"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("exceptions thrown while creating the reevaluator observable should propagate"); + await Assert.That(results.HasCompleted).IsFalse().Because("the stream failed rather than completed"); } - - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void SourceCompletesWhenEmpty_CompletionPropagates(NotificationStrategy notificationStrategy) + + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task SourceCompletesWhenEmpty_CompletionPropagates(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); - // UUT Initialization & Action if (notificationStrategy is NotificationStrategy.Immediate) source.Complete(); using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -617,33 +570,32 @@ public void SourceCompletesWhenEmpty_CompletionPropagates(NotificationStrategy n if (notificationStrategy is NotificationStrategy.Asynchronous) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all notification sources have completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all notification sources have completed"); } - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void SourceCompletesWhenNotEmpty_CompletionWaitsForReevaluatorCompletions(NotificationStrategy notificationStrategy) + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task SourceCompletesWhenNotEmpty_CompletionWaitsForReevaluatorCompletions(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - // UUT Initialization & Action (source completion) if (notificationStrategy is NotificationStrategy.Immediate) source.Complete(); using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -651,53 +603,50 @@ public void SourceCompletesWhenNotEmpty_CompletionWaitsForReevaluatorCompletions if (notificationStrategy is NotificationStrategy.Asynchronous) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("not all notification sources have completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("not all notification sources have completed"); // UUT Action (initial reevaluator completion) item2.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("not all notification sources have completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("not all notification sources have completed"); // UUT Action (remaining reevaluator completions) item1.Complete(); item3.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all notification sources have completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all notification sources have completed"); } - [Theory] - [InlineData(NotificationStrategy.Immediate)] - [InlineData(NotificationStrategy.Asynchronous)] - public void SourceFails_ErrorPropagates(NotificationStrategy notificationStrategy) + [Test] + [Arguments(NotificationStrategy.Immediate)] + [Arguments(NotificationStrategy.Asynchronous)] + public async Task SourceFails_ErrorPropagates(NotificationStrategy notificationStrategy) { - // Setup + // Setup using var source = new TestSourceCache(Item.SelectId); using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + source.AddOrUpdate(new[] { item1, item2, item3 }); - + var error = new Exception("Test"); - // UUT Initialization & Action if (notificationStrategy is NotificationStrategy.Immediate) source.SetError(error); using var subscription = BuildUut( - source: source.Connect(), - reevaluator: Item.ObserveValueChanged) + source: source.Connect(), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -705,73 +654,69 @@ public void SourceFails_ErrorPropagates(NotificationStrategy notificationStrateg if (notificationStrategy is NotificationStrategy.Asynchronous) source.SetError(error); - results.Error.Should().Be(error, "upstream errors should propagate downstream"); + await Assert.That(results.Error).IsEqualTo(error).Because("upstream errors should propagate downstream"); if (notificationStrategy is NotificationStrategy.Immediate) - results.RecordedChangeSets.Should().BeEmpty("an error occurred before the initial changeset"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred before the initial changeset"); else { - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items, "3 items were added to the source"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items).Because("3 items were added to the source"); } } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => BuildUut( - source: null!, - reevaluator: Item.ObserveValueChanged)) - .Should() - .Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => BuildUut( + source: null!, + reevaluator: Item.ObserveValueChanged)).Throws(); - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var item1 = new Item() { Id = 1 }; using var item2 = new Item() { Id = 2 }; using var item3 = new Item() { Id = 3 }; - + var initialChangeset = new ChangeSet() { new Change(reason: ChangeReason.Add, key: item1.Id, current: item1), new Change(reason: ChangeReason.Add, key: item2.Id, current: item2), new Change(reason: ChangeReason.Add, key: item3.Id, current: item3) }; - // UUT Initialization using var subscription = BuildUut( - source: source.Prepend(initialChangeset), - reevaluator: Item.ObserveValueChanged) + source: source.Prepend(initialChangeset), + reevaluator: Item.ObserveValueChanged) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action subscription.Dispose(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - source.HasObservers.Should().BeFalse("subscription disposal should propagate"); - item1.HasObservers.Should().BeFalse("subscription disposal should propagate"); - item2.HasObservers.Should().BeFalse("subscription disposal should propagate"); - item3.HasObservers.Should().BeFalse("subscription disposal should propagate"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate"); + await Assert.That(item1.HasObservers).IsFalse().Because("subscription disposal should propagate"); + await Assert.That(item2.HasObservers).IsFalse().Because("subscription disposal should propagate"); + await Assert.That(item3.HasObservers).IsFalse().Because("subscription disposal should propagate"); } protected abstract IObservable> BuildUut( - IObservable> source, - Func> reevaluator, - TimeSpan? changeSetBuffer = null, - IScheduler? scheduler = null); + IObservable> source, + Func> reevaluator, + TimeSpan? changeSetBuffer = null, + IScheduler? scheduler = null); } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithKey.cs b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithKey.cs index 4fa7ec9d7..1e24a9aef 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithKey.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithKey.cs @@ -1,34 +1,25 @@ -using System; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshOnObservableFixture { + [InheritsTests] public class WithKey : Base { - [Fact] - public void ReevaluatorIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.AutoRefreshOnObservable( - source: Observable.Never>(), - reevaluator: (null as Func>)!)) - .Should() - .Throw(); - + [Test] + public async Task ReevaluatorIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.AutoRefreshOnObservable( + source: Observable.Never>(), + reevaluator: (null as Func>)!)).Throws(); + protected override IObservable> BuildUut( - IObservable> source, - Func> reevaluator, - TimeSpan? changeSetBuffer = null, - IScheduler? scheduler = null) + IObservable> source, + Func> reevaluator, + TimeSpan? changeSetBuffer = null, + IScheduler? scheduler = null) => source.AutoRefreshOnObservable( - reevaluator: (item, _) => reevaluator.Invoke(item), - changeSetBuffer: changeSetBuffer, - scheduler: scheduler); + reevaluator: (item, _) => reevaluator.Invoke(item), + changeSetBuffer: changeSetBuffer, + scheduler: scheduler); } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithoutKey.cs b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithoutKey.cs index 3e96d6e96..40572a5f9 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithoutKey.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.WithoutKey.cs @@ -1,34 +1,25 @@ -using System; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshOnObservableFixture { + [InheritsTests] public class WithoutKey : Base { - [Fact(Skip = "Existing defect: reevaluator is not null checked, throws NRW on first notification, instead")] - public void ReevaluatorIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.AutoRefreshOnObservable( - source: Observable.Never>(), - reevaluator: (null as Func>)!)) - .Should() - .Throw(); - + [Test] + public async Task ReevaluatorIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.AutoRefreshOnObservable( + source: Observable.Never>(), + reevaluator: (null as Func>)!)).Throws(); + protected override IObservable> BuildUut( - IObservable> source, - Func> reevaluator, - TimeSpan? changeSetBuffer = null, - IScheduler? scheduler = null) + IObservable> source, + Func> reevaluator, + TimeSpan? changeSetBuffer = null, + IScheduler? scheduler = null) => source.AutoRefreshOnObservable( - reevaluator: reevaluator, - changeSetBuffer: changeSetBuffer, - scheduler: scheduler); + reevaluator: reevaluator, + changeSetBuffer: changeSetBuffer, + scheduler: scheduler); } } diff --git a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.cs b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.cs index 4e6f974a2..cc933a4f9 100644 --- a/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.cs +++ b/src/DynamicData.Tests/Cache/AutoRefreshOnObservableFixture.cs @@ -1,9 +1,3 @@ -using System; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading; - namespace DynamicData.Tests.Cache; public static partial class AutoRefreshOnObservableFixture @@ -23,25 +17,25 @@ public static IObservable ObserveValue(Item item) observer.OnNext(item._value); return item._valueChanged.SubscribeSafe(observer); }); - + public static IObservable ObserveValueChanged(Item item) => item._valueChanged.Select(static _ => Unit.Default); - + public static int SelectId(Item item) => item.Id; - + public Item() => _valueChanged = new(); - + public required int Id { get => _id; init => _id = value; } - + public bool HasObservers => _valueChanged.HasObservers; - + public int Value { get => _value; @@ -49,31 +43,31 @@ public int Value { if (_value == value) return; - + _value = value; _valueChanged.OnNext(value); } } - + public void Complete() => _valueChanged.OnCompleted(); - + public void Dispose() { if (Interlocked.Exchange(ref _hasDisposed, true)) return; - + _valueChanged.OnCompleted(); _valueChanged.Dispose(); } - + public void SetError(Exception error) => _valueChanged.OnError(error); - - private readonly int _id; - private readonly Subject _valueChanged; - - private bool _hasDisposed; - private int _value; + + private readonly int _id; + private readonly ReactiveUI.Primitives.Signals.Signal _valueChanged; + + private bool _hasDisposed; + private int _value; } } diff --git a/src/DynamicData.Tests/Cache/BatchFixture.cs b/src/DynamicData.Tests/Cache/BatchFixture.cs index d22e060fe..0d824c967 100644 --- a/src/DynamicData.Tests/Cache/BatchFixture.cs +++ b/src/DynamicData.Tests/Cache/BatchFixture.cs @@ -1,13 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; public class BatchFixture : IDisposable @@ -31,20 +23,20 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedBeforeClosingBuffer() + [Test] + public async Task NoResultsWillBeReceivedBeforeClosingBuffer() { _source.AddOrUpdate(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void ResultsWillBeReceivedAfterClosingBuffer() + [Test] + public async Task ResultsWillBeReceivedAfterClosingBuffer() { _source.AddOrUpdate(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromSeconds(61).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } } diff --git a/src/DynamicData.Tests/Cache/BatchIfFixture.cs b/src/DynamicData.Tests/Cache/BatchIfFixture.cs index d88bd2f03..e03e4e869 100644 --- a/src/DynamicData.Tests/Cache/BatchIfFixture.cs +++ b/src/DynamicData.Tests/Cache/BatchIfFixture.cs @@ -1,20 +1,10 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; public class BatchIfFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); private readonly ChangeSetAggregator _results; @@ -28,11 +18,11 @@ public BatchIfFixture() _source = new SourceCache(p => p.Key); _results = _source.Connect().BatchIf(_pausingSubject, _scheduler).AsAggregator(); - // _results = _source.Connect().BatchIf(new BehaviorSubject(true), scheduler: _scheduler).AsAggregator(); + // _results = _source.Connect().BatchIf(new ReactiveUI.Primitives.Signals.StateSignal(true), scheduler: _scheduler).AsAggregator(); } - [Fact] - public void CanToggleSuspendResume() + [Test] + public async Task CanToggleSuspendResume() { _pausingSubject.OnNext(true); ////advance otherwise nothing happens @@ -42,14 +32,14 @@ public void CanToggleSuspendResume() //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); _pausingSubject.OnNext(false); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(10).Ticks); _source.AddOrUpdate(new Person("B", 1)); - _results.Messages.Count.Should().Be(2, "There should be 2 messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("There should be 2 messages"); _pausingSubject.OnNext(true); ////advance otherwise nothing happens @@ -59,19 +49,19 @@ public void CanToggleSuspendResume() //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(2, "There should be 2 messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("There should be 2 messages"); _pausingSubject.OnNext(false); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(10).Ticks); - _results.Messages.Count.Should().Be(3, "There should be 3 messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("There should be 3 messages"); } /// /// Test case to prove the issue and fix to DynamicData GitHub issue #98 - BatchIf race condition /// - [Fact] - public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() + [Test] + public async Task ChangesNotLostIfConsumerIsRunningOnDifferentThread() { var producerScheduler = new TestScheduler(); var consumerScheduler = new TestScheduler(); @@ -84,7 +74,7 @@ public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() producerScheduler.AdvanceBy(1); consumerScheduler.AdvanceBy(1); - target.Count.Should().Be(1, "There should be 1 message"); + await Assert.That(target.Count).IsEqualTo(1).Because("There should be 1 message"); _pausingSubject.OnNext(true); @@ -96,7 +86,7 @@ public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() producerScheduler.AdvanceBy(1); consumerScheduler.AdvanceBy(1); - target.Count.Should().Be(1, "There should be 1 message"); + await Assert.That(target.Count).IsEqualTo(1).Because("There should be 1 message"); _pausingSubject.OnNext(false); @@ -104,21 +94,22 @@ public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() //Target doesnt get the messages until its scheduler runs, but the //messages shouldnt be lost - target.Count.Should().Be(1, "There should be 1 message"); + await Assert.That(target.Count).IsEqualTo(1).Because("There should be 1 message"); consumerScheduler.AdvanceBy(1); - target.Count.Should().Be(2, "There should be 2 message"); + await Assert.That(target.Count).IsEqualTo(2).Because("There should be 2 message"); } public void Dispose() { _results.Dispose(); _source.Dispose(); + _pausingSubject.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedIfPaused() + [Test] + public async Task NoResultsWillBeReceivedIfPaused() { _pausingSubject.OnNext(true); //advance otherwise nothing happens @@ -128,29 +119,29 @@ public void NoResultsWillBeReceivedIfPaused() //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void ResultsWillBeReceivedIfNotPaused() + [Test] + public async Task ResultsWillBeReceivedIfNotPaused() { _source.AddOrUpdate(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void PauseSelectorOnlyStartsUnpaused() + [Test] + public async Task PauseSelectorOnlyStartsUnpaused() { // The shortest form has to keep delegating with initialPauseState false, rather than binding // to an overload that starts paused. - using var pause = new Subject(); - using var results = _source.Connect().BatchIf(pause).AsAggregator(); + using var pause = new ReactiveUI.Primitives.Signals.Signal(); + using var results = _source.Connect().BatchIf(pause, false, (TimeSpan?)null, scheduler: null).AsAggregator(); _source.AddOrUpdate(new Person("A", 1)); - results.Data.Count.Should().Be(1, "nothing has asked for buffering yet"); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("nothing has asked for buffering yet"); } } diff --git a/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs b/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs index 239dba558..738eacd5c 100644 --- a/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs +++ b/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs @@ -1,25 +1,14 @@ -using System; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; -public class BatchIfWithTimeoutFixture : IDisposable +public class BatchIfTimedResumeFixture : IDisposable { private readonly TestScheduler _scheduler; private readonly ISourceCache _source; - public BatchIfWithTimeoutFixture() + public BatchIfTimedResumeFixture() { _scheduler = new TestScheduler(); _source = new SourceCache(p => p.Key); @@ -27,68 +16,68 @@ public BatchIfWithTimeoutFixture() public void Dispose() => _source.Dispose(); - [Fact] - public void InitialPause() + [Test] + public async Task InitialPause() { - var pausingSubject = new Subject(); + var pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); using var results = _source.Connect().BatchIf(pausingSubject, true, _scheduler).AsAggregator(); // no results because the initial pause state is pause _source.AddOrUpdate(new Person("A", 1)); - results.Data.Count.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); //resume and expect a result pausingSubject.OnNext(false); - results.Data.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); //add another in the window where there is no pause _source.AddOrUpdate(new Person("B", 1)); - results.Data.Count.Should().Be(2); + await Assert.That(results.Data.Count).IsEqualTo(2); // pause again pausingSubject.OnNext(true); _source.AddOrUpdate(new Person("C", 1)); - results.Data.Count.Should().Be(2); + await Assert.That(results.Data.Count).IsEqualTo(2); //resume for the second time pausingSubject.OnNext(false); - results.Data.Count.Should().Be(3); + await Assert.That(results.Data.Count).IsEqualTo(3); } - [Fact] - public void Timeout() + [Test] + public async Task Timeout() { - var pausingSubject = new Subject(); + var pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); using var results = _source.Connect().BatchIf(pausingSubject, TimeSpan.FromSeconds(1), _scheduler).AsAggregator(); // no results because the initial pause state is pause _source.AddOrUpdate(new Person("A", 1)); - results.Data.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); // pause and add pausingSubject.OnNext(true); _source.AddOrUpdate(new Person("B", 1)); - results.Data.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); //resume before timeout ends _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks); - results.Data.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); pausingSubject.OnNext(false); - results.Data.Count.Should().Be(2); + await Assert.That(results.Data.Count).IsEqualTo(2); //pause and advance past timeout window pausingSubject.OnNext(true); _source.AddOrUpdate(new Person("C", 1)); _scheduler.AdvanceBy(TimeSpan.FromSeconds(2.1).Ticks); - results.Data.Count.Should().Be(3); + await Assert.That(results.Data.Count).IsEqualTo(3); _source.AddOrUpdate(new Person("D", 1)); - results.Data.Count.Should().Be(4); + await Assert.That(results.Data.Count).IsEqualTo(4); } } public class BatchIfWithTimeOutFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); private readonly ChangeSetAggregator _results; @@ -103,8 +92,8 @@ public BatchIfWithTimeOutFixture() _results = _source.Connect().BatchIf(_pausingSubject, TimeSpan.FromMinutes(1), _scheduler).AsAggregator(); } - [Fact] - public void CanToggleSuspendResume() + [Test] + public async Task CanToggleSuspendResume() { _pausingSubject.OnNext(true); ////advance otherwise nothing happens @@ -113,14 +102,14 @@ public void CanToggleSuspendResume() _source.AddOrUpdate(new Person("A", 1)); //go forward an arbitary amount of time - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); _pausingSubject.OnNext(false); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(10).Ticks); _source.AddOrUpdate(new Person("B", 1)); - _results.Messages.Count.Should().Be(2, "There should be 2 messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("There should be 2 messages"); } public void Dispose() @@ -128,10 +117,11 @@ public void Dispose() _results.Dispose(); _source.Dispose(); _pausingSubject.OnCompleted(); + _pausingSubject.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedIfPaused() + [Test] + public async Task NoResultsWillBeReceivedIfPaused() { _pausingSubject.OnNext(true); //advance otherwise nothing happens @@ -139,11 +129,11 @@ public void NoResultsWillBeReceivedIfPaused() _source.AddOrUpdate(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void PublishesOnIntervalEvent() + [Test] + public async Task PublishesOnIntervalEvent() { var intervalTimer = Observable.Interval(TimeSpan.FromMilliseconds(5), _scheduler).Select(_ => Unit.Default); var results = _source.Connect().BatchIf(_pausingSubject, true, intervalTimer, _scheduler).AsAggregator(); @@ -151,33 +141,33 @@ public void PublishesOnIntervalEvent() //Buffering _source.AddOrUpdate(new Person("A", 1)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(1).Ticks); - results.Messages.Count.Should().Be(0, "There should be 0 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("There should be 0 messages"); //Interval Fires and drains buffer _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(5).Ticks); - results.Messages.Count.Should().Be(1, "There should be 1 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("There should be 1 messages"); //Buffering again _source.AddOrUpdate(new Person("B", 2)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(1).Ticks); - results.Messages.Count.Should().Be(1, "There should be 1 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("There should be 1 messages"); //Interval Fires and drains buffer _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(5).Ticks); - results.Messages.Count.Should().Be(2, "There should be 2 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("There should be 2 messages"); //Buffering again _source.AddOrUpdate(new Person("C", 3)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(1).Ticks); - results.Messages.Count.Should().Be(2, "There should be 2 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("There should be 2 messages"); //Interval Fires and drains buffer _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(5).Ticks); - results.Messages.Count.Should().Be(3, "There should be 3 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(3).Because("There should be 3 messages"); } - [Fact] - public void PublishesOnTimerCompletion() + [Test] + public async Task PublishesOnTimerCompletion() { var intervalTimer = Observable.Timer(TimeSpan.FromMilliseconds(5), _scheduler).Select(_ => Unit.Default); var results = _source.Connect().BatchIf(_pausingSubject, true, intervalTimer, _scheduler).AsAggregator(); @@ -185,43 +175,43 @@ public void PublishesOnTimerCompletion() //Buffering _source.AddOrUpdate(new Person("A", 1)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(1).Ticks); - results.Messages.Count.Should().Be(0, "There should be 0 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("There should be 0 messages"); //Timer should event, buffered items delivered _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(5).Ticks); - results.Messages.Count.Should().Be(1, "There should be 1 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("There should be 1 messages"); //Unbuffered from here _source.AddOrUpdate(new Person("B", 2)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(1).Ticks); - results.Messages.Count.Should().Be(2, "There should be 2 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("There should be 2 messages"); //Unbuffered from here _source.AddOrUpdate(new Person("C", 3)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(1).Ticks); - results.Messages.Count.Should().Be(3, "There should be 3 messages"); + await Assert.That(results.Messages.Count).IsEqualTo(3).Because("There should be 3 messages"); } - [Fact] - public void ResultsWillBeReceivedIfNotPaused() + [Test] + public async Task ResultsWillBeReceivedIfNotPaused() { _source.AddOrUpdate(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void WillApplyTimeout() + [Test] + public async Task WillApplyTimeout() { _pausingSubject.OnNext(true); - //should timeout + //should timeout _scheduler.AdvanceBy(TimeSpan.FromSeconds(61).Ticks); _source.AddOrUpdate(new Person("A", 1)); - _results.Messages.Count.Should().Be(1, "There should be 1 messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("There should be 1 messages"); } } diff --git a/src/DynamicData.Tests/Cache/BufferInitialFixture.cs b/src/DynamicData.Tests/Cache/BufferInitialFixture.cs index eafe1bf6e..bbbfd3956 100644 --- a/src/DynamicData.Tests/Cache/BufferInitialFixture.cs +++ b/src/DynamicData.Tests/Cache/BufferInitialFixture.cs @@ -1,23 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; public class BufferInitialFixture { private static readonly ICollection People = Enumerable.Range(1, 10_000).Select(i => new Person(i.ToString(), i)).ToList(); - [Fact] - public void BufferInitial() + [Test] + public async Task BufferInitial() { var scheduler = new TestScheduler(); @@ -28,17 +18,17 @@ public void BufferInitial() cache.AddOrUpdate(item); } - aggregator.Data.Count.Should().Be(0); - aggregator.Messages.Count.Should().Be(0); + await Assert.That(aggregator.Data.Count).IsEqualTo(0); + await Assert.That(aggregator.Messages.Count).IsEqualTo(0); scheduler.Start(); - aggregator.Data.Count.Should().Be(10_000); - aggregator.Messages.Count.Should().Be(1); + await Assert.That(aggregator.Data.Count).IsEqualTo(10_000); + await Assert.That(aggregator.Messages.Count).IsEqualTo(1); cache.AddOrUpdate(new Person("_New", 1)); - aggregator.Data.Count.Should().Be(10_001); - aggregator.Messages.Count.Should().Be(2); + await Assert.That(aggregator.Data.Count).IsEqualTo(10_001); + await Assert.That(aggregator.Messages.Count).IsEqualTo(2); } } diff --git a/src/DynamicData.Tests/Cache/CacheConvenienceCoverageFixture.cs b/src/DynamicData.Tests/Cache/CacheConvenienceCoverageFixture.cs new file mode 100644 index 000000000..8cf0c7c0d --- /dev/null +++ b/src/DynamicData.Tests/Cache/CacheConvenienceCoverageFixture.cs @@ -0,0 +1,263 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +using DynamicData.Reactive.Kernel; +#else +using DynamicData.Cache.Internal; +using DynamicData.Kernel; +#endif + +namespace DynamicData.Tests.Cache; + +public sealed class CacheConvenienceCoverageFixture +{ + [Test] + [Arguments(0)] + [Arguments(1)] + [Arguments(2)] + [Arguments(3)] + [Arguments(4)] + [Arguments(5)] + [Arguments(6)] + public async Task StartWithEmptyPreservesSpecializedStreamAndCompletion(int kind) + { + switch (kind) + { + case 0: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, + new ChangeSet { new(ChangeReason.Add, 1, 10) }, static changes => changes.Count); + } + + break; + case 1: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, SortedChangeSet.Empty, static changes => changes.Count); + } + + break; + case 2: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, VirtualChangeSet.Empty, static changes => changes.Count); + } + + break; + case 3: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, PagedChangeSet.Empty, static changes => changes.Count); + } + + break; + case 4: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, GroupChangeSet.Empty, static changes => changes.Count); + } + + break; + case 5: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, ImmutableGroupChangeSet.Empty, static changes => changes.Count); + } + + break; + case 6: + using (var source = new ReactiveUI.Primitives.Signals.Signal>()) + { + await CheckInitialEmpty(source.StartWithEmpty(), source, new[] { 10, 20 }, static items => items.Count); + } + + break; + } + } + + [Test] + public async Task EqualityAwareAddOrUpdateSuppressesOnlyEqualItems() + { + using var cache = new SourceCache(static item => item.Key); + using var results = cache.Connect().AsAggregator(); + var original = new Item(1, 10); + + cache.AddOrUpdate(original, EqualityComparer.Default); + cache.AddOrUpdate(new Item(1, 10), EqualityComparer.Default); + cache.AddOrUpdate(new[] { new Item(1, 10), new Item(2, 20) }, EqualityComparer.Default); + cache.AddOrUpdate(new[] { new Item(1, 30), new Item(2, 20) }, EqualityComparer.Default); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Messages[2].Updates).IsEqualTo(1); + await Assert.That(results.Messages[2].Single().Previous.Value).IsSameReferenceAs(original); + await Assert.That(cache.Items.OrderBy(static item => item.Key)).IsEquivalentTo(new[] { new Item(1, 30), new Item(2, 20) }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task IntermediateConvenienceMutationPublishesExplicitKeyAndClear() + { + using var cache = new IntermediateCache(); + using var results = cache.Connect().AsAggregator(); + var first = new Item(1, 10); + var second = new Item(2, 20); + + cache.AddOrUpdate(first, "external-key"); + cache.AddOrUpdate(second, "external-key"); + cache.Clear(); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Single().Key).IsEqualTo("external-key"); + await Assert.That(results.Messages[1].Single().Previous.Value).IsSameReferenceAs(first); + await Assert.That(results.Messages[2].Single().Current).IsSameReferenceAs(second); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(cache.Count).IsEqualTo(0); + } + + [Test] + public async Task PopulateFromBatchesAndItemsUnsubscribesWithoutClearingCache() + { + using var cache = new SourceCache(static item => item.Key); + using var batches = new ReactiveUI.Primitives.Signals.Signal>(); + using var items = new ReactiveUI.Primitives.Signals.Signal(); + using var batchSubscription = cache.PopulateFrom(batches); + using var itemSubscription = cache.PopulateFrom(items); + using var results = cache.Connect().AsAggregator(); + + batches.OnNext(new[] { new Item(1, 10), new Item(2, 20) }); + items.OnNext(new Item(1, 30)); + batchSubscription.Dispose(); + itemSubscription.Dispose(); + batches.OnNext(new[] { new Item(3, 40) }); + items.OnNext(new Item(4, 50)); + + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(2); + await Assert.That(results.Messages[1].Updates).IsEqualTo(1); + await Assert.That(cache.Items.OrderBy(static item => item.Key)).IsEquivalentTo(new[] { new Item(1, 30), new Item(2, 20) }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(batches.HasObservers).IsFalse(); + await Assert.That(items.HasObservers).IsFalse(); + } + + [Test] + public async Task PopulateIntoIntermediateAndLockFreeCachesClonesRemovalsAndDisposes() + { + using var source = new SourceCache(static item => item.Key); + using var intermediate = new IntermediateCache(); + using var lockFree = new LockFreeObservableCache(); + using var first = source.Connect().PopulateInto(intermediate); + using var second = source.Connect().PopulateInto(lockFree); + + source.AddOrUpdate(new[] { new Item(1, 10), new Item(2, 20) }); + source.RemoveKey(1); + await Assert.That(intermediate.Items).IsEquivalentTo(new[] { new Item(2, 20) }); + await Assert.That(lockFree.Items).IsEquivalentTo(new[] { new Item(2, 20) }); + + first.Dispose(); + second.Dispose(); + source.AddOrUpdate(new Item(3, 30)); + await Assert.That(intermediate.Count).IsEqualTo(1); + await Assert.That(lockFree.Count).IsEqualTo(1); + lockFree.Clear(); + await Assert.That(lockFree.Count).IsEqualTo(0); + } + + [Test] + public async Task ConvertPreservesPreviousValueKeysReasonsAndIndices() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var messages = new List>(); + using var subscription = source.Convert(static value => $"value:{value}").Subscribe(messages.Add); + source.OnNext(new ChangeSet + { + new(ChangeReason.Add, "key", 10), + new(ChangeReason.Update, "key", 20, ReactiveUI.Primitives.Optional.Create(10), 3, 1), + new(ChangeReason.Remove, "key", 20) + }); + + await Assert.That(messages.Count).IsEqualTo(1); + var changes = messages[0].ToArray(); + await Assert.That(changes.Select(static change => change.Reason)).IsEquivalentTo(new[] { ChangeReason.Add, ChangeReason.Update, ChangeReason.Remove }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(changes[1].Key).IsEqualTo("key"); + await Assert.That(changes[1].Current).IsEqualTo("value:20"); + await Assert.That(changes[1].Previous.Value).IsEqualTo("value:10"); + await Assert.That(changes[1].CurrentIndex).IsEqualTo(3); + await Assert.That(changes[1].PreviousIndex).IsEqualTo(1); + } + + [Test] + public async Task InlineTransformWithoutRefreshOptionKeepsDestinationIdentity() + { + using var source = new SourceCache(static item => item.Key); + using var results = source.Connect().TransformWithInlineUpdate(static item => new Destination(item.Value), static (destination, item) => destination.Value = item.Value).AsAggregator(); + source.AddOrUpdate(new Item(1, 10)); + var destination = results.Data.Lookup(1).Value; + source.AddOrUpdate(new Item(1, 20)); + source.Refresh(source.Lookup(1).Value); + + await Assert.That(results.Data.Lookup(1).Value).IsSameReferenceAs(destination); + await Assert.That(destination.Value).IsEqualTo(20); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[2].Refreshes).IsEqualTo(1); + } + + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task InlineTransformReportsFactoryAndUpdateErrorsWhileHealthyItemsContinue(bool explicitRefreshOption) + { + using var source = new SourceCache(static item => item.Key); + var errors = new List>(); + Func factory = item => item.Value < 0 ? throw new InvalidOperationException("factory") : new Destination(item.Value); + Action update = (destination, item) => + { + if (item.Value < 0) + { + throw new InvalidOperationException("update"); + } + + destination.Value = item.Value; + }; + var stream = explicitRefreshOption + ? source.Connect().TransformWithInlineUpdate(factory, update, errors.Add, true) + : source.Connect().TransformWithInlineUpdate(factory, update, errors.Add); + using var results = stream.AsAggregator(); + source.AddOrUpdate(new Item(1, -1)); + source.AddOrUpdate(new Item(2, 20)); + var destination = results.Data.Lookup(2).Value; + source.AddOrUpdate(new Item(2, -2)); + source.AddOrUpdate(new Item(2, 30)); + source.RemoveKey(1); + + await Assert.That(errors.Count).IsEqualTo(2); + await Assert.That(errors.Select(static error => error.Key)).IsEquivalentTo(new[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Lookup(2).Value).IsSameReferenceAs(destination); + await Assert.That(destination.Value).IsEqualTo(30); + } + + private static async Task CheckInitialEmpty(IObservable stream, ReactiveUI.Primitives.Signals.Signal source, T payload, Func count) + where T : class + { + var messages = new List(); + var completed = false; + using var subscription = stream.Subscribe(messages.Add, () => completed = true); + await Assert.That(messages.Count).IsEqualTo(1); + await Assert.That(count(messages[0])).IsEqualTo(0); + + source.OnNext(payload); + source.OnCompleted(); + + await Assert.That(messages.Count).IsEqualTo(2); + await Assert.That(messages[1]).IsSameReferenceAs(payload); + await Assert.That(completed).IsTrue(); + } + + private sealed record Item(int Key, int Value); + + private sealed class Destination(int value) + { + public int Value { get; set; } = value; + } +} diff --git a/src/DynamicData.Tests/Cache/CacheLifecycleCoverageFixture.cs b/src/DynamicData.Tests/Cache/CacheLifecycleCoverageFixture.cs new file mode 100644 index 000000000..d2831c7a5 --- /dev/null +++ b/src/DynamicData.Tests/Cache/CacheLifecycleCoverageFixture.cs @@ -0,0 +1,253 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive; +using DynamicData.Reactive.Cache.Internal; +#else +using DynamicData.Cache.Internal; +#endif + +namespace DynamicData.Tests.Cache; + +public class CacheLifecycleCoverageFixture +{ + [Test] + public async Task IntermediateCacheDefersConnectSubscribedDuringEditUntilEditCompletes() + { + using var cache = new IntermediateCache(); + var messages = new List>(); + IDisposable? subscription = null; + var item = new CacheItem("alpha", 1); + var messagesDuringEdit = -1; + + try + { + cache.Edit( + updater => + { + updater.AddOrUpdate(item, item.Key); + subscription = cache.Connect(suppressEmptyChangeSets: false).Subscribe(messages.Add); + messagesDuringEdit = messages.Count; + }); + + await Assert.That(messagesDuringEdit).IsEqualTo(0); + await Assert.That(messages.Count).IsEqualTo(1); + await Assert.That(messages[0].Single().Current).IsEqualTo(item); + } + finally + { + subscription?.Dispose(); + } + } + + [Test] + public async Task IntermediateCacheDefersConnectSubscribedWhileNotificationsAndEditAreSuspended() + { + using var cache = new IntermediateCache(); + using var suspension = cache.SuspendNotifications(); + var messages = new List>(); + IDisposable? subscription = null; + var item = new CacheItem("bravo", 2); + var messagesDuringEdit = -1; + + try + { + cache.Edit( + updater => + { + updater.AddOrUpdate(item, item.Key); + subscription = cache.Connect(suppressEmptyChangeSets: false).Subscribe(messages.Add); + messagesDuringEdit = messages.Count; + }); + + await Assert.That(messagesDuringEdit).IsEqualTo(0); + await Assert.That(messages).IsEmpty(); + } + finally + { + suspension.Dispose(); + } + + try + { + await Assert.That(messages.Count).IsEqualTo(1); + await Assert.That(messages[0].Single().Current).IsEqualTo(item); + } + finally + { + subscription?.Dispose(); + } + } + + [Test] + public async Task IntermediateCacheCountPreviewWatchAndInitialUpdatesReflectEditedItems() + { + using var cache = new IntermediateCache(); + var counts = new List(); + var previews = new List>(); + var watched = new List>(); + using var countSubscription = cache.CountChanged.Subscribe(counts.Add); + using var previewSubscription = cache.Preview(static item => item.Value > 10).Subscribe(previews.Add); + using var watchSubscription = cache.Watch("charlie").Subscribe(watched.Add); + using var countSuspension = cache.SuspendCount(); + var included = new CacheItem("charlie", 11); + var excluded = new CacheItem("delta", 4); + + cache.Edit( + updater => + { + updater.AddOrUpdate(included, included.Key); + updater.AddOrUpdate(excluded, excluded.Key); + }); + + await Assert.That(cache.Keys).IsEquivalentTo(new[] { included.Key, excluded.Key }); + await Assert.That(cache.KeyValues[included.Key]).IsEqualTo(included); + await Assert.That(cache.Lookup(included.Key).Value).IsEqualTo(included); + await Assert.That(cache.GetInitialUpdates(static item => item.Value > 10).Single().Current).IsEqualTo(included); + await Assert.That(previews.Single().Single().Current).IsEqualTo(included); + await Assert.That(watched.Single().Current).IsEqualTo(included); + await Assert.That(counts).IsEquivalentTo(new[] { 0 }); + } + + [Test] + public async Task AnonymousObservableCacheDelegatesKeyValuesPreviewAndWatch() + { + using var source = new SourceCache(static item => item.Key); + using var anonymous = new AnonymousObservableCache(source.Connect()); + var previews = new List>(); + var watched = new List>(); + using var previewSubscription = anonymous.Preview(static item => item.Value > 10).Subscribe(previews.Add); + using var watchSubscription = anonymous.Watch("echo").Subscribe(watched.Add); + using var connectResults = anonymous.Connect().AsAggregator(); + var included = new CacheItem("echo", 12); + var excluded = new CacheItem("foxtrot", 3); + + source.AddOrUpdate(included); + source.AddOrUpdate(excluded); + + await Assert.That(anonymous.KeyValues[included.Key]).IsEqualTo(included); + await Assert.That(previews.Single().Single().Current).IsEqualTo(included); + await Assert.That(watched.Single().Current).IsEqualTo(included); + await Assert.That(connectResults.Data.Lookup(included.Key).Value).IsEqualTo(included); + } + + [Test] + public async Task AnonymousQueryClonesCacheAndExposesReadOnlySnapshotMembers() + { + var cache = new Cache(); + var original = new CacheItem("golf", 7); + var replacement = new CacheItem("golf", 70); + cache.AddOrUpdate(original, original.Key); + + var query = new AnonymousQuery(cache); + cache.AddOrUpdate(replacement, replacement.Key); + + await Assert.That(query.Count).IsEqualTo(1); + await Assert.That(query.Items.Single()).IsEqualTo(original); + await Assert.That(query.Keys.Single()).IsEqualTo(original.Key); + await Assert.That(query.KeyValues.Single().Value).IsEqualTo(original); + await Assert.That(query.Lookup(original.Key).Value).IsEqualTo(original); + } + + [Test] + public async Task InternalCacheRefreshNoOpsAndRemoveEnumerableOverloadsPreserveExpectedState() + { + var cache = new Cache(); + var first = new CacheItem("hotel", 8); + var second = new CacheItem("india", 9); + var third = new CacheItem("juliet", 10); + cache.AddOrUpdate(first, first.Key); + cache.AddOrUpdate(second, second.Key); + cache.AddOrUpdate(third, third.Key); + + cache.Refresh(); + cache.Refresh(first.Key); + cache.Refresh(new[] { first.Key, second.Key }); + cache.Remove(new[] { first.Key }); + cache.Remove(Yield(second.Key)); + + await Assert.That(cache.Count).IsEqualTo(1); + await Assert.That(cache.Lookup(third.Key).Value).IsEqualTo(third); + await Assert.That(cache.Lookup(first.Key).HasValue).IsFalse(); + await Assert.That(cache.Lookup(second.Key).HasValue).IsFalse(); + } + + [Test] + public async Task ChangeAwareCacheRefreshEnumerableOverloadsCaptureOnlyExistingKeys() + { + var cache = new ChangeAwareCache(); + var first = new CacheItem("kilo", 11); + var second = new CacheItem("lima", 12); + cache.AddOrUpdate(first, first.Key); + cache.AddOrUpdate(second, second.Key); + cache.CaptureChanges(); + + cache.Refresh(new[] { first.Key, "missing-list" }); + cache.Refresh(Yield(second.Key, "missing-enumerable")); + + var changes = cache.CaptureChanges(); + + await Assert.That(changes.Count).IsEqualTo(2); + await Assert.That(changes.Select(static change => change.Reason)).IsEquivalentTo(new[] { ChangeReason.Refresh, ChangeReason.Refresh }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(changes.Select(static change => change.Current)).IsEquivalentTo(new[] { first, second }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task CacheUpdaterComparerAndKeyValueEnumerableBranchesUpdateRefreshAndRemove() + { + var cache = new ChangeAwareCache(); + var updater = new CacheUpdater(cache, static item => item.Key); + var original = new CacheItem("mike", 13); + var equivalent = new CacheItem("mike", 13); + var changed = new CacheItem("mike", 14); + var added = new CacheItem("november", 15); + var comparer = CacheItemValueComparer.Instance; + + updater.AddOrUpdate(original); + cache.CaptureChanges(); + + updater.AddOrUpdate(equivalent, comparer); + updater.AddOrUpdate(changed, comparer); + updater.AddOrUpdate(Yield(added), comparer); + updater.Refresh(Yield(changed)); + updater.Refresh(Yield(added.Key)); + updater.Remove(Yield(new KeyValuePair(changed.Key, changed), new KeyValuePair(added.Key, added))); + + var changes = cache.CaptureChanges(); + + await Assert.That(cache.Count).IsEqualTo(0); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Update)).IsEqualTo(1); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Add)).IsEqualTo(1); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Refresh)).IsEqualTo(2); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Remove)).IsEqualTo(2); + } + + [Test] + public async Task CacheUpdaterComparerAndProjectionOverloadsThrowWhenKeySelectorIsMissing() + { + var updater = new CacheUpdater(new ChangeAwareCache()); + var item = new CacheItem("oscar", 16); + var comparer = EqualityComparer.Default; + + await Assert.That(() => updater.AddOrUpdate(new[] { item }, comparer)).Throws(); + await Assert.That(() => updater.AddOrUpdate(item, comparer)).Throws(); + await Assert.That(() => updater.GetKeyValues(new[] { item }).ToArray()).Throws(); + } + + private static IEnumerable Yield(params T[] items) + { + foreach (var item in items) + { + yield return item; + } + } + + private sealed record CacheItem(string Key, int Value); + + private sealed class CacheItemValueComparer : IEqualityComparer + { + public static readonly CacheItemValueComparer Instance = new(); + + public bool Equals(CacheItem? x, CacheItem? y) => x?.Value == y?.Value; + + public int GetHashCode(CacheItem obj) => obj.Value.GetHashCode(); + } +} diff --git a/src/DynamicData.Tests/Cache/CrossCacheDeadlockStressTest.cs b/src/DynamicData.Tests/Cache/CrossCacheDeadlockStressTest.cs index 8915bc6bc..eaa35adf2 100644 --- a/src/DynamicData.Tests/Cache/CrossCacheDeadlockStressTest.cs +++ b/src/DynamicData.Tests/Cache/CrossCacheDeadlockStressTest.cs @@ -1,26 +1,14 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Reactive.Threading.Tasks; -using System.Threading; -using System.Threading.Tasks; - using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Kernel; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; @@ -176,7 +164,7 @@ public int Compare(StressPrice? x, StressPrice? y) => // The Test // ════════════════════════════════════════════════════════════════ - [Fact] + [Test] public async Task AllOperators_CrossCache_NoDeadlock_CorrectResults() { // ── Derive ALL test parameters from seeded Randomizer ──────── @@ -217,16 +205,16 @@ public async Task AllOperators_CrossCache_NoDeadlock_CorrectResults() using var treeSource = new SourceCache(m => m.Id); // ── Subjects for dynamic parameters ───────────────────────── - using var pageRequests = new BehaviorSubject(new PageRequest(1, pageSize)); - using var virtualRequests = new BehaviorSubject(new VirtualRequest(0, virtualSize)); - using var pauseBatch = new BehaviorSubject(false); - using var forceTransform = new Subject>(); - using var switchSource = new BehaviorSubject>>(sourceA.Connect()); - using var comparerSubject = new BehaviorSubject>(RatingDescComparer.Instance); + using var pageRequests = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, pageSize)); + using var virtualRequests = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, virtualSize)); + using var pauseBatch = new ReactiveUI.Primitives.Signals.StateSignal(false); + using var forceTransform = new ReactiveUI.Primitives.Signals.Signal>(); + using var switchSource = new ReactiveUI.Primitives.Signals.StateSignal>>(sourceA.Connect()); + using var comparerSubject = new ReactiveUI.Primitives.Signals.StateSignal>(RatingDescComparer.Instance); // Stop signal for operators with a library gap — they don't forward OnCompleted: // Static Combiner (Or/And/Except), BatchIf, TransformToTree, Switch - using var stopSignal = new Subject(); + using var stopSignal = new ReactiveUI.Primitives.Signals.Signal(); // ── Completion tracking ───────────────────────────────────── var completionTasks = new List(); @@ -374,7 +362,7 @@ void TrackIntoCache(IObservable> pipeline, SourceC .TakeUntil(stopSignal)); var andCache = TrackCache( - sourceA.Connect().And(sourceB.Connect()) // And [1] + And(sourceA.Connect(), sourceB.Connect()) // And [1] .TakeUntil(stopSignal)); var exceptCache = TrackCache( @@ -476,8 +464,8 @@ void TrackIntoCache(IObservable> pipeline, SourceC .TakeUntil(stopSignal)); // Second Page + Virtualise + BatchIf uses on sourceB - using var pageBSubject = new BehaviorSubject(new PageRequest(1, pageSize)); - using var pauseB = new BehaviorSubject(false); + using var pageBSubject = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, pageSize)); + using var pauseB = new ReactiveUI.Primitives.Signals.StateSignal(false); var pageBCache = TrackCache( sourceB.Connect() @@ -486,7 +474,7 @@ void TrackIntoCache(IObservable> pipeline, SourceC .BatchIf(pauseB, false, (TimeSpan?)null) // BatchIf [2] .TakeUntil(stopSignal)); - using var virtBRequests = new BehaviorSubject(new VirtualRequest(0, virtualSize)); + using var virtBRequests = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, virtualSize)); var virtBCache = TrackCache( sourceB.Connect() .Sort(PriorityAscComparer.Instance) // Sort [4] @@ -538,7 +526,7 @@ void TrackIntoCache(IObservable> pipeline, SourceC completionNames.Add("QueryWhenChanged-A"); // Second Switch + GroupOnImmutable + GroupOnObservable - using var switchSource2 = new BehaviorSubject>>(sourceB.Connect()); + using var switchSource2 = new ReactiveUI.Primitives.Signals.StateSignal>>(sourceB.Connect()); var switchCache2 = TrackCache( switchSource2.Switch() // Switch [2] .TakeUntil(stopSignal)); @@ -574,7 +562,7 @@ void TrackIntoCache(IObservable> pipeline, SourceC .TakeUntil(stopSignal)); var andCache2 = TrackCache( - sourceB.Connect().And(sourceA.Connect()) // And [2] + And(sourceB.Connect(), sourceA.Connect()) // And [2] .TakeUntil(stopSignal)); var exceptCache2 = TrackCache( @@ -657,7 +645,7 @@ void TrackIntoCache(IObservable> pipeline, SourceC var finalAKeys = new HashSet(sourceA.Keys); var finalBKeys = new HashSet(sourceB.Keys); - // 2. Complete all BehaviorSubjects so multi-source operators can complete + // 2. Complete all StateSignals so multi-source operators can complete forceTransform.OnCompleted(); pageRequests.OnCompleted(); pageBSubject.OnCompleted(); @@ -689,7 +677,7 @@ void TrackIntoCache(IObservable> pipeline, SourceC var pending = completionTasks.Select((t2, i) => new { Index = i, t2.Status, Name = completionNames[i] }) .Where(x => x.Status != TaskStatus.RanToCompletion) .Select(x => $"[{x.Index}] {x.Name} ({x.Status})").ToList(); - pending.Should().BeEmpty($"all {completionTasks.Count} tasks should finish within {timeoutSeconds}s. Pending: {string.Join(", ", pending)}"); + await Assert.That(pending).IsEmpty().Because($"all {completionTasks.Count} tasks should finish within {timeoutSeconds}s. Pending: {string.Join(", ", pending)}"); } // ════════════════════════════════════════════════════════════ @@ -697,93 +685,82 @@ void TrackIntoCache(IObservable> pipeline, SourceC // ════════════════════════════════════════════════════════════ // Flow 1: Forward — filtered, transformed, paged subset of sourceA - forwardTarget.Count.Should().BeGreaterThan(0, "Flow1 should produce results"); - forwardTarget.Count.Should().BeLessThanOrEqualTo(pageSize, "Page should limit"); - forwardTarget.Items.Should().OnlyContain(m => m.Name.StartsWith("F-"), "Transform prefixes 'F-'"); - forwardTarget.Items.Should().OnlyContain( - m => m.Rating >= ratingThreshold * transformMultiplier, - "Transform multiplies rating of items that passed filter"); - forwardRemovals.Should().BeGreaterThan(0, "OnItemRemoved fires on rating mutation exits"); + await Assert.That(forwardTarget.Count).IsGreaterThan(0).Because("Flow1 should produce results"); + await Assert.That(forwardTarget.Count).IsLessThanOrEqualTo(pageSize).Because("Page should limit"); + await Assert.That(forwardTarget.Items).ContainsOnly(m => m.Name.StartsWith("F-")).Because("Transform prefixes 'F-'"); + await Assert.That(forwardTarget.Items).ContainsOnly( + m => m.Rating >= ratingThreshold * transformMultiplier) + .Because("Transform multiplies rating of items that passed filter"); + await Assert.That(forwardRemovals).IsGreaterThan(0).Because("OnItemRemoved fires on rating mutation exits"); // Flow 2: Reverse — filtered, sorted, virtualized, transformed subset of sourceB - reverseTarget.Count.Should().BeGreaterThan(0, "Flow2 should produce results"); - reverseTarget.Count.Should().BeLessThanOrEqualTo(virtualSize, "Virtualise limits"); - reverseTarget.Items.Should().OnlyContain(m => m.Name.StartsWith("R-"), "Transform prefixes 'R-'"); + await Assert.That(reverseTarget.Count).IsGreaterThan(0).Because("Flow2 should produce results"); + await Assert.That(reverseTarget.Count).IsLessThanOrEqualTo(virtualSize).Because("Virtualise limits"); + await Assert.That(reverseTarget.Items).ContainsOnly(m => m.Name.StartsWith("R-")).Because("Transform prefixes 'R-'"); // Flow 3: Joins — verify mathematical relationships hold // Each cache may see a slightly different snapshot due to bidirectional flow timing, // but the set-theoretic relationships must hold within each cache's own view. - fullJoinCache.Items.Should().OnlyContain(m => m.Name.StartsWith("FJ-"), "FullJoin prefixes 'FJ-'"); - innerJoinCache.Items.Should().OnlyContain(m => m.Name.StartsWith("IJ-"), "InnerJoin prefixes 'IJ-'"); - leftJoinCache.Items.Should().OnlyContain(m => m.Name.StartsWith("LJ-"), "LeftJoin prefixes 'LJ-'"); - rightJoinCache.Items.Should().OnlyContain(m => m.Name.StartsWith("RJ-"), "RightJoin prefixes 'RJ-'"); + await Assert.That(fullJoinCache.Items).ContainsOnly(m => m.Name.StartsWith("FJ-")).Because("FullJoin prefixes 'FJ-'"); + await Assert.That(innerJoinCache.Items).ContainsOnly(m => m.Name.StartsWith("IJ-")).Because("InnerJoin prefixes 'IJ-'"); + await Assert.That(leftJoinCache.Items).ContainsOnly(m => m.Name.StartsWith("LJ-")).Because("LeftJoin prefixes 'LJ-'"); + await Assert.That(rightJoinCache.Items).ContainsOnly(m => m.Name.StartsWith("RJ-")).Because("RightJoin prefixes 'RJ-'"); // InnerJoin keys ⊂ FullJoin keys (intersection ⊂ union) - new HashSet(innerJoinCache.Keys).IsSubsetOf(new HashSet(fullJoinCache.Keys)).Should() - .BeTrue("InnerJoin ⊂ FullJoin"); + await Assert.That(new HashSet(innerJoinCache.Keys).IsSubsetOf(new HashSet(fullJoinCache.Keys))).IsTrue().Because("InnerJoin subset FullJoin"); // InnerJoin must have at least the overlapping keys - innerJoinCache.Count.Should().BeGreaterThanOrEqualTo(overlappingCount, - "InnerJoin finds at least overlapping items"); + await Assert.That(innerJoinCache.Count).IsGreaterThanOrEqualTo(overlappingCount).Because("InnerJoin finds at least overlapping items"); // Flow 4: Combiners — Or and Merged share the same Publish, so they're identical - orCache.Keys.Should().BeEquivalentTo(mergedCache.Keys, "Or = Merged (same Publish sources)"); + await Assert.That(orCache.Keys).IsEquivalentTo(mergedCache.Keys).Because("Or = Merged (same Publish sources)"); // And ⊂ Or - new HashSet(andCache.Keys).IsSubsetOf(new HashSet(orCache.Keys)).Should() - .BeTrue("And ⊂ Or"); + await Assert.That(new HashSet(andCache.Keys).IsSubsetOf(new HashSet(orCache.Keys))).IsTrue().Because("And subset Or"); // Except ∩ And = ∅ - new HashSet(exceptCache.Keys).Overlaps(andCache.Keys).Should() - .BeFalse("Except ∩ And = ∅"); + await Assert.That(new HashSet(exceptCache.Keys).Overlaps(andCache.Keys)).IsFalse().Because("Except and And should not overlap"); // Except ∪ And ∪ (items only in B) = Or var exceptPlusAnd = new HashSet(exceptCache.Keys); exceptPlusAnd.UnionWith(andCache.Keys); - exceptPlusAnd.IsSubsetOf(new HashSet(orCache.Keys)).Should() - .BeTrue("Except ∪ And ⊂ Or"); + await Assert.That(exceptPlusAnd.IsSubsetOf(new HashSet(orCache.Keys))).IsTrue().Because("Except and And union subset Or"); // Second joins — cross-verify with first joins (same sources, same completion) - leftJoin2Cache.Keys.Should().BeEquivalentTo(rightJoinCache.Keys, "LeftJoin2(B×A) = RightJoin(A×B)"); - leftJoin2Cache.Items.Should().OnlyContain(m => m.Name.StartsWith("LJ2-"), "LeftJoin2 prefixes"); - rightJoin2Cache.Keys.Should().BeEquivalentTo(leftJoinCache.Keys, "RightJoin2(B×A) = LeftJoin(A×B)"); - rightJoin2Cache.Items.Should().OnlyContain(m => m.Name.StartsWith("RJ2-"), "RightJoin2 prefixes"); - orCache2.Keys.Should().BeEquivalentTo(orCache.Keys, "Or2 = Or (same sources, same completion)"); - andCache2.Keys.Should().BeEquivalentTo(andCache.Keys, "And2 = And (same sources)"); - mergedCache2.Keys.Should().BeEquivalentTo(mergedCache.Keys, "MergedCache2 = Merged (same sources)"); + await Assert.That(leftJoin2Cache.Keys).IsEquivalentTo(rightJoinCache.Keys).Because("LeftJoin2(B×A) = RightJoin(A×B)"); + await Assert.That(leftJoin2Cache.Items).ContainsOnly(m => m.Name.StartsWith("LJ2-")).Because("LeftJoin2 prefixes"); + await Assert.That(rightJoin2Cache.Keys).IsEquivalentTo(leftJoinCache.Keys).Because("RightJoin2(B×A) = LeftJoin(A×B)"); + await Assert.That(rightJoin2Cache.Items).ContainsOnly(m => m.Name.StartsWith("RJ2-")).Because("RightJoin2 prefixes"); + await Assert.That(orCache2.Keys).IsEquivalentTo(orCache.Keys).Because("Or2 = Or (same sources, same completion)"); + await Assert.That(andCache2.Keys).IsEquivalentTo(andCache.Keys).Because("And2 = And (same sources)"); + await Assert.That(mergedCache2.Keys).IsEquivalentTo(mergedCache.Keys).Because("MergedCache2 = Merged (same sources)"); // Flow 5: Groups — verify grouping preserves all items from same snapshot - groupCache.Items.Select(m => m.Region).Distinct().Count().Should() - .BeGreaterThan(1, "GroupOn creates multiple regions"); - immGroupAgg.Data.Count.Should().BeGreaterThan(1, "GroupOnImmutable produces groups"); - immGroupBAgg.Data.Count.Should().BeGreaterThan(1, "GroupOnImmutable(B) produces groups"); + await Assert.That(groupCache.Items.Select(m => m.Region).Distinct().Count()).IsGreaterThan(1).Because("GroupOn creates multiple regions"); + await Assert.That(immGroupAgg.Data.Count).IsGreaterThan(1).Because("GroupOnImmutable produces groups"); + await Assert.That(immGroupBAgg.Data.Count).IsGreaterThan(1).Because("GroupOnImmutable(B) produces groups"); // Flow 6: MergeManyChangeSets — exact price key verification // MMCS(child/A) and MMCS(source/A) see the same sourceA markets, same price keys - childPriceCache.Keys.Should().BeEquivalentTo(sourcePriceACache.Keys, - "MMCS(child/A) = MMCS(source/A) — same source markets, same price keys"); - childPriceBCache.Keys.Should().BeEquivalentTo(sourcePriceCache.Keys, - "MMCS(child/B) = MMCS(source/B) — same source markets, same price keys"); + await Assert.That(childPriceCache.Keys).IsEquivalentTo(sourcePriceACache.Keys).Because("MMCS(child/A) = MMCS(source/A) — same source markets, same price keys"); + await Assert.That(childPriceBCache.Keys).IsEquivalentTo(sourcePriceCache.Keys).Because("MMCS(child/B) = MMCS(source/B) — same source markets, same price keys"); // Flow 7: SortAndBind — exact count matching sourceA - boundListA.Count.Should().Be(leftJoinCache.Count, "SortAndBind = LeftJoin count (both see all sourceA)"); - boundListB.Count.Should().Be(leftJoinCache.Count, "SortAndBind(obs) = LeftJoin count"); + await Assert.That(boundListA.Count).IsEqualTo(leftJoinCache.Count).Because("SortAndBind = LeftJoin count (both see all sourceA)"); + await Assert.That(boundListB.Count).IsEqualTo(leftJoinCache.Count).Because("SortAndBind(obs) = LeftJoin count"); for (var i = 1; i < boundListB.Count; i++) - boundListB[i - 1].Priority.Should().BeLessThanOrEqualTo(boundListB[i].Priority, - "SortAndBind(obs) re-sorted by priority after comparer switch"); + await Assert.That(boundListB[i - 1].Priority).IsLessThanOrEqualTo(boundListB[i].Priority).Because("SortAndBind(obs) re-sorted by priority after comparer switch"); // Switch: after switching, should have items from the switched-to source - switchCache.Count.Should().BeGreaterThan(0, "Switch (switched to B) has items"); - switchCache2.Count.Should().BeGreaterThan(0, "Switch2 (switched to A) has items"); + await Assert.That(switchCache.Count).IsGreaterThan(0).Because("Switch (switched to B) has items"); + await Assert.That(switchCache2.Count).IsGreaterThan(0).Because("Switch2 (switched to A) has items"); - pageBCache.Count.Should().BeGreaterThan(0, "Page(B) produces results"); - pageBCache.Count.Should().BeLessThanOrEqualTo(pageSize, "Page(B) respects page limit"); - virtBCache.Count.Should().BeGreaterThan(0, "Virtualise(B) produces results"); - virtBCache.Count.Should().BeLessThanOrEqualTo(virtualSize, "Virtualise(B) respects virtual limit"); + await Assert.That(pageBCache.Count).IsGreaterThan(0).Because("Page(B) produces results"); + await Assert.That(pageBCache.Count).IsLessThanOrEqualTo(pageSize).Because("Page(B) respects page limit"); + await Assert.That(virtBCache.Count).IsGreaterThan(0).Because("Virtualise(B) produces results"); + await Assert.That(virtBCache.Count).IsLessThanOrEqualTo(virtualSize).Because("Virtualise(B) respects virtual limit"); // Flow 8: TransformMany — exact price key sets from original markets var expectedPriceKeysA = new HashSet(marketsA.SelectMany(m => m.Prices.Keys)); - new HashSet(allPricesACache.Keys).IsSupersetOf(expectedPriceKeysA).Should() - .BeTrue("TransformMany(A) contains all original sourceA prices"); + await Assert.That(new HashSet(allPricesACache.Keys).IsSupersetOf(expectedPriceKeysA)).IsTrue().Because("TransformMany(A) contains all original sourceA prices"); var expectedPriceKeysB = new HashSet(marketsB.SelectMany(m => m.Prices.Keys)); - new HashSet(allPricesBCache.Keys).IsSupersetOf(expectedPriceKeysB).Should() - .BeTrue("TransformMany(B) contains all original sourceB prices"); + await Assert.That(new HashSet(allPricesBCache.Keys).IsSupersetOf(expectedPriceKeysB)).IsTrue().Because("TransformMany(B) contains all original sourceB prices"); // TransformToTree static int CountAll(IEnumerable> nodes) @@ -793,17 +770,15 @@ static int CountAll(IEnumerable> nodes) return c; } - CountAll(treeCache.Items).Should().Be(treeCount, "Tree has all markets across depths"); - treeCache.Items.Any(n => n.Children.Count > 0).Should().BeTrue("Tree has child nodes"); - treeCache2.Count.Should().BeGreaterThan(0, "Tree2 produces results"); - - + await Assert.That(CountAll(treeCache.Items)).IsEqualTo(treeCount).Because("Tree has all markets across depths"); + await Assert.That(treeCache.Items.Any(n => n.Children.Count > 0)).IsTrue().Because("Tree has child nodes"); + await Assert.That(treeCache2.Count).IsGreaterThan(0).Because("Tree2 produces results"); // Side chains - lastQuery.Should().NotBeNull("QueryWhenChanged(B) fired"); - lastQueryA.Should().NotBeNull("QueryWhenChanged(A) fired"); - sortVirtResults.Data.Count.Should().BeLessThanOrEqualTo(virtualSize, "SortAndVirtualize respects limit"); - sortVirtAResults.Data.Count.Should().BeLessThanOrEqualTo(virtualSize, "SortAndVirtualize(A) respects limit"); + await Assert.That(lastQuery).IsNotNull().Because("QueryWhenChanged(B) fired"); + await Assert.That(lastQueryA).IsNotNull().Because("QueryWhenChanged(A) fired"); + await Assert.That(sortVirtResults.Data.Count).IsLessThanOrEqualTo(virtualSize).Because("SortAndVirtualize respects limit"); + await Assert.That(sortVirtAResults.Data.Count).IsLessThanOrEqualTo(virtualSize).Because("SortAndVirtualize(A) respects limit"); } // ════════════════════════════════════════════════════════════════ @@ -866,4 +841,15 @@ private static List> PartitionList(List source, int partitions) result[i % partitions].Add(source[i]); return result; } + + private static IObservable> And( + IObservable> source, + IObservable> other) + { +#if REACTIVE_TESTS + return DynamicData.Reactive.ObservableCacheEx.And(source, other); +#else + return DynamicData.ObservableCacheEx.And(source, other); +#endif + } } diff --git a/src/DynamicData.Tests/Cache/DeadlockTortureTest.cs b/src/DynamicData.Tests/Cache/DeadlockTortureTest.cs index 4f4ddf9a4..c299b143b 100644 --- a/src/DynamicData.Tests/Cache/DeadlockTortureTest.cs +++ b/src/DynamicData.Tests/Cache/DeadlockTortureTest.cs @@ -2,18 +2,13 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Reactive.Subjects; -using System.Threading; -using System.Threading.Tasks; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; /// @@ -26,6 +21,7 @@ namespace DynamicData.Tests.Cache; /// On main (Synchronize(lock)): deadlocks reliably within seconds. /// On the PR branch (SynchronizeSafe queue-drain): no deadlock possible. /// +[NotInParallel] public sealed class DeadlockTortureTest { private const int ItemCount = 200; @@ -45,8 +41,8 @@ private static async Task RunBidirectionalDeadlockTest( using var bToA = pipeline(sourceB.Connect().Filter(x => x.Name.StartsWith("B"))).PopulateInto(sourceA); using var barrier = new Barrier(2); - var taskA = Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) sourceA.AddOrUpdate(new Person("A-" + iter + "-" + i, i)); }); - var taskB = Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) sourceB.AddOrUpdate(new Person("B-" + iter + "-" + i, i)); }); + var taskA = RunOnDedicatedThread(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) sourceA.AddOrUpdate(new Person("A-" + iter + "-" + i, i)); }); + var taskB = RunOnDedicatedThread(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) sourceB.AddOrUpdate(new Person("B-" + iter + "-" + i, i)); }); var completed = Task.WhenAll(taskA, taskB); if (await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds))) != completed) @@ -55,47 +51,60 @@ private static async Task RunBidirectionalDeadlockTest( return true; } - [Fact] public async Task Sort_DoesNotDeadlock() => - (await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)))).Should().BeTrue(); + private static Task RunOnDedicatedThread(Action action) => + Task.Factory.StartNew(action, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); - [Fact] public async Task AutoRefresh_DoesNotDeadlock() => - (await RunBidirectionalDeadlockTest(s => s.AutoRefresh(p => p.Age))).Should().BeTrue(); + [Test] + public async Task Sort_DoesNotDeadlock() => +await Assert.That((await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age))))).IsTrue(); - [Fact] public async Task GroupOn_DoesNotDeadlock() => - (await RunBidirectionalDeadlockTest(s => s.Group(p => p.Age % 3).MergeMany(g => g.Cache.Connect()))).Should().BeTrue(); + [Test] + public async Task AutoRefresh_DoesNotDeadlock() => +await Assert.That((await RunBidirectionalDeadlockTest(s => s.AutoRefresh(p => p.Age)))).IsTrue(); - [Fact] public async Task Page_DoesNotDeadlock() + [Test] + public async Task GroupOn_DoesNotDeadlock() => +await Assert.That((await RunBidirectionalDeadlockTest(s => s.Group(p => p.Age % 3).MergeMany(g => g.Cache.Connect())))).IsTrue(); + + [Test] + public async Task Page_DoesNotDeadlock() { - using var req = new BehaviorSubject(new PageRequest(1, 50)); - (await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Page(req))).Should().BeTrue(); + using var req = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 50)); + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Page(req)))).IsTrue(); } - [Fact] public async Task Virtualise_DoesNotDeadlock() + [Test] + public async Task Virtualise_DoesNotDeadlock() { - using var req = new BehaviorSubject(new VirtualRequest(0, 50)); - (await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Virtualise(req))).Should().BeTrue(); + using var req = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 50)); + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Virtualise(req)))).IsTrue(); } - [Fact] public async Task TransformWithForce_DoesNotDeadlock() + [Test] + public async Task TransformWithForce_DoesNotDeadlock() { - using var force = new Subject>(); - (await RunBidirectionalDeadlockTest(s => s.Transform((p, k) => new Person("T-" + p.Name, p.Age), force))).Should().BeTrue(); + using var force = new ReactiveUI.Primitives.Signals.Signal>(); + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Transform((p, k) => new Person("T-" + p.Name, p.Age), force)))).IsTrue(); } - [Fact] public async Task BatchIf_DoesNotDeadlock() => - (await RunBidirectionalDeadlockTest(s => s.BatchIf(new BehaviorSubject(false), false, (TimeSpan?)null))).Should().BeTrue(); + [Test] + public async Task BatchIf_DoesNotDeadlock() => +await Assert.That((await RunBidirectionalDeadlockTest(s => s.BatchIf(new ReactiveUI.Primitives.Signals.StateSignal(false), false, (TimeSpan?)null)))).IsTrue(); - [Fact] public async Task DisposeMany_DoesNotDeadlock() => - (await RunBidirectionalDeadlockTest(s => s.DisposeMany())).Should().BeTrue(); + [Test] + public async Task DisposeMany_DoesNotDeadlock() => +await Assert.That((await RunBidirectionalDeadlockTest(s => s.DisposeMany()))).IsTrue(); - [Fact] public async Task OnItemRemoved_DoesNotDeadlock() => - (await RunBidirectionalDeadlockTest(s => s.OnItemRemoved(_ => { }))).Should().BeTrue(); + [Test] + public async Task OnItemRemoved_DoesNotDeadlock() => +await Assert.That((await RunBidirectionalDeadlockTest(s => s.OnItemRemoved(_ => { })))).IsTrue(); - [Fact] public async Task AllDangerous_Stacked_DoNotDeadlock() + [Test] + public async Task AllDangerous_Stacked_DoNotDeadlock() { - using var pageReq = new BehaviorSubject(new PageRequest(1, 100)); - using var force = new Subject>(); - (await RunBidirectionalDeadlockTest( + using var pageReq = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 100)); + using var force = new ReactiveUI.Primitives.Signals.Signal>(); + await Assert.That(await RunBidirectionalDeadlockTest( s => s.AutoRefresh(p => p.Age) .Filter(p => p.Age >= 0) .Transform((p, k) => new Person("X-" + p.Name, p.Age), force) @@ -103,13 +112,14 @@ [Fact] public async Task AllDangerous_Stacked_DoNotDeadlock() .DisposeMany() .Sort(SortExpressionComparer.Ascending(p => p.Age)) .Page(pageReq), - iterations: Iterations * 2)).Should().BeTrue(); + iterations: Iterations * 2)).IsTrue(); } - [Fact] public async Task MultiplePairs_Simultaneous_NoDeadlock() + [Test] + public async Task MultiplePairs_Simultaneous_NoDeadlock() { - using var pageReq = new BehaviorSubject(new PageRequest(1, 50)); - using var virtReq = new BehaviorSubject(new VirtualRequest(0, 50)); + using var pageReq = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 50)); + using var virtReq = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 50)); var results = await Task.WhenAll( RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)), 30), RunBidirectionalDeadlockTest(s => s.AutoRefresh(p => p.Age), 30), @@ -118,11 +128,15 @@ [Fact] public async Task MultiplePairs_Simultaneous_NoDeadlock() RunBidirectionalDeadlockTest(s => s.DisposeMany(), 30), RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Page(pageReq), 30), RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Virtualise(virtReq), 30), - RunBidirectionalDeadlockTest(s => s.BatchIf(new BehaviorSubject(false), false, (TimeSpan?)null), 30)); - results.Should().AllSatisfy(r => r.Should().BeTrue()); + RunBidirectionalDeadlockTest(s => s.BatchIf(new ReactiveUI.Primitives.Signals.StateSignal(false), false, (TimeSpan?)null), 30)); + foreach (var result in results) + { + await Assert.That(result).IsTrue(); + } } - [Fact] public async Task ThreeWayCircular_DoesNotDeadlock() + [Test] + public async Task ThreeWayCircular_DoesNotDeadlock() { for (var iter = 0; iter < Iterations; iter++) { @@ -137,12 +151,12 @@ [Fact] public async Task ThreeWayCircular_DoesNotDeadlock() using var barrier = new Barrier(3); var tasks = new[] { - Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) a.AddOrUpdate(new Person("A-" + iter + "-" + i, i)); }), - Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) b.AddOrUpdate(new Person("B-" + iter + "-" + i, i)); }), - Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) c.AddOrUpdate(new Person("CC-" + iter + "-" + i, i)); }), + RunOnDedicatedThread(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) a.AddOrUpdate(new Person("A-" + iter + "-" + i, i)); }), + RunOnDedicatedThread(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) b.AddOrUpdate(new Person("B-" + iter + "-" + i, i)); }), + RunOnDedicatedThread(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) c.AddOrUpdate(new Person("CC-" + iter + "-" + i, i)); }), }; var completed = Task.WhenAll(tasks); - (await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds)))).Should().BeSameAs(completed, "iteration " + iter); + await Assert.That((await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds))))).IsSameReferenceAs(completed).Because("iteration " + iter); } } } diff --git a/src/DynamicData.Tests/Cache/DeferUntilLoadedFixture.cs b/src/DynamicData.Tests/Cache/DeferUntilLoadedFixture.cs index 1e19ba079..6fcbd228f 100644 --- a/src/DynamicData.Tests/Cache/DeferUntilLoadedFixture.cs +++ b/src/DynamicData.Tests/Cache/DeferUntilLoadedFixture.cs @@ -1,18 +1,11 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class DeferAnsdSkipFixture { - [Fact] - public void DeferUntilLoadedDoesNothingUntilDataHasBeenReceived() + [Test] + public async Task DeferUntilLoadedDoesNothingUntilDataHasBeenReceived() { var updateReceived = false; IChangeSet? result = null; @@ -27,23 +20,23 @@ public void DeferUntilLoadedDoesNothingUntilDataHasBeenReceived() }); var person = new Person("Test", 1); - updateReceived.Should().BeFalse(); + await Assert.That(updateReceived).IsFalse(); cache.AddOrUpdate(person); - updateReceived.Should().BeTrue(); + await Assert.That(updateReceived).IsTrue(); if (result is null) { throw new InvalidOperationException(nameof(result)); } - result.Adds.Should().Be(1); - result.First().Current.Should().Be(person); + await Assert.That(result.Adds).IsEqualTo(1); + await Assert.That(result.First().Current).IsEqualTo(person); deferStream.Dispose(); } - [Fact] - public void SkipInitialDoesNotReturnTheFirstBatchOfData() + [Test] + public async Task SkipInitialDoesNotReturnTheFirstBatchOfData() { var updateReceived = false; @@ -51,14 +44,14 @@ public void SkipInitialDoesNotReturnTheFirstBatchOfData() var deferStream = cache.Connect().SkipInitial().Subscribe(changes => updateReceived = true); - updateReceived.Should().BeFalse(); + await Assert.That(updateReceived).IsFalse(); cache.AddOrUpdate(new Person("P1", 1)); - updateReceived.Should().BeFalse(); + await Assert.That(updateReceived).IsFalse(); cache.AddOrUpdate(new Person("P2", 2)); - updateReceived.Should().BeTrue(); + await Assert.That(updateReceived).IsTrue(); deferStream.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/DisposeManyFixture.cs b/src/DynamicData.Tests/Cache/DisposeManyFixture.cs index b196e1431..a6f6f0a12 100644 --- a/src/DynamicData.Tests/Cache/DisposeManyFixture.cs +++ b/src/DynamicData.Tests/Cache/DisposeManyFixture.cs @@ -1,17 +1,10 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public sealed class DisposeManyFixture : IDisposable { - private readonly Subject> _changeSetsSource; + private readonly ReactiveUI.Primitives.Signals.Signal> _changeSetsSource; + + private readonly List _itemsDisposedBeforeDownstreamNotifications = []; private readonly SourceCache _itemsSource; @@ -27,21 +20,39 @@ public DisposeManyFixture() { foreach (var change in changeSet) { - change.Current.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + if (change.Current.IsDisposed) + { + _itemsDisposedBeforeDownstreamNotifications.Add($"Current item {change.Current.Id}"); + } if (change.Previous.HasValue) - change.Previous.Value.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + { + if (change.Previous.Value.IsDisposed) + { + _itemsDisposedBeforeDownstreamNotifications.Add($"Previous item {change.Previous.Value.Id}"); + } + } } }, onError: _ => { - foreach(var item in _itemsSource.Items) - item.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + foreach (var item in _itemsSource.Items) + { + if (item.IsDisposed) + { + _itemsDisposedBeforeDownstreamNotifications.Add($"Error item {item.Id}"); + } + } }, onCompleted: () => { - foreach(var item in _itemsSource.Items) - item.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + foreach (var item in _itemsSource.Items) + { + if (item.IsDisposed) + { + _itemsDisposedBeforeDownstreamNotifications.Add($"Completed item {item.Id}"); + } + } })); } @@ -52,26 +63,27 @@ public void Dispose() _results.Dispose(); } - [Fact] + [Test] // Verifies https://github.com/reactivemarbles/DynamicData/issues/668 - public void ErrorsArePropagated() + public async Task ErrorsArePropagated() { var error = new Exception("Test Exception"); var source = Observable.Throw>(error) .DisposeMany(); - FluentActions.Invoking(() => source.Subscribe()).Should().Throw().Which.Should().BeSameAs(error); + var thrown = Assert.Throws(() => source.Subscribe()); + await Assert.That(thrown).IsSameReferenceAs(error); var receivedError = null as Exception; source.Subscribe( onNext: static _ => { }, onError: error => receivedError = error); - receivedError.Should().BeSameAs(error); + await Assert.That(receivedError).IsSameReferenceAs(error); } - [Fact] - public void ItemsAreDisposedAfterRemovalOrReplacement() + [Test] + public async Task ItemsAreDisposedAfterRemovalOrReplacement() { var items = new[] { @@ -111,15 +123,16 @@ public void ItemsAreDisposedAfterRemovalOrReplacement() previousIndex: 0) }); - _results.Error.Should().BeNull(); - _results.Messages.Count.Should().Be(10, "10 updates were made to the source"); - _results.Data.Count.Should().Be(3, "3 items were not removed from the list"); - _results.Data.Items.All(item => item.IsDisposed).Should().BeFalse("items remaining in the list should not be disposed"); - items.Except(_results.Data.Items).All(item => item.IsDisposed).Should().BeTrue("items removed from the list should be disposed"); + await Assert.That(_results.Error).IsNull(); + await Assert.That(_itemsDisposedBeforeDownstreamNotifications).IsEmpty().Because("items should not be disposed until after downstream notifications are processed"); + await Assert.That(_results.Messages.Count).IsEqualTo(10).Because("10 updates were made to the source"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("3 items were not removed from the list"); + await Assert.That(_results.Data.Items.All(item => item.IsDisposed)).IsFalse().Because("items remaining in the list should not be disposed"); + await Assert.That(items.Except(_results.Data.Items).All(item => item.IsDisposed)).IsTrue().Because("items removed from the list should be disposed"); } - [Fact] - public void RemainingItemsAreDisposedAfterCompleted() + [Test] + public async Task RemainingItemsAreDisposedAfterCompleted() { _itemsSource.AddOrUpdate(new[] { @@ -131,30 +144,32 @@ public void RemainingItemsAreDisposedAfterCompleted() _itemsSource.Dispose(); _changeSetsSource.OnCompleted(); - _results.Error.Should().BeNull(); - _results.Messages.Count.Should().Be(1, "1 update was made to the source"); - _results.Data.Count.Should().Be(3, "3 items were not removed from the list"); - _results.Data.Items.All(item => item.IsDisposed).Should().BeTrue("Items remaining in the list should be disposed"); + await Assert.That(_results.Error).IsNull(); + await Assert.That(_itemsDisposedBeforeDownstreamNotifications).IsEmpty().Because("items should not be disposed until after downstream notifications are processed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("1 update was made to the source"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("3 items were not removed from the list"); + await Assert.That(_results.Data.Items.All(item => item.IsDisposed)).IsTrue().Because("Items remaining in the list should be disposed"); } - [Fact] - public void RemainingItemsAreDisposedAfterError() + [Test] + public async Task RemainingItemsAreDisposedAfterError() { _itemsSource.AddOrUpdate(new DisposableObject(1)); - + var error = new Exception("Test Exception"); _changeSetsSource.OnError(error); _itemsSource.AddOrUpdate(new DisposableObject(2)); - _results.Error.Should().Be(error); - _results.Messages.Count.Should().Be(1, "1 update was made to the source"); - _results.Data.Count.Should().Be(1, "1 item was not removed from the list"); - _results.Data.Items.All(item => item.IsDisposed).Should().BeTrue("items remaining in the list should be disposed"); + await Assert.That(_results.Error).IsEqualTo(error); + await Assert.That(_itemsDisposedBeforeDownstreamNotifications).IsEmpty().Because("items should not be disposed until after downstream notifications are processed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("1 update was made to the source"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("1 item was not removed from the list"); + await Assert.That(_results.Data.Items.All(item => item.IsDisposed)).IsTrue().Because("items remaining in the list should be disposed"); } - [Fact] - public void RemainingItemsAreDisposedAfterUnsubscription() + [Test] + public async Task RemainingItemsAreDisposedAfterUnsubscription() { var items = new[] { @@ -167,7 +182,7 @@ public void RemainingItemsAreDisposedAfterUnsubscription() _results.Dispose(); - items.All(item => item.IsDisposed).Should().BeTrue("Items remaining in the list should be disposed"); + await Assert.That(items.All(item => item.IsDisposed)).IsTrue().Because("Items remaining in the list should be disposed"); } private class DisposableObject(int id) : IDisposable diff --git a/src/DynamicData.Tests/Cache/DistinctFixture.cs b/src/DynamicData.Tests/Cache/DistinctFixture.cs index fbbd36c7b..869ff1cba 100644 --- a/src/DynamicData.Tests/Cache/DistinctFixture.cs +++ b/src/DynamicData.Tests/Cache/DistinctFixture.cs @@ -1,13 +1,5 @@ -using System; -using System.Linq; -using System.Reactive.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class DistinctFixture : IDisposable @@ -22,8 +14,8 @@ public DistinctFixture() _results = _source.Connect().DistinctValues(p => p.Age).AsAggregator(); } - [Fact] - public void BreakWithLoadsOfUpdates() + [Test] + public async Task BreakWithLoadsOfUpdates() { _source.Edit( updater => @@ -37,12 +29,12 @@ public void BreakWithLoadsOfUpdates() updater.AddOrUpdate(new Person("Person4", 14)); }); - _results.Data.Items.Should().BeEquivalentTo(new[] { 1, 12, 13, 14 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 1, 12, 13, 14 }); //This previously threw _source.Remove(new Person("Person3", 13)); - _results.Data.Items.Should().BeEquivalentTo(new[] { 1, 12, 14 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 1, 12, 14 }); } public void Dispose() @@ -51,8 +43,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void DuplicatedResultsResultInNoAdditionalMessage() + [Test] + public async Task DuplicatedResultsResultInNoAdditionalMessage() { _source.Edit( updater => @@ -62,13 +54,13 @@ public void DuplicatedResultsResultInNoAdditionalMessage() updater.AddOrUpdate(new Person("Person1", 20)); }); - _results.Messages.Count.Should().Be(1, "Should be 1 update message"); - _results.Data.Count.Should().Be(1, "Should be 1 items in the cache"); - _results.Data.Items[0].Should().Be(20, "Should 20"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update message"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 items in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(20).Because("Should 20"); } - [Fact] - public void DuplicateKeysRefreshAfterRemove() + [Test] + public async Task DuplicateKeysRefreshAfterRemove() { var source1 = new SourceCache(p => p.Name); var source2 = new SourceCache(p => p.Name); @@ -82,27 +74,27 @@ public void DuplicateKeysRefreshAfterRemove() source2.Remove(person); source1.Refresh(person); // would previously throw KeyNotFoundException here - results.Messages.Should().HaveCount(1); - results.Data.Items.Should().BeEquivalentTo(new[] { 12 }); + await Assert.That(results.Messages).HasCount(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 12 }); source1.Remove(person); - results.Messages.Should().HaveCount(2); - results.Data.Items.Should().BeEmpty(); + await Assert.That(results.Messages).HasCount(2); + await Assert.That(results.Data.Items).IsEmpty(); } - [Fact] - public void FiresAddWhenaNewItemIsAdded() + [Test] + public async Task FiresAddWhenaNewItemIsAdded() { _source.AddOrUpdate(new Person("Person1", 20)); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(20, "Should 20"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(20).Because("Should 20"); } - [Fact] - public void FiresBatchResultOnce() + [Test] + public async Task FiresBatchResultOnce() { _source.Edit( updater => @@ -112,22 +104,22 @@ public void FiresBatchResultOnce() updater.AddOrUpdate(new Person("Person3", 22)); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(3, "Should be 3 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("Should be 3 items in the cache"); - _results.Data.Items.Should().BeEquivalentTo(new[] { 20, 21, 22 }); - _results.Data.Items[0].Should().Be(20, "Should 20"); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 20, 21, 22 }); + await Assert.That(_results.Data.Items[0]).IsEqualTo(20).Because("Should 20"); } - [Fact] - public void RemovingAnItemRemovesTheDistinct() + [Test] + public async Task RemovingAnItemRemovesTheDistinct() { _source.AddOrUpdate(new Person("Person1", 20)); _source.Remove(new Person("Person1", 20)); - _results.Messages.Count.Should().Be(2, "Should be 1 update message"); - _results.Data.Count.Should().Be(0, "Should be 1 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 1 update message"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 1 items in the cache"); - _results.Messages.First().Adds.Should().Be(1, "First message should be an add"); - _results.Messages.Skip(1).First().Removes.Should().Be(1, "Second messsage should be a remove"); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1).Because("First message should be an add"); + await Assert.That(_results.Messages.Skip(1).First().Removes).IsEqualTo(1).Because("Second messsage should be a remove"); } } diff --git a/src/DynamicData.Tests/Cache/DynamicAndFixture.cs b/src/DynamicData.Tests/Cache/DynamicAndFixture.cs index c9b79b545..87c3da5f9 100644 --- a/src/DynamicData.Tests/Cache/DynamicAndFixture.cs +++ b/src/DynamicData.Tests/Cache/DynamicAndFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class DynamicAndFixture : IDisposable @@ -32,8 +25,8 @@ public DynamicAndFixture() _results = _source.And().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { var items = _generator.Take(100).ToArray(); _source1.AddOrUpdate(items.Take(20)); @@ -42,14 +35,14 @@ public void AddAndRemoveLists() _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(items.Skip(10).Take(10)); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(items.Skip(10).Take(10)); _source.Add(_source3.Connect()); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); _source.RemoveAt(2); - _results.Data.Count.Should().Be(10); + await Assert.That(_results.Data.Count).IsEqualTo(10); } public void Dispose() @@ -61,8 +54,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemoveAllLists() + [Test] + public async Task RemoveAllLists() { var items = _generator.Take(100).ToArray(); @@ -79,11 +72,11 @@ public void RemoveAllLists() _source.RemoveAt(0); //s _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void RemovingFromOneRemovesFromResult() + [Test] + public async Task RemovingFromOneRemovesFromResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -93,12 +86,12 @@ public void RemovingFromOneRemovesFromResult() _source2.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void UpdatingBothProducesResults() + [Test] + public async Task UpdatingBothProducesResults() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -106,13 +99,13 @@ public void UpdatingBothProducesResults() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should have no updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void UpdatingOneProducesOnlyOneUpdate() + [Test] + public async Task UpdatingOneProducesOnlyOneUpdate() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -123,13 +116,13 @@ public void UpdatingOneProducesOnlyOneUpdate() var personUpdated = new Person("Adult1", 51); _source2.AddOrUpdate(personUpdated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(personUpdated).Because("Should be updated person"); } - [Fact] - public void UpdatingOneSourceOnlyProducesNoResults() + [Test] + public async Task UpdatingOneSourceOnlyProducesNoResults() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -137,7 +130,7 @@ public void UpdatingOneSourceOnlyProducesNoResults() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(0, "Should have no updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } } diff --git a/src/DynamicData.Tests/Cache/DynamicExceptFixture.cs b/src/DynamicData.Tests/Cache/DynamicExceptFixture.cs index 43a993e46..796bde0ab 100644 --- a/src/DynamicData.Tests/Cache/DynamicExceptFixture.cs +++ b/src/DynamicData.Tests/Cache/DynamicExceptFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class DynamicExceptFixture : IDisposable @@ -32,8 +25,8 @@ public DynamicExceptFixture() _results = _source.Except().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { var items = _generator.Take(100).OrderBy(p => p.Name).ToArray(); @@ -45,16 +38,16 @@ public void AddAndRemoveLists() _source.Add(_source2.Connect()); _source.Add(_source3.Connect()); - _results.Data.Count.Should().Be(80); - _results.Data.Items.Should().BeEquivalentTo(items.Skip(10).Take(80)); + await Assert.That(_results.Data.Count).IsEqualTo(80); + await Assert.That(_results.Data.Items).IsEquivalentTo(items.Skip(10).Take(80)); _source.RemoveAt(2); - _results.Data.Count.Should().Be(90); - _results.Data.Items.Should().BeEquivalentTo(items.Skip(10)); + await Assert.That(_results.Data.Count).IsEqualTo(90); + await Assert.That(_results.Data.Items).IsEquivalentTo(items.Skip(10)); _source.RemoveAt(0); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(items.Take(10)); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(items.Take(10)); } public void Dispose() @@ -66,8 +59,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void DoNotIncludeExceptListItems() + [Test] + public async Task DoNotIncludeExceptListItems() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -76,12 +69,12 @@ public void DoNotIncludeExceptListItems() _source2.AddOrUpdate(person); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(0, "Should have no updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void RemoveAllLists() + [Test] + public async Task RemoveAllLists() { var items = _generator.Take(100).ToArray(); @@ -95,11 +88,11 @@ public void RemoveAllLists() _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void RemovedAnItemFromExceptThenIncludesTheItem() + [Test] + public async Task RemovedAnItemFromExceptThenIncludesTheItem() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -109,12 +102,12 @@ public void RemovedAnItemFromExceptThenIncludesTheItem() _source1.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(1, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); } - [Fact] - public void UpdatingOneSourceOnlyProducesResult() + [Test] + public async Task UpdatingOneSourceOnlyProducesResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -122,7 +115,7 @@ public void UpdatingOneSourceOnlyProducesResult() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } } diff --git a/src/DynamicData.Tests/Cache/DynamicOrFixture.cs b/src/DynamicData.Tests/Cache/DynamicOrFixture.cs index d02c37649..14099738d 100644 --- a/src/DynamicData.Tests/Cache/DynamicOrFixture.cs +++ b/src/DynamicData.Tests/Cache/DynamicOrFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class DynamicOrFixture : IDisposable @@ -32,8 +25,8 @@ public DynamicOrFixture() _results = _source.Or().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { var items = _generator.Take(100).ToArray(); @@ -45,14 +38,14 @@ public void AddAndRemoveLists() _source.Add(_source2.Connect()); _source.Add(_source3.Connect()); - _results.Data.Count.Should().Be(100); - _results.Data.Items.Should().BeEquivalentTo(items); + await Assert.That(_results.Data.Count).IsEqualTo(100); + await Assert.That(_results.Data.Items).IsEquivalentTo(items); _source.RemoveAt(1); var result = items.Take(10).Union(items.Skip(20)); - _results.Data.Count.Should().Be(90); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(90); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); } public void Dispose() @@ -64,8 +57,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemoveAllLists() + [Test] + public async Task RemoveAllLists() { var items = _generator.Take(100).ToArray(); @@ -79,11 +72,11 @@ public void RemoveAllLists() _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void RemovingFromOneDoesNotFromResult() + [Test] + public async Task RemovingFromOneDoesNotFromResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -93,12 +86,12 @@ public void RemovingFromOneDoesNotFromResult() _source2.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(1, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); } - [Fact] - public void UpdatingBothProducesResultsAndDoesNotDuplicateTheMessage() + [Test] + public async Task UpdatingBothProducesResultsAndDoesNotDuplicateTheMessage() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -106,13 +99,13 @@ public void UpdatingBothProducesResultsAndDoesNotDuplicateTheMessage() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should have no updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void UpdatingOneProducesOnlyOneUpdate() + [Test] + public async Task UpdatingOneProducesOnlyOneUpdate() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -123,13 +116,13 @@ public void UpdatingOneProducesOnlyOneUpdate() var personUpdated = new Person("Adult1", 51); _source2.AddOrUpdate(personUpdated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(personUpdated).Because("Should be updated person"); } - [Fact] - public void UpdatingOneSourceOnlyProducesResult() + [Test] + public async Task UpdatingOneSourceOnlyProducesResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -137,7 +130,7 @@ public void UpdatingOneSourceOnlyProducesResult() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } } diff --git a/src/DynamicData.Tests/Cache/DynamicXorFixture.cs b/src/DynamicData.Tests/Cache/DynamicXorFixture.cs index e2e70119a..01ba872b5 100644 --- a/src/DynamicData.Tests/Cache/DynamicXorFixture.cs +++ b/src/DynamicData.Tests/Cache/DynamicXorFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class DynamicXorFixture : IDisposable @@ -32,8 +25,8 @@ public DynamicXorFixture() _results = _source.Xor().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { var items = _generator.Take(100).ToArray(); @@ -45,14 +38,14 @@ public void AddAndRemoveLists() _source.Add(_source2.Connect()); _source.Add(_source3.Connect()); - _results.Data.Count.Should().Be(100); - _results.Data.Items.Should().BeEquivalentTo(items); + await Assert.That(_results.Data.Count).IsEqualTo(100); + await Assert.That(_results.Data.Items).IsEquivalentTo(items); _source.RemoveAt(1); var result = items.Take(10).Union(items.Skip(20)); - _results.Data.Count.Should().Be(90); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(90); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); } public void Dispose() @@ -64,8 +57,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemoveAllLists() + [Test] + public async Task RemoveAllLists() { var items = _generator.Take(100).ToArray(); @@ -79,11 +72,11 @@ public void RemoveAllLists() _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void RemovingFromOneDoesNotFromResult() + [Test] + public async Task RemovingFromOneDoesNotFromResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -93,12 +86,12 @@ public void RemovingFromOneDoesNotFromResult() _source2.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(3, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); } - [Fact] - public void UpdatingBothDoeNotProducesResult() + [Test] + public async Task UpdatingBothDoeNotProducesResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -106,11 +99,11 @@ public void UpdatingBothDoeNotProducesResult() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void UpdatingOneProducesOnlyOneUpdate() + [Test] + public async Task UpdatingOneProducesOnlyOneUpdate() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -121,12 +114,12 @@ public void UpdatingOneProducesOnlyOneUpdate() var personUpdated = new Person("Adult1", 51); _source2.AddOrUpdate(personUpdated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void UpdatingOneSourceOnlyProducesResult() + [Test] + public async Task UpdatingOneSourceOnlyProducesResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); @@ -134,7 +127,7 @@ public void UpdatingOneSourceOnlyProducesResult() var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } } diff --git a/src/DynamicData.Tests/Cache/EditDiffChangeSetFixture.cs b/src/DynamicData.Tests/Cache/EditDiffChangeSetFixture.cs index d178c9ea6..ec677da46 100644 --- a/src/DynamicData.Tests/Cache/EditDiffChangeSetFixture.cs +++ b/src/DynamicData.Tests/Cache/EditDiffChangeSetFixture.cs @@ -1,26 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class EditDiffChangeSetFixture { private const int MaxItems = 1097; - [Fact] - public void NullChecksArePerformed() + [Test] + public async Task NullChecksArePerformed() { - Assert.Throws(() => Observable.Empty>().EditDiff(null!)); - Assert.Throws(() => default(IObservable>)!.EditDiff(null!)); + await Assert.That(() => Observable.Empty>().EditDiff(null!)).Throws(); + await Assert.That(() => default(IObservable>)!.EditDiff(null!)).Throws(); } - [Fact] - public void ItemsFromEnumerableAreAddedToChangeSet() + [Test] + public async Task ItemsFromEnumerableAreAddedToChangeSet() { // having var enumerable = CreatePeople(0, MaxItems, "Name"); @@ -31,31 +23,31 @@ public void ItemsFromEnumerableAreAddedToChangeSet() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(MaxItems); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(MaxItems); + await Assert.That(results.Messages.Count).IsEqualTo(1); } - [Fact] - public void ItemsRemovedFromEnumerableAreRemovedFromChangeSet() + [Test] + public async Task ItemsRemovedFromEnumerableAreRemovedFromChangeSet() { // having var enumerable = CreatePeople(0, MaxItems, "Name"); - var enumObservable = new[] {enumerable, Enumerable.Empty()}.ToObservable(); + var enumObservable = new[] { enumerable, Enumerable.Empty() }.ToObservable(); // when var observableChangeSet = enumObservable.EditDiff(p => p.Id); using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(0); - results.Messages.Count.Should().Be(2); - results.Messages[0].Adds.Should().Be(MaxItems); - results.Messages[1].Removes.Should().Be(MaxItems); - results.Messages[1].Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(MaxItems); + await Assert.That(results.Messages[1].Removes).IsEqualTo(MaxItems); + await Assert.That(results.Messages[1].Updates).IsEqualTo(0); } - [Fact] - public void ItemsUpdatedAreUpdatedInChangeSet() + [Test] + public async Task ItemsUpdatedAreUpdatedInChangeSet() { // having var enumerable1 = CreatePeople(0, MaxItems * 2, "Name"); @@ -67,17 +59,17 @@ public void ItemsUpdatedAreUpdatedInChangeSet() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(MaxItems); - results.Messages.Count.Should().Be(2); - results.Messages[0].Adds.Should().Be(MaxItems * 2); - results.Messages[1].Updates.Should().Be(MaxItems); - results.Messages[1].Removes.Should().Be(MaxItems); + await Assert.That(results.Data.Count).IsEqualTo(MaxItems); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(MaxItems * 2); + await Assert.That(results.Messages[1].Updates).IsEqualTo(MaxItems); + await Assert.That(results.Messages[1].Removes).IsEqualTo(MaxItems); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ResultCompletesIfAndOnlyIfSourceCompletes(bool completeSource) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task ResultCompletesIfAndOnlyIfSourceCompletes(bool completeSource) { // having var enumerable = CreatePeople(0, MaxItems, "Name"); @@ -89,16 +81,16 @@ public void ResultCompletesIfAndOnlyIfSourceCompletes(bool completeSource) bool completed = false; // when - using var results = enumObservable.Subscribe(_ => { }, () => completed = true); + using var results = enumObservable.EditDiff(p => p.Id).Subscribe(_ => { }, () => completed = true); // then - completed.Should().Be(completeSource); + await Assert.That(completed).IsEqualTo(completeSource); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ResultFailsIfAndOnlyIfSourceFails (bool failSource) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task ResultFailsIfAndOnlyIfSourceFails(bool failSource) { // having var enumerable = CreatePeople(0, MaxItems, "Name"); @@ -111,10 +103,10 @@ public void ResultFailsIfAndOnlyIfSourceFails (bool failSource) var receivedError = default(Exception); // when - using var results = enumObservable.Subscribe(_ => { }, err => receivedError = err); + using var results = enumObservable.EditDiff(p => p.Id).Subscribe(_ => { }, err => receivedError = err); // then - receivedError.Should().Be(failSource ? testException : default); + await Assert.That(receivedError).IsEqualTo(failSource ? testException : default); } private static Person CreatePerson(int id, string name) => new(id, name); diff --git a/src/DynamicData.Tests/Cache/EditDiffChangeSetOptionalFixture.cs b/src/DynamicData.Tests/Cache/EditDiffChangeSetOptionalFixture.cs index 280f7db33..f97b4ce4c 100644 --- a/src/DynamicData.Tests/Cache/EditDiffChangeSetOptionalFixture.cs +++ b/src/DynamicData.Tests/Cache/EditDiffChangeSetOptionalFixture.cs @@ -1,35 +1,26 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reactive.Linq; -using DynamicData.Kernel; -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; public class EditDiffChangeSetOptionalFixture { - private static readonly Optional s_noPerson = Optional.None(); + private static readonly ReactiveUI.Primitives.Optional s_noPerson = ReactiveUI.Primitives.Optional.None; private const int MaxItems = 1097; - [Fact] + [Test] [Description("Required to maintain test coverage percentage")] - public void NullChecksArePerformed() + public async Task NullChecksArePerformed() { - Action actionNullKeySelector = () => Observable.Empty>().EditDiff(null!); - Action actionNullObservable = () => default(IObservable>)!.EditDiff(null!); + Action actionNullKeySelector = () => Observable.Empty>().EditDiff(null!); + Action actionNullObservable = () => default(IObservable>)!.EditDiff(null!); - actionNullKeySelector.Should().Throw().WithParameterName("keySelector"); - actionNullObservable.Should().Throw().WithParameterName("source"); + await Assert.That(actionNullKeySelector).Throws().WithParameterName("keySelector"); + await Assert.That(actionNullObservable).Throws().WithParameterName("source"); } - [Fact] - public void OptionalSomeCreatesAddChange() + [Test] + public async Task OptionalSomeCreatesAddChange() { // having var optional = CreatePerson(0, "Name"); @@ -40,31 +31,31 @@ public void OptionalSomeCreatesAddChange() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(1); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Messages.Count).IsEqualTo(1); } - [Fact] - public void OptionalNoneCreatesRemoveChange() + [Test] + public async Task OptionalNoneCreatesRemoveChange() { // having var optional = CreatePerson(0, "Name"); - var optObservable = new[] {optional, s_noPerson}.ToObservable(); + var optObservable = new[] { optional, s_noPerson }.ToObservable(); // when var observableChangeSet = optObservable.EditDiff(p => p.Id); using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(0); - results.Messages.Count.Should().Be(2); - results.Messages[0].Adds.Should().Be(1); - results.Messages[1].Removes.Should().Be(1); - results.Messages[1].Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(results.Messages[1].Updates).IsEqualTo(0); } - [Fact] - public void OptionalSomeWithSameKeyCreatesUpdateChange() + [Test] + public async Task OptionalSomeWithSameKeyCreatesUpdateChange() { // having var optional1 = CreatePerson(0, "Name"); @@ -76,15 +67,15 @@ public void OptionalSomeWithSameKeyCreatesUpdateChange() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(1); - results.Messages.Count.Should().Be(2); - results.Messages[0].Adds.Should().Be(1); - results.Messages[1].Removes.Should().Be(0); - results.Messages[1].Updates.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(0); + await Assert.That(results.Messages[1].Updates).IsEqualTo(1); } - [Fact] - public void OptionalSomeWithSameReferenceCreatesNoChanges() + [Test] + public async Task OptionalSomeWithSameReferenceCreatesNoChanges() { // having var optional = CreatePerson(0, "Name"); @@ -95,15 +86,15 @@ public void OptionalSomeWithSameReferenceCreatesNoChanges() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(1); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(1); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void OptionalSomeWithSameCreatesNoChanges() + [Test] + public async Task OptionalSomeWithSameCreatesNoChanges() { // having var optional1 = CreatePerson(0, "Name"); @@ -115,15 +106,15 @@ public void OptionalSomeWithSameCreatesNoChanges() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(1); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(1); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void OptionalSomeWithDifferentKeyCreatesAddRemoveChanges() + [Test] + public async Task OptionalSomeWithDifferentKeyCreatesAddRemoveChanges() { // having var optional1 = CreatePerson(0, "Name"); @@ -135,23 +126,23 @@ public void OptionalSomeWithDifferentKeyCreatesAddRemoveChanges() using var results = observableChangeSet.AsAggregator(); // then - results.Data.Count.Should().Be(1); - results.Messages.Count.Should().Be(2); - results.Messages[0].Adds.Should().Be(1); - results.Messages[1].Removes.Should().Be(1); - results.Messages[1].Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(results.Messages[1].Updates).IsEqualTo(0); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ResultCompletesIfAndOnlyIfSourceCompletes(bool completeSource) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task ResultCompletesIfAndOnlyIfSourceCompletes(bool completeSource) { // having var optional = CreatePerson(0, "Name"); var optObservable = Observable.Return(optional); if (!completeSource) { - optObservable = optObservable.Concat(Observable.Never>()); + optObservable = optObservable.Concat(Observable.Never>()); } bool completed = false; @@ -159,13 +150,13 @@ public void ResultCompletesIfAndOnlyIfSourceCompletes(bool completeSource) using var results = optObservable.Subscribe(_ => { }, () => completed = true); // then - completed.Should().Be(completeSource); + await Assert.That(completed).IsEqualTo(completeSource); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ResultFailsIfAndOnlyIfSourceFails (bool failSource) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task ResultFailsIfAndOnlyIfSourceFails(bool failSource) { // having var optional = CreatePerson(0, "Name"); @@ -173,7 +164,7 @@ public void ResultFailsIfAndOnlyIfSourceFails (bool failSource) var testException = new Exception("Test"); if (failSource) { - optObservable = optObservable.Concat(Observable.Throw>(testException)); + optObservable = optObservable.Concat(Observable.Throw>(testException)); } var receivedError = default(Exception); @@ -181,10 +172,10 @@ public void ResultFailsIfAndOnlyIfSourceFails (bool failSource) using var results = optObservable.Subscribe(_ => { }, err => receivedError = err); // then - receivedError.Should().Be(failSource ? testException : default); + await Assert.That(receivedError).IsEqualTo(failSource ? testException : default); } - private static Optional CreatePerson(int id, string name) => Optional.Some(new Person(id, name)); + private static ReactiveUI.Primitives.Optional CreatePerson(int id, string name) => ReactiveUI.Primitives.Optional.Some(new Person(id, name)); private class PersonComparer : IEqualityComparer { diff --git a/src/DynamicData.Tests/Cache/EditDiffFixture.cs b/src/DynamicData.Tests/Cache/EditDiffFixture.cs index da98c9aa0..7606804d2 100644 --- a/src/DynamicData.Tests/Cache/EditDiffFixture.cs +++ b/src/DynamicData.Tests/Cache/EditDiffFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class EditDiffFixture : IDisposable @@ -22,36 +15,36 @@ public EditDiffFixture() _cache.AddOrUpdate(Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray()); } - [Fact] - public void Amends() + [Test] + public async Task Amends() { var newList = Enumerable.Range(5, 3).Select(i => new Person("Name" + i, i + 10)).ToArray(); _cache.EditDiff(newList, (current, previous) => Person.AgeComparer.Equals(current, previous)); - _cache.Count.Should().Be(3); + await Assert.That(_cache.Count).IsEqualTo(3); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(0); - lastChange.Updates.Should().Be(3); - lastChange.Removes.Should().Be(7); + await Assert.That(lastChange.Adds).IsEqualTo(0); + await Assert.That(lastChange.Updates).IsEqualTo(3); + await Assert.That(lastChange.Removes).IsEqualTo(7); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } - [Fact] - public void Amends_WithEqualityComparer() + [Test] + public async Task Amends_WithEqualityComparer() { var newList = Enumerable.Range(5, 3).Select(i => new Person("Name" + i, i + 10)).ToArray(); _cache.EditDiff(newList, Person.AgeComparer); - _cache.Count.Should().Be(3); + await Assert.That(_cache.Count).IsEqualTo(3); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(0); - lastChange.Updates.Should().Be(3); - lastChange.Removes.Should().Be(7); + await Assert.That(lastChange.Adds).IsEqualTo(0); + await Assert.That(lastChange.Updates).IsEqualTo(3); + await Assert.That(lastChange.Removes).IsEqualTo(7); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } public void Dispose() @@ -60,120 +53,120 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void EditWithSameData() + [Test] + public async Task EditWithSameData() { var newPeople = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newPeople, (current, previous) => Person.AgeComparer.Equals(current, previous)); - _cache.Count.Should().Be(10); - _cache.Items.Should().BeEquivalentTo(newPeople); - _result.Messages.Count.Should().Be(1); + await Assert.That(_cache.Count).IsEqualTo(10); + await Assert.That(_cache.Items).IsEquivalentTo(newPeople, Person.NameAgeGenderComparer); + await Assert.That(_result.Messages.Count).IsEqualTo(1); } - [Fact] - public void EditWithSameData_WithEqualityComparer() + [Test] + public async Task EditWithSameData_WithEqualityComparer() { var newPeople = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newPeople, Person.AgeComparer); - _cache.Count.Should().Be(10); - _cache.Items.Should().BeEquivalentTo(newPeople); + await Assert.That(_cache.Count).IsEqualTo(10); + await Assert.That(_cache.Items).IsEquivalentTo(newPeople, Person.NameAgeGenderComparer); var lastChange = _result.Messages.Last(); - _result.Messages.Count.Should().Be(1); + await Assert.That(_result.Messages.Count).IsEqualTo(1); } - [Fact] - public void New() + [Test] + public async Task New() { var newPeople = Enumerable.Range(1, 15).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newPeople, (current, previous) => Person.AgeComparer.Equals(current, previous)); - _cache.Count.Should().Be(15); - _cache.Items.Should().BeEquivalentTo(newPeople); + await Assert.That(_cache.Count).IsEqualTo(15); + await Assert.That(_cache.Items).IsEquivalentTo(newPeople, Person.NameAgeGenderComparer); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(5); + await Assert.That(lastChange.Adds).IsEqualTo(5); } - [Fact] - public void New_WithEqualityComparer() + [Test] + public async Task New_WithEqualityComparer() { var newPeople = Enumerable.Range(1, 15).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newPeople, Person.AgeComparer); - _cache.Count.Should().Be(15); - _cache.Items.Should().BeEquivalentTo(newPeople); + await Assert.That(_cache.Count).IsEqualTo(15); + await Assert.That(_cache.Items).IsEquivalentTo(newPeople, Person.NameAgeGenderComparer); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(5); + await Assert.That(lastChange.Adds).IsEqualTo(5); } - [Fact] - public void Removes() + [Test] + public async Task Removes() { var newList = Enumerable.Range(1, 7).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newList, (current, previous) => Person.AgeComparer.Equals(current, previous)); - _cache.Count.Should().Be(7); + await Assert.That(_cache.Count).IsEqualTo(7); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(0); - lastChange.Updates.Should().Be(0); - lastChange.Removes.Should().Be(3); + await Assert.That(lastChange.Adds).IsEqualTo(0); + await Assert.That(lastChange.Updates).IsEqualTo(0); + await Assert.That(lastChange.Removes).IsEqualTo(3); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } - [Fact] - public void Removes_WithEqualityComparer() + [Test] + public async Task Removes_WithEqualityComparer() { var newList = Enumerable.Range(1, 7).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newList, Person.AgeComparer); - _cache.Count.Should().Be(7); + await Assert.That(_cache.Count).IsEqualTo(7); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(0); - lastChange.Updates.Should().Be(0); - lastChange.Removes.Should().Be(3); + await Assert.That(lastChange.Adds).IsEqualTo(0); + await Assert.That(lastChange.Updates).IsEqualTo(0); + await Assert.That(lastChange.Removes).IsEqualTo(3); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } - [Fact] - public void VariousChanges() + [Test] + public async Task VariousChanges() { var newList = Enumerable.Range(6, 10).Select(i => new Person("Name" + i, i + 10)).ToArray(); _cache.EditDiff(newList, (current, previous) => Person.AgeComparer.Equals(current, previous)); - _cache.Count.Should().Be(10); + await Assert.That(_cache.Count).IsEqualTo(10); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(5); - lastChange.Updates.Should().Be(5); - lastChange.Removes.Should().Be(5); + await Assert.That(lastChange.Adds).IsEqualTo(5); + await Assert.That(lastChange.Updates).IsEqualTo(5); + await Assert.That(lastChange.Removes).IsEqualTo(5); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } - [Fact] - public void VariousChanges_WithEqualityComparer() + [Test] + public async Task VariousChanges_WithEqualityComparer() { var newList = Enumerable.Range(6, 10).Select(i => new Person("Name" + i, i + 10)).ToArray(); _cache.EditDiff(newList, Person.AgeComparer); - _cache.Count.Should().Be(10); + await Assert.That(_cache.Count).IsEqualTo(10); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(5); - lastChange.Updates.Should().Be(5); - lastChange.Removes.Should().Be(5); + await Assert.That(lastChange.Adds).IsEqualTo(5); + await Assert.That(lastChange.Updates).IsEqualTo(5); + await Assert.That(lastChange.Removes).IsEqualTo(5); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } } diff --git a/src/DynamicData.Tests/Cache/EnsureUniqueKeysFixture.cs b/src/DynamicData.Tests/Cache/EnsureUniqueKeysFixture.cs index fe2d05737..9cecf64fe 100644 --- a/src/DynamicData.Tests/Cache/EnsureUniqueKeysFixture.cs +++ b/src/DynamicData.Tests/Cache/EnsureUniqueKeysFixture.cs @@ -1,13 +1,8 @@ -using System; -using System.Linq; using DynamicData.Tests.Domain; -using FluentAssertions; -using Mono.Cecil; -using Xunit; namespace DynamicData.Tests.Cache; -public class EnsureUniqueKeysFixture: IDisposable +public class EnsureUniqueKeysFixture : IDisposable { private readonly ISourceCache _source; private readonly ChangeSetAggregator _results; @@ -18,9 +13,8 @@ public EnsureUniqueKeysFixture() _results = _source.Connect(suppressEmptyChangeSets: false).EnsureUniqueKeys().AsAggregator(); } - - [Fact] - public void UniqueForAdds() + [Test] + public async Task UniqueForAdds() { _source.Edit(innerCache => { @@ -30,13 +24,13 @@ public void UniqueForAdds() }); var message1 = _results.Messages[0]; - message1.Count.Should().Be(1); - message1.First().Current.Age.Should().Be(22); - message1.First().Reason.Should().Be(ChangeReason.Add); + await Assert.That(message1.Count).IsEqualTo(1); + await Assert.That(message1.First().Current.Age).IsEqualTo(22); + await Assert.That(message1.First().Reason).IsEqualTo(ChangeReason.Add); } - [Fact] - public void AddAndRemove() + [Test] + public async Task AddAndRemove() { _source.Edit(innerCache => { @@ -46,12 +40,12 @@ public void AddAndRemove() }); var message1 = _results.Messages[0]; - message1.Count.Should().Be(0); + await Assert.That(message1.Count).IsEqualTo(0); } - [Fact] - public void Refresh() + [Test] + public async Task Refresh() { _source.AddOrUpdate(new Person("Me", 20)); @@ -61,15 +55,14 @@ public void Refresh() }); var message1 = _results.Messages[1]; - message1.Count.Should().Be(1); - message1.First().Current.Age.Should().Be(20); - message1.First().Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(message1.Count).IsEqualTo(1); + await Assert.That(message1.First().Current.Age).IsEqualTo(20); + await Assert.That(message1.First().Reason).IsEqualTo(ChangeReason.Refresh); } - - [Fact] - public void CompoundRefresh1() + [Test] + public async Task CompoundRefresh1() { _source.Edit(innerCache => { @@ -78,14 +71,14 @@ public void CompoundRefresh1() }); var message1 = _results.Messages[0]; - message1.Count.Should().Be(1); - message1.First().Current.Age.Should().Be(20); - message1.First().Reason.Should().Be(ChangeReason.Add); + await Assert.That(message1.Count).IsEqualTo(1); + await Assert.That(message1.First().Current.Age).IsEqualTo(20); + await Assert.That(message1.First().Reason).IsEqualTo(ChangeReason.Add); } - [Fact] - public void CompoundRefresh2() + [Test] + public async Task CompoundRefresh2() { _source.Edit(innerCache => { @@ -96,14 +89,14 @@ public void CompoundRefresh2() }); var message1 = _results.Messages[0]; - message1.Count.Should().Be(1); - message1.First().Current.Age.Should().Be(21); - message1.First().Reason.Should().Be(ChangeReason.Add); + await Assert.That(message1.Count).IsEqualTo(1); + await Assert.That(message1.First().Current.Age).IsEqualTo(21); + await Assert.That(message1.First().Reason).IsEqualTo(ChangeReason.Add); } - [Fact] - public void CompoundRefresh3() + [Test] + public async Task CompoundRefresh3() { _source.AddOrUpdate(new Person("Me", 20)); @@ -116,13 +109,12 @@ public void CompoundRefresh3() }); var message1 = _results.Messages[1]; - message1.Count.Should().Be(1); - message1.First().Current.Age.Should().Be(20); - message1.First().Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(message1.Count).IsEqualTo(1); + await Assert.That(message1.First().Current.Age).IsEqualTo(20); + await Assert.That(message1.First().Reason).IsEqualTo(ChangeReason.Refresh); } - public void Dispose() { _source.Dispose(); diff --git a/src/DynamicData.Tests/Cache/ExceptFixture.cs b/src/DynamicData.Tests/Cache/ExceptFixture.cs index 17c4996e8..2a658e64b 100644 --- a/src/DynamicData.Tests/Cache/ExceptFixture.cs +++ b/src/DynamicData.Tests/Cache/ExceptFixture.cs @@ -1,19 +1,14 @@ -using System; -using System.Collections.Generic; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; +[InheritsTests] public class ExceptFixture : ExceptFixtureBase { protected override IObservable> CreateObservable() => _targetSource.Connect().Except(_exceptSource.Connect()); } +[InheritsTests] public class ExceptCollectionFixture : ExceptFixtureBase { protected override IObservable> CreateObservable() @@ -46,37 +41,37 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void DoNotIncludeExceptListItems() + [Test] + public async Task DoNotIncludeExceptListItems() { var person = new Person("Adult1", 50); _exceptSource.AddOrUpdate(person); _targetSource.AddOrUpdate(person); - _results.Messages.Count.Should().Be(0, "Should have no updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void RemovedAnItemFromExceptThenIncludesTheItem() + [Test] + public async Task RemovedAnItemFromExceptThenIncludesTheItem() { var person = new Person("Adult1", 50); _exceptSource.AddOrUpdate(person); _targetSource.AddOrUpdate(person); _exceptSource.Remove(person); - _results.Messages.Count.Should().Be(1, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); } - [Fact] - public void UpdatingOneSourceOnlyProducesResult() + [Test] + public async Task UpdatingOneSourceOnlyProducesResult() { var person = new Person("Adult1", 50); _targetSource.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForSource.cs b/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForSource.cs index ad88ee3a8..52d48eb4a 100644 --- a/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForSource.cs +++ b/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForSource.cs @@ -1,17 +1,6 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; using Bogus; -using FluentAssertions; -using Xunit; -using Xunit.Abstractions; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; @@ -19,13 +8,8 @@ public static partial class ExpireAfterFixture { public sealed class ForSource { - private readonly ITestOutputHelper _output; - - public ForSource(ITestOutputHelper output) - => _output = output; - - [Fact] - public void ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() + [Test] + public async Task ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() { using var source = CreateTestSource(); @@ -51,22 +35,22 @@ public void ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() source.RemoveKey(2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no items should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item1, item3, item4 }, "3 items were added, and one was removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no items should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item3, item4 }).Because("3 items were added, and one was removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues[0].Should().BeEquivalentTo(new[] { item1, item3 }.Select(item => new KeyValuePair(item.Id, item)), "items #1 and #3 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item4 }, "items #1 and #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues[0]).IsEquivalentTo(new[] { item1, item3 }.Select(item => new KeyValuePair(item.Id, item))).Because("items #1 and #3 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item4 }).Because("items #1 and #3 should have been removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() + [Test] + public async Task NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() { using var source = CreateTestSource(); @@ -88,52 +72,52 @@ public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() source.AddOrUpdate(item2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item2 }, "item #1 was added, and then replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2 }).Because("item #1 was added, and then replaced"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item2 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2 }).Because("no changes should have occurred"); // Shorten the expiration to an earlier time var item3 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.AddOrUpdate(item3); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item3 }, "item #1 was replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item3 }).Because("item #1 was replaced"); // One more update with no changes to the expiration var item4 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.AddOrUpdate(item4); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item4 }, "item #1 was replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item4 }).Because("item #1 was replaced"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues[0].Should().BeEquivalentTo(new[] { item4 }.Select(item => new KeyValuePair(item.Id, item4)), "item #1 should have expired"); - source.Items.Should().BeEmpty("item #1 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues[0]).IsEquivalentTo(new[] { item4 }.Select(item => new KeyValuePair(item.Id, item4))).Because("item #1 should have expired"); + await Assert.That(source.Items).IsEmpty().Because("item #1 should have expired"); scheduler.AdvanceTo(DateTimeOffset.MaxValue.Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEmpty().Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() + [Test] + public async Task PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() { using var source = CreateTestSource(); @@ -156,13 +140,13 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() scheduler.AdvanceBy(1); // Additional expirations at 20ms. - var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; - var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; + var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; + var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; source.AddOrUpdate(new[] { item6, item7 }); scheduler.AdvanceBy(1); // Out-of-order expiration - var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15)}; + var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.AddOrUpdate(item8); scheduler.AdvanceBy(1); @@ -188,91 +172,90 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() // Not testing Move changes, since ISourceCache doesn't actually provide an API to generate them. - // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }, "9 items were added, 2 were replaced, and 1 was refreshed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }).Because("9 items were added, 2 were replaced, and 1 was refreshed"); // Item scheduled to expire at 10ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }).Because("no changes should have occurred"); // Item scheduled to expire at 15ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }).Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues[0].Should().BeEquivalentTo(new[] { item1, item2, item6, item7, item8 }.Select(item => new KeyValuePair(item.Id, item)), "items #1, #2, #6, #7, and #8 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item3, item9, item10, item11 }, "items #1, #2, #6, #7, and #8 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues[0]).IsEquivalentTo(new[] { item1, item2, item6, item7, item8 }.Select(item => new KeyValuePair(item.Id, item))).Because("items #1, #2, #6, #7, and #8 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item3, item9, item10, item11 }).Because("items #1, #2, #6, #7, and #8 should have been removed"); // Item scheduled to expire at 30ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(30).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item3, item9, item10, item11 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item3, item9, item10, item11 }).Because("no changes should have occurred"); // Expired items should be polled, but should exclude the one that was changed from 40ms to 45ms. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(40).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(1).ElementAt(0).Should().BeEquivalentTo(new[] { item3 }.Select(item => new KeyValuePair(item.Id, item)), "item #3 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9, item10, item11 }, "item #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(1).ElementAt(0)).IsEquivalentTo(new[] { item3 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #3 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item10, item11 }).Because("item #3 should have been removed"); // Item scheduled to expire at 45ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(45).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(2).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9, item10, item11 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(2)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item10, item11 }).Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(60).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(2).ElementAt(0).Should().BeEquivalentTo(new[] { item10 }.Select(item => new KeyValuePair(item.Id, item)), "item #10 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9, item11 }, "item #10 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(2).ElementAt(0)).IsEquivalentTo(new[] { item10 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #10 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item11 }).Because("item #10 should have been removed"); // Expired items should be polled, but none should be found scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(80).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(3).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9, item11 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(3)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item11 }).Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(100).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(3).ElementAt(0).Should().BeEquivalentTo(new[] { item11 }.Select(item => new KeyValuePair(item.Id, item)), "item #11 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, "item #11 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(3).ElementAt(0)).IsEquivalentTo(new[] { item11 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #11 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }).Because("item #11 should have been removed"); // Next poll should not find anything to expire. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(120).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(4).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }).Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() + [Test] + public async Task PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() { using var source = CreateTestSource(); @@ -294,13 +277,13 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() scheduler.AdvanceBy(1); // Additional expirations at 20ms. - var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; - var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; + var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; + var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; source.AddOrUpdate(new[] { item6, item7 }); scheduler.AdvanceBy(1); // Out-of-order expiration - var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15)}; + var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.AddOrUpdate(item8); scheduler.AdvanceBy(1); @@ -326,73 +309,72 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() // Not testing Move changes, since ISourceCache doesn't actually provide an API to generate them. - // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }, "11 items were added, 2 were replaced, and 1 was refreshed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }).Because("11 items were added, 2 were replaced, and 1 was refreshed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues[0].Should().BeEquivalentTo(new[] { item1 }.Select(item => new KeyValuePair(item.Id, item)), "item #1 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item2, item3, item6, item7, item8, item9, item10, item11 }, "item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues[0]).IsEquivalentTo(new[] { item1 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #1 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2, item3, item6, item7, item8, item9, item10, item11 }).Because("item #1 should have been removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(1).ElementAt(0).Should().BeEquivalentTo(new[] { item8 }.Select(item => new KeyValuePair(item.Id, item)), "item #8 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item2, item3, item6, item7, item9, item10, item11 }, "item #8 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(1).ElementAt(0)).IsEquivalentTo(new[] { item8 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #8 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2, item3, item6, item7, item9, item10, item11 }).Because("item #8 should have expired"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(2).ElementAt(0).Should().BeEquivalentTo(new[] { item2, item6, item7 }.Select(item => new KeyValuePair(item.Id, item)), "items #2, #6, and #7 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item3, item9, item10, item11 }, "items #2, #6, and #7 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(2).ElementAt(0)).IsEquivalentTo(new[] { item2, item6, item7 }.Select(item => new KeyValuePair(item.Id, item))).Because("items #2, #6, and #7 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item3, item9, item10, item11 }).Because("items #2, #6, and #7 should have been removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(30).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(3).ElementAt(0).Should().BeEquivalentTo(new[] { item3 }.Select(item => new KeyValuePair(item.Id, item)), "item #3 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9, item10, item11 }, "item #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(3).ElementAt(0)).IsEquivalentTo(new[] { item3 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #3 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item10, item11 }).Because("item #3 should have been removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(40).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(4).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9, item10, item11 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item10, item11 }).Because("no changes should have occurred"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(45).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(4).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(4).ElementAt(0).Should().BeEquivalentTo(new[] { item10 }.Select(item => new KeyValuePair(item.Id, item)), "item #10 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9, item11 }, "item #10 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(4).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(4).ElementAt(0)).IsEquivalentTo(new[] { item10 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #10 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9, item11 }).Because("item #10 should have expired"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(50).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(5).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(5).ElementAt(0).Should().BeEquivalentTo(new[] { item11 }.Select(item => new KeyValuePair(item.Id, item)), "item #11 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, "item #11 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(5).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(5).ElementAt(0)).IsEquivalentTo(new[] { item11 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #11 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }).Because("item #11 should have expired"); // Remaining item should never expire scheduler.AdvanceTo(DateTimeOffset.MaxValue.Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(6).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(6)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }).Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } // Covers https://github.com/reactivemarbles/DynamicData/issues/716 - [Fact] - public void SchedulerIsInaccurate_RemovalsAreNotSkipped() + [Test] + public async Task SchedulerIsInaccurate_RemovalsAreNotSkipped() { using var source = CreateTestSource(); @@ -411,23 +393,22 @@ public void SchedulerIsInaccurate_RemovalsAreNotSkipped() var item1 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(10) }; source.AddOrUpdate(item1); - - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); scheduler.SimulateUntilIdle(inaccuracyOffset: TimeSpan.FromMilliseconds(-1)); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues[0].Should().BeEquivalentTo(new[] { item1 }.Select(item => new KeyValuePair(item.Id, item)), "item #1 should have expired"); - source.Items.Should().BeEmpty("item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues[0]).IsEquivalentTo(new[] { item1 }.Select(item => new KeyValuePair(item.Id, item))).Because("item #1 should have expired"); + await Assert.That(source.Items).IsEmpty().Because("item #1 should have been removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void SourceCompletes_CompletionIsPropagated() + [Test] + public async Task SourceCompletes_CompletionIsPropagated() { using var source = CreateTestSource(); @@ -445,16 +426,16 @@ public void SourceCompletes_CompletionIsPropagated() source.Complete(); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsTrue(); // Ensure that the operator does not attept to continue removing items. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); } - [Fact] - public void SourceCompletesImmediately_CompletionIsPropagated() + [Test] + public async Task SourceCompletesImmediately_CompletionIsPropagated() { using var source = CreateTestSource(); @@ -473,14 +454,14 @@ public void SourceCompletesImmediately_CompletionIsPropagated() .ValidateSynchronization() .RecordValues(out var results, scheduler); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeTrue(); - source.Items.Should().BeEquivalentTo(new[] { item1 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1 }).Because("no changes should have occurred"); } - [Fact] - public void SourceErrors_ErrorIsPropagated() + [Test] + public async Task SourceErrors_ErrorIsPropagated() { using var source = CreateTestSource(); @@ -499,16 +480,16 @@ public void SourceErrors_ErrorIsPropagated() var error = new Exception("This is a test"); source.SetError(error); - results.Error.Should().Be(error, "an error was published"); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error).Because("an error was published"); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); // Ensure that the operator does not attept to continue removing items. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); } - [Fact] - public void SourceErrorsImmediately_ErrorIsPropagated() + [Test] + public async Task SourceErrorsImmediately_ErrorIsPropagated() { using var source = CreateTestSource(); @@ -528,24 +509,23 @@ public void SourceErrorsImmediately_ErrorIsPropagated() .ValidateSynchronization() .RecordValues(out var results, scheduler); - results.Error.Should().Be(error, "an error was published"); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); - source.Items.Should().BeEquivalentTo(new[] { item1 }, "no changes should have occurred"); + await Assert.That(results.Error).IsEqualTo(error).Because("an error was published"); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1 }).Because("no changes should have occurred"); // Ensure that the operator does not attept to continue removing items. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.ExpireAfter( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.ExpireAfter( source: (null as ISourceCache)!, timeSelector: static _ => default, - pollingInterval: null)) - .Should().Throw(); + pollingInterval: null)).Throws(); - [Fact] + [Test] public async Task ThreadPoolSchedulerIsUsedWithoutPolling_ExpirationIsThreadSafe() { using var source = new TestSourceCache(static item => item.Id); @@ -568,15 +548,15 @@ public async Task ThreadPoolSchedulerIsUsedWithoutPolling_ExpirationIsThreadSafe await WaitForCompletionAsync(source, results, timeout: TimeSpan.FromMinutes(1)); - results.Error.Should().BeNull(); - results.RecordedValues.SelectMany(static removals => removals).Should().AllSatisfy(static pair => pair.Value.Lifetime.Should().NotBeNull("only items with an expiration should have expired")); - results.HasCompleted.Should().BeFalse(); - source.Items.Should().AllSatisfy(item => item.Lifetime.Should().BeNull("all items with an expiration should have expired")); + await Assert.That(results.Error).IsNull(); + foreach (var pair in results.RecordedValues.SelectMany(static removals => removals)) { await Assert.That(pair.Value.Lifetime).IsNotNull().Because("only items with an expiration should have expired"); } + await Assert.That(results.HasCompleted).IsFalse(); + foreach (var item in source.Items) { await Assert.That(item.Lifetime).IsNull().Because("all items with an expiration should have expired"); } - _output.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); + TestContext.Current?.OutputWriter.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); } - [Fact] + [Test] public async Task ThreadPoolSchedulerIsUsedWithPolling_ExpirationIsThreadSafe() { using var source = new TestSourceCache(static item => item.Id); @@ -600,23 +580,22 @@ public async Task ThreadPoolSchedulerIsUsedWithPolling_ExpirationIsThreadSafe() await WaitForCompletionAsync(source, results, timeout: TimeSpan.FromMinutes(1)); - results.Error.Should().BeNull(); - results.RecordedValues.SelectMany(static removals => removals).Should().AllSatisfy(pair => pair.Value.Lifetime.Should().NotBeNull("only items with an expiration should have expired")); - results.HasCompleted.Should().BeFalse(); - source.Items.Should().AllSatisfy(item => item.Lifetime.Should().BeNull("all items with an expiration should have expired")); + await Assert.That(results.Error).IsNull(); + foreach (var pair in results.RecordedValues.SelectMany(static removals => removals)) { await Assert.That(pair.Value.Lifetime).IsNotNull().Because("only items with an expiration should have expired"); } + await Assert.That(results.HasCompleted).IsFalse(); + foreach (var item in source.Items) { await Assert.That(item.Lifetime).IsNull().Because("all items with an expiration should have expired"); } - _output.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); + TestContext.Current?.OutputWriter.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); } - [Fact] - public void TimeSelectorIsNull_ThrowsException() - => FluentActions.Invoking(() => CreateTestSource().ExpireAfter( + [Test] + public async Task TimeSelectorIsNull_ThrowsException() + => await Assert.That(() => CreateTestSource().ExpireAfter( timeSelector: null!, - pollingInterval: null)) - .Should().Throw(); + pollingInterval: null)).Throws(); - [Fact] - public void TimeSelectorThrows_ErrorIsPropagated() + [Test] + public async Task TimeSelectorThrows_ErrorIsPropagated() { using var source = CreateTestSource(); @@ -634,9 +613,9 @@ public void TimeSelectorThrows_ErrorIsPropagated() source.AddOrUpdate(new TestItem() { Id = 1 }); scheduler.AdvanceBy(1); - results.Error.Should().Be(error); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); } private static TestSourceCache CreateTestSource() @@ -678,12 +657,12 @@ private static void PerformStressEdits( }; var randomizer = new Randomizer(1234567); - + var items = Enumerable.Range(1, editCount * maxChangeCount) .Select(id => new StressItem() { - Id = id, - Lifetime = randomizer.Bool() + Id = id, + Lifetime = randomizer.Bool() ? TimeSpan.FromTicks(randomizer.Long(minItemLifetime.Ticks, maxItemLifetime.Ticks)) : null }) @@ -700,8 +679,8 @@ private static void PerformStressEdits( { var changeReason = randomizer.WeightedRandom(changeReasons, updater.Count switch { - 0 => changeReasonWeightsWhenCountIs0, - _ => changeReasonWeightsOtherwise + 0 => changeReasonWeightsWhenCountIs0, + _ => changeReasonWeightsOtherwise }); switch (changeReason) @@ -721,8 +700,8 @@ private static void PerformStressEdits( case ChangeReason.Update: updater.AddOrUpdate(new StressItem() { - Id = updater.Keys.ElementAt(randomizer.Int(0, updater.Count - 1)), - Lifetime = randomizer.Bool() + Id = updater.Keys.ElementAt(randomizer.Int(0, updater.Count - 1)), + Lifetime = randomizer.Bool() ? TimeSpan.FromTicks(randomizer.Long(minItemLifetime.Ticks, maxItemLifetime.Ticks)) : null }); diff --git a/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForStream.cs b/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForStream.cs index 868fad2fd..df58804ac 100644 --- a/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForStream.cs +++ b/src/DynamicData.Tests/Cache/ExpireAfterFixture.ForStream.cs @@ -1,18 +1,6 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; using Bogus; -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; @@ -20,10 +8,10 @@ public static partial class ExpireAfterFixture { public sealed class ForStream { - [Fact] - public void ExpiredItemIsRemoved_RemovalIsSkipped() + [Test] + public async Task ExpiredItemIsRemoved_RemovalIsSkipped() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -46,15 +34,15 @@ public void ExpiredItemIsRemoved_RemovalIsSkipped() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were added"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3 }, "item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3 }).Because("item #1 should have been removed"); // Send a notification to remove an item that's already been removed source.OnNext(new ChangeSet() @@ -63,16 +51,16 @@ public void ExpiredItemIsRemoved_RemovalIsSkipped() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() + [Test] + public async Task ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -108,23 +96,23 @@ public void ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(3, "3 source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item3, item4 }, "3 items were added, and one was removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(3).Because("3 source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item3, item4 }).Because("3 items were added, and one was removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4 }, "items #1 and #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4 }).Because("items #1 and #3 should have been removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() + [Test] + public async Task NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -151,14 +139,14 @@ public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(2, "2 source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2 }, "item #1 was added, and then replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("2 source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2 }).Because("item #1 was added, and then replaced"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no expirations should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no expirations should have occurred"); // Shorten the expiration to an earlier time var item3 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; @@ -168,9 +156,9 @@ public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item3 }, "item #1 was replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item3 }).Because("item #1 was replaced"); // One more update with no changes to the expiration var item4 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; @@ -180,28 +168,28 @@ public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4 }, "item #1 was replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4 }).Because("item #1 was replaced"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEmpty("item #1 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("item #1 should have expired"); scheduler.AdvanceTo(DateTimeOffset.MaxValue.Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Should().BeEmpty("no expirations should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5)).IsEmpty().Because("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() + [Test] + public async Task PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -230,8 +218,8 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() scheduler.AdvanceBy(1); // Additional expirations at 20ms. - var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; - var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; + var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; + var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: item6.Id, current: item6, index: 5), @@ -240,7 +228,7 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() scheduler.AdvanceBy(1); // Out-of-order expiration - var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15)}; + var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: item8.Id, current: item8, index: 7) @@ -287,88 +275,87 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() new(reason: ChangeReason.Moved, key: item1.Id, current: item1, previous: default, currentIndex: 4, previousIndex: 1) }); - // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(7, "8 source operations were performed, and 1 should have been ignored"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }, "9 items were added, 2 were replaced, and 1 was refreshed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(7).Because("8 source operations were performed, and 1 should have been ignored"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }).Because("9 items were added, 2 were replaced, and 1 was refreshed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); // Item scheduled to expire at 10ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(7).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(7)).IsEmpty().Because("no changes should have occurred"); // Item scheduled to expire at 15ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(7).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(7)).IsEmpty().Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(7).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item3, item9, item10, item11 }, "items #1, #2, #6, #7, and #8 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(7).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item3, item9, item10, item11 }).Because("items #1, #2, #6, #7, and #8 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); // Item scheduled to expire at 30ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(30).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(8).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(8)).IsEmpty().Because("no changes should have occurred"); // Expired items should be polled, but should exclude the one that was changed from 40ms to 45ms. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(40).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(8).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item9, item10, item11 }, "item #3 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(8).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item9, item10, item11 }).Because("item #3 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); // Item scheduled to expire at 45ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(45).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(9).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(9)).IsEmpty().Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(60).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(9).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item9, item11 }, "item #10 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(9).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item9, item11 }).Because("item #10 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); // Expired items should be polled, but none should be found scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(80).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(10).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(10)).IsEmpty().Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(100).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(10).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item9 }, "item #11 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(10).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item9 }).Because("item #11 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); // Next poll should not find anything to expire. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(120).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(11).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(11)).IsEmpty().Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() + [Test] + public async Task PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -396,8 +383,8 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() scheduler.AdvanceBy(1); // Additional expirations at 20ms. - var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; - var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; + var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; + var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: item6.Id, current: item6, index: 5), @@ -406,7 +393,7 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() scheduler.AdvanceBy(1); // Out-of-order expiration - var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15)}; + var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: item8.Id, current: item8, index: 7) @@ -453,73 +440,72 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() new(reason: ChangeReason.Moved, key: item1.Id, current: item1, previous: default, currentIndex: 4, previousIndex: 1) }); - // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(7, "8 source operations were performed, and 1 should have been ignored"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }, "11 items were added, 2 were replaced, and 1 was refreshed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(7).Because("8 source operations were performed, and 1 should have been ignored"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3, item6, item7, item8, item9, item10, item11 }).Because("11 items were added, 2 were replaced, and 1 was refreshed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(7).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3, item6, item7, item8, item9, item10, item11 }, "item #1 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(7).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3, item6, item7, item8, item9, item10, item11 }).Because("item #1 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(8).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3, item6, item7, item9, item10, item11 }, "item #8 should have expired"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(8).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3, item6, item7, item9, item10, item11 }).Because("item #8 should have expired"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(9).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item3, item9, item10, item11 }, "items #2, #6, and #7 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(9).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item3, item9, item10, item11 }).Because("items #2, #6, and #7 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(30).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(10).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item9, item10, item11 }, "item #3 should have been removed"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(10).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item9, item10, item11 }).Because("item #3 should have been removed"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(40).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(11).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(11)).IsEmpty().Because("no changes should have occurred"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(45).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(11).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item9, item11 }, "item #10 should have expired"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(11).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item9, item11 }).Because("item #10 should have expired"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(50).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(12).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item9 }, "item #11 should have expired"); - results.RecordedItemsSorted.Should().BeEmpty(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(12).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item9 }).Because("item #11 should have expired"); + await Assert.That(results.RecordedItemsSorted).IsEmpty(); // Remaining item should never expire scheduler.AdvanceTo(DateTimeOffset.MaxValue.Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(13).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(13)).IsEmpty().Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void RemovalsArePending_CompletionWaitsForRemovals() + [Test] + public async Task RemovalsArePending_CompletionWaitsForRemovals() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -543,35 +529,35 @@ public void RemovalsArePending_CompletionWaitsForRemovals() scheduler.AdvanceBy(1); // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were added"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3 }, "item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3 }).Because("item #1 should have been removed"); source.OnCompleted(); - results.Error.Should().BeNull(); - results.HasCompleted.Should().BeFalse("removals are pending"); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse().Because("removals are pending"); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no changes should have occurred"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.HasCompleted.Should().BeTrue(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2 }, "item #3 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2 }).Because("item #3 should have expired"); } // Covers https://github.com/reactivemarbles/DynamicData/issues/716 - [Fact] - public void SchedulerIsInaccurate_RemovalsAreNotSkipped() + [Test] + public async Task SchedulerIsInaccurate_RemovalsAreNotSkipped() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = new FakeScheduler() { @@ -592,24 +578,23 @@ public void SchedulerIsInaccurate_RemovalsAreNotSkipped() new(reason: ChangeReason.Add, key: item1.Id, current: item1) }); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); scheduler.SimulateUntilIdle(inaccuracyOffset: TimeSpan.FromMilliseconds(-1)); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEmpty("item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("item #1 should have been removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void SourceCompletes_CompletionIsPropagated() + [Test] + public async Task SourceCompletes_CompletionIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -631,20 +616,20 @@ public void SourceCompletes_CompletionIsPropagated() new(reason: ChangeReason.Add, key: item3.Id, current: item3) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were added"); source.OnCompleted(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no changes should have occurred"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.HasCompleted).IsTrue(); } - [Fact] - public void SourceCompletesImmediately_CompletionIsPropagated() + [Test] + public async Task SourceCompletesImmediately_CompletionIsPropagated() { var item1 = new TestItem() { Id = 1 }; var item2 = new TestItem() { Id = 2 }; @@ -674,17 +659,17 @@ public void SourceCompletesImmediately_CompletionIsPropagated() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results, scheduler); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were added"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.HasCompleted).IsTrue(); } - [Fact] - public void SourceErrors_ErrorIsPropagated() + [Test] + public async Task SourceErrors_ErrorIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -703,24 +688,24 @@ public void SourceErrors_ErrorIsPropagated() }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operations was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operations was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); var error = new Exception("This is a test"); source.OnError(error); - results.Error.Should().Be(error); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no changes should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("notifications should not get published after an error"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("notifications should not get published after an error"); } - [Fact] - public void SourceErrorsImmediately_ErrorIsPropagated() + [Test] + public async Task SourceErrorsImmediately_ErrorIsPropagated() { var item1 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(10) }; @@ -748,27 +733,26 @@ public void SourceErrorsImmediately_ErrorIsPropagated() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results, scheduler); - results.Error.Should().Be(error); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operations was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operations was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); + await Assert.That(results.HasCompleted).IsFalse(); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("notifications should not get published after an error"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("notifications should not get published after an error"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.ExpireAfter( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.ExpireAfter( source: (null as IObservable>)!, - timeSelector: static _ => default)) - .Should().Throw(); + timeSelector: static _ => default)).Throws(); - [Fact] + [Test] public async Task ThreadPoolSchedulerIsUsedWithoutPolling_ExpirationIsThreadSafe() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = ThreadPoolScheduler.Instance; @@ -789,16 +773,16 @@ public async Task ThreadPoolSchedulerIsUsedWithoutPolling_ExpirationIsThreadSafe await WaitForCompletionAsync(results, timeout: TimeSpan.FromMinutes(1)); - results.Error.Should().BeNull(); - results.RecordedItemsByKey.Values.Should().AllSatisfy(item => item.Lifetime.Should().BeNull("all items with an expiration should have expired")); + await Assert.That(results.Error).IsNull(); + foreach (var item in results.RecordedItemsByKey.Values) { await Assert.That(item.Lifetime).IsNull().Because("all items with an expiration should have expired"); } - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] + [Test] public async Task ThreadPoolSchedulerIsUsedWithPolling_ExpirationIsThreadSafe() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = ThreadPoolScheduler.Instance; @@ -822,22 +806,21 @@ public async Task ThreadPoolSchedulerIsUsedWithPolling_ExpirationIsThreadSafe() var now = scheduler.Now; - results.Error.Should().BeNull(); - results.RecordedItemsByKey.Values.Should().AllSatisfy(item => item.Lifetime.Should().BeNull("all items with an expiration should have expired")); + await Assert.That(results.Error).IsNull(); + foreach (var item in results.RecordedItemsByKey.Values) { await Assert.That(item.Lifetime).IsNull().Because("all items with an expiration should have expired"); } - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void TimeSelectorIsNull_ThrowsException() - => FluentActions.Invoking(() => new Subject>().ExpireAfter( - timeSelector: null!)) - .Should().Throw(); + [Test] + public async Task TimeSelectorIsNull_ThrowsException() + => await Assert.That(() => new ReactiveUI.Primitives.Signals.Signal>().ExpireAfter( + timeSelector: null!)).Throws(); - [Fact] - public void TimeSelectorThrows_ErrorIsPropagated() + [Test] + public async Task TimeSelectorThrows_ErrorIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = CreateTestScheduler(); @@ -858,9 +841,9 @@ public void TimeSelectorThrows_ErrorIsPropagated() }); scheduler.AdvanceBy(1); - results.Error.Should().Be(error); - results.RecordedChangeSets.Should().BeEmpty("no source operations should have been processed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations should have been processed"); + await Assert.That(results.HasCompleted).IsFalse(); } private static void PublishStressChangeSets( @@ -913,22 +896,22 @@ private static void PublishStressChangeSets( { var changeReason = randomizer.WeightedRandom(changeReasons, cache.Count switch { - 0 => changeReasonWeightsWhenCountIs0, - _ => changeReasonWeightsOtherwise + 0 => changeReasonWeightsWhenCountIs0, + _ => changeReasonWeightsOtherwise }); switch (changeReason) { case ChangeReason.Add: cache.AddOrUpdate( - item: new StressItem() + item: new StressItem() { - Id = nextItemId, - Lifetime = randomizer.Bool() + Id = nextItemId, + Lifetime = randomizer.Bool() ? TimeSpan.FromTicks(randomizer.Long(minItemLifetime.Ticks, maxItemLifetime.Ticks)) : null }, - key: nextItemId); + key: nextItemId); ++nextItemId; break; @@ -943,14 +926,14 @@ private static void PublishStressChangeSets( case ChangeReason.Update: var id = cache.Keys.ElementAt(randomizer.Int(0, cache.Count - 1)); cache.AddOrUpdate( - item: new StressItem() + item: new StressItem() { - Id = id, - Lifetime = randomizer.Bool() + Id = id, + Lifetime = randomizer.Bool() ? TimeSpan.FromTicks(randomizer.Long(minItemLifetime.Ticks, maxItemLifetime.Ticks)) : null }, - key: id); + key: id); break; } } @@ -958,10 +941,10 @@ private static void PublishStressChangeSets( changeSets.Add(cache.CaptureChanges()); } - foreach(var changeSet in changeSets) + foreach (var changeSet in changeSets) source.OnNext(changeSet); } - + private static async Task WaitForCompletionAsync( CacheItemRecordingObserver results, TimeSpan timeout) @@ -976,7 +959,7 @@ private static async Task WaitForCompletionAsync( await Task.Delay(pollingInterval); // Identify "completion" as either an error, a completion signal, or all expiring items being removed. - if ((results.Error is not null) + if ((results.Error is not null) || results.HasCompleted || results.RecordedItemsByKey.Values.All(static item => item.Lifetime is null)) { diff --git a/src/DynamicData.Tests/Cache/ExpireAfterFixture.cs b/src/DynamicData.Tests/Cache/ExpireAfterFixture.cs index f701d6a38..c5b2ee2d8 100644 --- a/src/DynamicData.Tests/Cache/ExpireAfterFixture.cs +++ b/src/DynamicData.Tests/Cache/ExpireAfterFixture.cs @@ -1,8 +1,3 @@ -using System; -using System.Reactive.Concurrency; - -using Microsoft.Reactive.Testing; - namespace DynamicData.Tests.Cache; public static partial class ExpireAfterFixture diff --git a/src/DynamicData.Tests/Cache/FactoryCoverageFixture.cs b/src/DynamicData.Tests/Cache/FactoryCoverageFixture.cs new file mode 100644 index 000000000..2b67408b4 --- /dev/null +++ b/src/DynamicData.Tests/Cache/FactoryCoverageFixture.cs @@ -0,0 +1,257 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive; +#endif +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.Cache; + +public class FactoryCoverageFixture +{ + [Test] + public async Task CacheActionFactoryPublishesItemsAndRunsDisposeAction() + { + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var first = new Person("Alpha", 1); + var second = new Person("Beta", 2); + + var changes = ObservableChangeSet.Create( + cache => + { + cache.AddOrUpdate(new[] { first, second }); + return () => disposed.TrySetResult(); + }, + static person => person.Name); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + var itemsByKey = changeSet.ToDictionary(static change => change.Key, static change => change.Current); + + await Assert.That(itemsByKey[first.Name]).IsSameReferenceAs(first); + await Assert.That(itemsByKey[second.Name]).IsSameReferenceAs(second); + + subscription.Dispose(); + + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task CacheAsyncDisposableFactoryPublishesItemsAndDisposesReturnedResource() + { + var allowReturn = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var returned = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var person = new Person("Async", 3); + + var changes = ObservableChangeSet.Create( + async (cache, _) => + { + cache.AddOrUpdate(person); + await allowReturn.Task; + returned.TrySetResult(); + return Disposable.Create(() => disposed.TrySetResult()); + }, + static item => item.Name); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(changeSet.Single().Current).IsSameReferenceAs(person); + + allowReturn.SetResult(); + await returned.Task.WaitAsync(TimeSpan.FromSeconds(10)); + subscription.Dispose(); + + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task CacheAsyncActionFactoryPropagatesErrors() + { + var error = new InvalidOperationException("cache failed"); + var allowError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async (cache, _) => + { + cache.AddOrUpdate(new Person("BeforeError", 4)); + await allowError.Task; + throw error; + }, + static item => item.Name); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value), error => receivedError.TrySetResult(error)); + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(changeSet.Single().Key).IsEqualTo("BeforeError"); + + allowError.SetResult(); + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(observed).IsSameReferenceAs(error); + } + + [Test] + public async Task CacheAsyncFactoryDisposalCancelsToken() + { + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var cancelled = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var notifications = 0; + + var changes = ObservableChangeSet.Create( + async (cache, token) => + { + try + { + started.TrySetResult(token); + using var registration = token.Register(static state => ((TaskCompletionSource)state!).TrySetResult(), cancelled); + await Task.Delay(Timeout.InfiniteTimeSpan, token); + cache.AddOrUpdate(new Person("Never", 5)); + } + finally + { + exited.TrySetResult(); + } + }, + static item => item.Name); + + using var subscription = changes.Subscribe( + _ => Interlocked.Increment(ref notifications), + _ => Interlocked.Increment(ref notifications), + () => Interlocked.Increment(ref notifications)); + + var token = await started.Task.WaitAsync(TimeSpan.FromSeconds(10)); + subscription.Dispose(); + await cancelled.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(token.CanBeCanceled).IsTrue(); + await Assert.That(token.IsCancellationRequested).IsTrue(); + await Assert.That(Volatile.Read(ref notifications)).IsEqualTo(0); + } + + [Test] + public async Task ListActionFactoryPublishesItemsAndRunsDisposeAction() + { + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + list => + { + list.AddRange(new[] { 1, 2, 3 }); + return () => disposed.TrySetResult(); + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 1, 2, 3 }); + + subscription.Dispose(); + + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListAsyncDisposableFactoryPublishesItemsAndDisposesReturnedResource() + { + var allowReturn = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var returned = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async (list, _) => + { + list.AddRange(new[] { 7, 8 }); + await allowReturn.Task; + returned.TrySetResult(); + return Disposable.Create(() => disposed.TrySetResult()); + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 7, 8 }); + + allowReturn.SetResult(); + await returned.Task.WaitAsync(TimeSpan.FromSeconds(10)); + subscription.Dispose(); + + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListAsyncActionFactoryPropagatesErrors() + { + var error = new InvalidOperationException("list failed"); + var allowError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async (list, _) => + { + list.AddRange(new[] { 11, 12 }); + await allowError.Task; + throw error; + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value), error => receivedError.TrySetResult(error)); + + allowError.SetResult(); + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(observed).IsSameReferenceAs(error); + await Assert.That(received.Task.IsCompleted).IsFalse().Because("the list async factory does not publish pending list edits before the async delegate terminates with an error"); + } + + [Test] + public async Task ListAsyncFactoryDisposalCancelsToken() + { + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var cancelled = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var notifications = 0; + + var changes = ObservableChangeSet.Create( + async (list, token) => + { + try + { + started.TrySetResult(token); + using var registration = token.Register(static state => ((TaskCompletionSource)state!).TrySetResult(), cancelled); + await Task.Delay(Timeout.InfiniteTimeSpan, token); + list.Add(1); + } + finally + { + exited.TrySetResult(); + } + }); + + using var subscription = changes.Subscribe( + _ => Interlocked.Increment(ref notifications), + _ => Interlocked.Increment(ref notifications), + () => Interlocked.Increment(ref notifications)); + + var token = await started.Task.WaitAsync(TimeSpan.FromSeconds(10)); + subscription.Dispose(); + await cancelled.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(token.CanBeCanceled).IsTrue(); + await Assert.That(token.IsCancellationRequested).IsTrue(); + await Assert.That(Volatile.Read(ref notifications)).IsEqualTo(0); + } + + private static IEnumerable GetCurrentItems(IChangeSet changeSet) => + changeSet.SelectMany(static change => change.Range.Count == 0 ? Enumerable.Repeat(change.Item.Current, 1) : change.Range); +} diff --git a/src/DynamicData.Tests/Cache/FactoryEdgeCoverageFixture.cs b/src/DynamicData.Tests/Cache/FactoryEdgeCoverageFixture.cs new file mode 100644 index 000000000..c1c631a57 --- /dev/null +++ b/src/DynamicData.Tests/Cache/FactoryEdgeCoverageFixture.cs @@ -0,0 +1,387 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive; +using DynamicData.Reactive.Cache.Internal; +#else +using DynamicData.Cache.Internal; +#endif + +namespace DynamicData.Tests.Cache; + +public class FactoryEdgeCoverageFixture +{ + [Test] + public async Task CacheTaskFactoryPublishesWhileDelegateIsAwaitingAndResumesAfterGate() + { + var allowReturn = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async cache => + { + try + { + cache.AddOrUpdate(42); + await allowReturn.Task; + } + finally + { + exited.TrySetResult(); + } + }, + static value => value); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + try + { + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(changeSet.Single().Current).IsEqualTo(42); + } + finally + { + allowReturn.TrySetResult(); + } + + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task CacheTaskFactoryPropagatesErrorsAfterPublishingPendingEdits() + { + var error = new InvalidOperationException("cache task failed"); + var allowError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async cache => + { + try + { + cache.AddOrUpdate(7); + await allowError.Task; + throw error; + } + finally + { + exited.TrySetResult(); + } + }, + static value => value); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value), failure => receivedError.TrySetResult(failure)); + + try + { + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(changeSet.Single().Current).IsEqualTo(7); + } + finally + { + allowError.TrySetResult(); + } + + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(observed).IsSameReferenceAs(error); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task CacheCancellableTaskFactoryPropagatesErrorsAfterPublishingPendingEdits() + { + var error = new InvalidOperationException("cache cancellable task failed"); + var allowError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async (cache, _) => + { + try + { + cache.AddOrUpdate(9); + await allowError.Task; + throw error; + } + finally + { + exited.TrySetResult(); + } + }, + static value => value); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value), failure => receivedError.TrySetResult(failure)); + + try + { + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(changeSet.Single().Current).IsEqualTo(9); + } + finally + { + allowError.TrySetResult(); + } + + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(observed).IsSameReferenceAs(error); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListDisposableFactoryPublishesItemsAndDisposesReturnedResource() + { + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + list => + { + list.AddRange(new[] { 1, 2 }); + return Disposable.Create(() => disposed.TrySetResult()); + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 1, 2 }); + + subscription.Dispose(); + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListDisposableFactoryPropagatesSubscribeErrors() + { + var error = new InvalidOperationException("list disposable failed"); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + Func, IDisposable> subscribe = + list => + { + list.Add(1); + throw error; + }; + var changes = ObservableChangeSet.Create(subscribe); + + using var subscription = changes.Subscribe(_ => { }, failure => receivedError.TrySetResult(failure)); + + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(observed).IsSameReferenceAs(error); + } + + [Test] + public async Task ListTaskDisposableFactoryWrapperPublishesItemsAndDisposesReturnedResource() + { + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async list => + { + list.AddRange(new[] { 3, 4 }); + await Task.Yield(); + return Disposable.Create(() => disposed.TrySetResult()); + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 3, 4 }); + + subscription.Dispose(); + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListTaskActionFactoryWrapperPublishesItemsAndRunsReturnedCleanup() + { + var disposed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async list => + { + list.AddRange(new[] { 5, 6 }); + await Task.Yield(); + return () => disposed.TrySetResult(); + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 5, 6 }); + + subscription.Dispose(); + await disposed.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListTaskFactoryPublishesWhileDelegateIsAwaitingAndPropagatesErrors() + { + var error = new InvalidOperationException("list task failed"); + var allowError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async list => + { + try + { + list.AddRange(new[] { 7, 8 }); + await allowError.Task; + throw error; + } + finally + { + exited.TrySetResult(); + } + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value), failure => receivedError.TrySetResult(failure)); + + try + { + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 7, 8 }); + } + finally + { + allowError.TrySetResult(); + } + + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + await Assert.That(observed).IsSameReferenceAs(error); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListCancellableTaskFactoryPublishesOnlyAfterSuccessfulDelegateCompletion() + { + var allowReturn = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async (list, _) => + { + try + { + list.AddRange(new[] { 9, 10 }); + await allowReturn.Task; + } + finally + { + exited.TrySetResult(); + } + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value)); + + try + { + await Assert.That(received.Task.IsCompleted).IsFalse(); + } + finally + { + allowReturn.TrySetResult(); + } + + var changeSet = await received.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(GetCurrentItems(changeSet)).IsEquivalentTo(new[] { 9, 10 }); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task ListCancellableTaskFactoryPropagatesErrorsWithoutPublishingPendingEdits() + { + var error = new InvalidOperationException("list cancellable task failed"); + var allowError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var received = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously); + var receivedError = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var changes = ObservableChangeSet.Create( + async (list, _) => + { + try + { + list.AddRange(new[] { 11, 12 }); + await allowError.Task; + throw error; + } + finally + { + exited.TrySetResult(); + } + }); + + using var subscription = changes.Subscribe(value => received.TrySetResult(value), failure => receivedError.TrySetResult(failure)); + + allowError.TrySetResult(); + var observed = await receivedError.Task.WaitAsync(TimeSpan.FromSeconds(10)); + + await Assert.That(observed).IsSameReferenceAs(error); + await Assert.That(received.Task.IsCompleted).IsFalse(); + await exited.Task.WaitAsync(TimeSpan.FromSeconds(10)); + } + + [Test] + public async Task CacheUpdaterUsesListFastPathAndIteratorPathForKeyValuePairs() + { + var cache = new ChangeAwareCache(); + var updater = new CacheUpdater(cache); + + updater.AddOrUpdate(new List> + { + new(1, "one"), + new(2, "two") + }); + updater.AddOrUpdate(IteratorPairs()); + + await Assert.That(cache.Lookup(1).Value).IsEqualTo("one"); + await Assert.That(cache.Lookup(2).Value).IsEqualTo("two"); + await Assert.That(cache.Lookup(3).Value).IsEqualTo("three"); + } + + [Test] + public async Task CacheUpdaterUsesListFastPathAndIteratorPathForRefreshAndRemoveKeys() + { + var cache = new ChangeAwareCache(); + var updater = new CacheUpdater(cache, static value => value.Length); + + updater.AddOrUpdate(new[] { "aa", "bbb", "cccc" }); + cache.CaptureChanges(); + + updater.Refresh(new List { 2 }); + updater.Refresh(IteratorKeys(3)); + updater.Remove(new List { 2 }); + updater.Remove(IteratorKeys(3)); + + var changes = cache.CaptureChanges(); + + await Assert.That(cache.Lookup(4).Value).IsEqualTo("cccc"); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Refresh)).IsEqualTo(2); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Remove)).IsEqualTo(2); + } + + private static IEnumerable GetCurrentItems(IChangeSet changeSet) => + changeSet.SelectMany(static change => change.Range.Count == 0 ? Enumerable.Repeat(change.Item.Current, 1) : change.Range); + + private static IEnumerable> IteratorPairs() + { + yield return new KeyValuePair(3, "three"); + } + + private static IEnumerable IteratorKeys(int key) + { + yield return key; + } +} diff --git a/src/DynamicData.Tests/Cache/FilterFixture.Base.cs b/src/DynamicData.Tests/Cache/FilterFixture.Base.cs index 24e645f15..5fe4695af 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.Base.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.Base.cs @@ -1,23 +1,13 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class FilterFixture { public abstract class Base { - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ExcludedItemsAreRemoved_NoChangesAreMade(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ExcludedItemsAreRemoved_NoChangesAreMade(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -32,64 +22,59 @@ public void ExcludedItemsAreRemoved_NoChangesAreMade(EmptyChangesetPolicy emptyC new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Remove(source.Items.Where(static item => !item.IsIncluded).ToArray()); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) { - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "only excluded items were manipulated"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("only excluded items were manipulated"); } else { - results.RecordedChangeSets.Skip(1).Should().BeEmpty("empty changesets should be suppressed"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("empty changesets should be suppressed"); } - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ItemsAreAdded_MatchingItemsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ItemsAreAdded_MatchingItemsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceCache(Item.SelectId); - // UUT Intialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.AddOrUpdate(new[] @@ -102,23 +87,22 @@ public void ItemsAreAdded_MatchingItemsPropagate(EmptyChangesetPolicy emptyChang new Item() { Id = 6, IsIncluded = false } }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ItemsAreMoved_MovementsAreIgnored(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ItemsAreMoved_MovementsAreIgnored(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var items = new[] { @@ -129,24 +113,23 @@ public void ItemsAreMoved_MovementsAreIgnored(EmptyChangesetPolicy emptyChangese // UUT Initialization using var subscription = BuildUut( - source: source + source: source .Prepend(new ChangeSet(items .Select((item, index) => new Change( - reason: ChangeReason.Add, - key: item.Id, - current: item, - index: index)))), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + reason: ChangeReason.Add, + key: item.Id, + current: item, + index: index)))), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "all matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.OnNext(new ChangeSet() @@ -155,27 +138,26 @@ public void ItemsAreMoved_MovementsAreIgnored(EmptyChangesetPolicy emptyChangese new(reason: ChangeReason.Moved, key: items[1].Id, items[1], previous: default, currentIndex: 1, previousIndex: 2) }); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) { - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source opreation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "no changes should have been made"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source opreation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("no changes should have been made"); } else { - results.RecordedChangeSets.Skip(1).Should().BeEmpty("empty changesets should be suppressed"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("empty changesets should be suppressed"); } - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -190,21 +172,19 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (add items) foreach (var item in source.Items) @@ -212,12 +192,11 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy source.Refresh(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedChangeSets.ElementAt(1).ShouldHaveRefreshed(source.Items.Take(3), "all unchanged items should have been refreshed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await results.RecordedChangeSets.ElementAt(1).ShouldHaveRefreshed(source.Items.Take(3), "all unchanged items should have been refreshed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (remove items) foreach (var item in source.Items.Take(3)) @@ -225,21 +204,20 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy source.Refresh(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedChangeSets.ElementAt(2).ShouldHaveRefreshed(source.Items.Skip(3), "all unchanged items should have been refreshed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await results.RecordedChangeSets.ElementAt(2).ShouldHaveRefreshed(source.Items.Skip(3), "all unchanged items should have been refreshed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } - [Theory] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - public void ItemsAreUpdated_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + public async Task ItemsAreUpdated_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -254,21 +232,19 @@ public void ItemsAreUpdated_ItemsAreReFiltered(EmptyChangesetPolicy emptyChanges new Item() { Id = 6, IsIncluded = false } }); - // UUT Intialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (add and update items) source.AddOrUpdate(new[] @@ -281,11 +257,10 @@ public void ItemsAreUpdated_ItemsAreReFiltered(EmptyChangesetPolicy emptyChanges new Item() { Id = 6, IsIncluded = true } }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (remove and update items) source.AddOrUpdate(new[] @@ -298,20 +273,19 @@ public void ItemsAreUpdated_ItemsAreReFiltered(EmptyChangesetPolicy emptyChanges new Item() { Id = 6, IsIncluded = true } }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void MatchingItemsAreRemoved_RemovalsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task MatchingItemsAreRemoved_RemovalsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceCache(Item.SelectId); @@ -326,39 +300,36 @@ public void MatchingItemsAreRemoved_RemovalsPropagate(EmptyChangesetPolicy empty new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Remove(source.Items.Where(Item.FilterByIsIncluded).ToArray()); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEmpty("all matching items were removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("all matching items were removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void SourceFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task SourceFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) { var error = new Exception("Test"); @@ -368,9 +339,9 @@ public void SourceFails_ErrorPropagates(StreamCompletionStrategy completionStrat source.SetError(error); using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: true) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: true) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); @@ -378,22 +349,20 @@ public void SourceFails_ErrorPropagates(StreamCompletionStrategy completionStrat if (completionStrategy is StreamCompletionStrategy.Asynchronous) source.SetError(error); - results.Error.Should().Be(error); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => BuildUut( - source: null!, - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: true)) - .Should() - .Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => BuildUut( + source: null!, + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: true)).Throws(); protected abstract IObservable> BuildUut( - IObservable> source, - Func predicate, - bool suppressEmptyChangeSets); + IObservable> source, + Func predicate, + bool suppressEmptyChangeSets); } } diff --git a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.IntegrationTests.cs b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.IntegrationTests.cs index 8b5c76e4c..264b3cf07 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.IntegrationTests.cs @@ -1,14 +1,4 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; - using Bogus; -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; @@ -19,26 +9,25 @@ public static partial class DynamicPredicate public sealed class IntegrationTests : IntegrationTestFixtureBase { - [Fact(Timeout = 60_000)] - public async Task NotificationsOccurOnDifferentThreads_OperatorIsThreadSafe() + [Test, Timeout(60_000)] + public async Task NotificationsOccurOnDifferentThreads_OperatorIsThreadSafe(CancellationToken cancellationToken) { // Setup var randomizer = new Randomizer(0x1234567); (var items, var changeSets) = GenerateStressItemsAndChangeSets( - editCount: 5_000, + editCount: 5_000, maxChangeCount: 20, - randomizer: randomizer); - + randomizer: randomizer); + var predicates = GenerateRandomIdInclusionMasks( valueCount: 5_000, randomizer: randomizer) .Select(mask => new Func(item => Item.FilterByIdInclusionMask(mask, item))) .ToArray(); - using var source = new Subject>(); - using var predicateChanged = new Subject>(); - + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateChanged = new ReactiveUI.Primitives.Signals.Signal>(); // UUT Initialization using var subscription = source @@ -47,29 +36,33 @@ public async Task NotificationsOccurOnDifferentThreads_OperatorIsThreadSafe() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - // UUT Action await Task.WhenAll( Task.Run(() => { foreach (var changeSet in changeSets) + { + cancellationToken.ThrowIfCancellationRequested(); source.OnNext(changeSet); - }), + } + }, cancellationToken), Task.Run(() => { foreach (var predicate in predicates) + { + cancellationToken.ThrowIfCancellationRequested(); predicateChanged.OnNext(predicate); - })); + } + }, cancellationToken)); var finalPredicate = predicates[^1]; - results.Error.Should().BeNull(); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items.Items.Where(finalPredicate), "the source colleciton should be filtered to include only items matching the final predicate"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items.Items.Where(finalPredicate)).Because("the source colleciton should be filtered to include only items matching the final predicate"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } } } diff --git a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.UnitTests.cs b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.UnitTests.cs index c8edb7e18..863716f9f 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.UnitTests.cs @@ -1,408 +1,379 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - -namespace DynamicData.Tests.Cache; - -public static partial class FilterFixture -{ - public static partial class DynamicPredicate - { - public sealed class UnitTests - : Base - { - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ChangesAreMadeBeforeInitialPredicateChangedValue_ItemsAreExcluded(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - - // UUT Initialization - using var subscription = source.Connect() - .Filter( - predicateChanged: Observable.Never>(), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - // Add changes - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = false }, - new Item() { Id = 4, IsIncluded = false } - }); - - // Refresh changes, with no item mutations. - source.Refresh(); - - // Refresh changes, with item mutations affecting filtering. - foreach (var item in source.Items) - item.IsIncluded = !item.IsIncluded; - source.Refresh(); - - // Remove changes - source.RemoveKeys(new[] { 2, 3 }); - - // Update changes, not affecting filtering - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = false }, - new Item() { Id = 4, IsIncluded = true } - }); - - // Update changes, affecting filtering - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false } - }); - - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - { - results.RecordedChangeSets.Count.Should().Be(6, "6 source operations were performed"); - results.RecordedItemsByKey.Should().BeEmpty("the predicate has not initialized"); - } - else - { - results.RecordedChangeSets.Should().BeEmpty("empty changesets should be suppressed"); - } - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void PredicateChangedChanges_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - using var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - - // UUT Initialization - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - predicateChanged.OnNext(Item.FilterByEvenId); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 predicate change occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByEvenId), "newly-matching items should have been added, and newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void PredicateChangedCompletesAfterInitialValue_CompletionWaitsForSourceCompletion(StreamCompletionStrategy completionStrategy) - { - // Setup - var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject>() - : Observable.Return(Item.FilterByIsIncluded); - - var reapplyFilter = new Subject(); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter(predicateChanged) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateChanged is Subject> subject) - { - subject.OnNext(Item.FilterByIsIncluded); - subject.OnCompleted(); - } - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial predicate, was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("changes could still be generated by the source"); - - - // UUT Action - source.Complete(); - - results.Error.Should().BeNull(); - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no source operations were performed"); - else - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all source streams have completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void PredicateChangedCompletesBeforeInitialValue_CompletionPropagatesIfEmptyChangesetsAreSuppressed( - StreamCompletionStrategy completionStrategy, - EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject>() - : Observable.Empty>(); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateChanged is Subject> subject) - subject.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.HasCompleted.Should().BeFalse("additional empty changesets can occur"); - else - results.HasCompleted.Should().BeTrue("only empty changesets can occur"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void PredicateChangedFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var error = new Exception("Test"); - - var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject>() - : Observable.Throw>(error); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateChanged is Subject> subject) - subject.OnError(error); - - results.Error.Should().Be(error, "errors should propagate downstream"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - } - - [Fact] - public void PredicateChangedIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.Filter( - source: Observable.Return(ChangeSet.Empty), - reapplyFilter: Observable.Never(), - predicateChanged: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void SourceCompletesWhenEmpty_CompletionPropagatesWhenEmptyChangesetsAreSuppressed( - StreamCompletionStrategy completionStrategy, - EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect() - .Filter( - predicateChanged: Observable.Concat( - Observable.Return(Item.FilterByIsIncluded), - Observable.Never>()), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.HasCompleted.Should().BeFalse("the source has completed, but further empty changesets can occur"); - else - results.HasCompleted.Should().BeTrue("the source has completed, and no further changesets can occur"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void SourceCompletesWhenNotEmpty_CompletionWaitsForPredicateChangedCompletion(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - using var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect() - .Filter(predicateChanged) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the collection could still change due to new predicates"); - - - // UUT Action - predicateChanged.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "no changes should have been made"); - results.HasCompleted.Should().BeTrue("all source streams have completed"); - - - // Final Verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() - { - // Setup - using var source = new Subject>(); - using var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - - - // UUT Initialization - using var subscription = source - .Filter(predicateChanged) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - subscription.Dispose(); - - source .HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - predicateChanged.HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - } - - protected override IObservable> BuildUut( - IObservable> source, - Func predicate, - bool suppressEmptyChangeSets) - => source.Filter( - predicateChanged: Observable.Return(predicate), - suppressEmptyChangeSets: suppressEmptyChangeSets); - } - } -} +namespace DynamicData.Tests.Cache; + +public static partial class FilterFixture +{ + public static partial class DynamicPredicate + { + [InheritsTests] + public sealed class UnitTests + : Base + { + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ChangesAreMadeBeforeInitialPredicateChangedValue_ItemsAreExcluded(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization + using var subscription = source.Connect() + .Filter( + predicateChanged: Observable.Never>(), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + // Add changes + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = false }, + new Item() { Id = 4, IsIncluded = false } + }); + + // Refresh changes, with no item mutations. + source.Refresh(); + + // Refresh changes, with item mutations affecting filtering. + foreach (var item in source.Items) + item.IsIncluded = !item.IsIncluded; + source.Refresh(); + + // Remove changes + source.RemoveKeys(new[] { 2, 3 }); + + // Update changes, not affecting filtering + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = false }, + new Item() { Id = 4, IsIncluded = true } + }); + + // Update changes, affecting filtering + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false } + }); + + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + { + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(6).Because("6 source operations were performed"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("the predicate has not initialized"); + } + else + { + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("empty changesets should be suppressed"); + } + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task PredicateChangedChanges_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + // UUT Initialization + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + predicateChanged.OnNext(Item.FilterByEvenId); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 predicate change occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByEvenId)).Because("newly-matching items should have been added, and newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task PredicateChangedCompletesAfterInitialValue_CompletionWaitsForSourceCompletion(StreamCompletionStrategy completionStrategy) + { + // Setup + var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal>() + : Observable.Return(Item.FilterByIsIncluded); + + var reapplyFilter = new ReactiveUI.Primitives.Signals.Signal(); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter(predicateChanged) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateChanged is ReactiveUI.Primitives.Signals.Signal> subject) + { + subject.OnNext(Item.FilterByIsIncluded); + subject.OnCompleted(); + } + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial predicate, was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by the source"); + + // UUT Action + source.Complete(); + + await Assert.That(results.Error).IsNull(); + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no source operations were performed"); + else + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all source streams have completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task PredicateChangedCompletesBeforeInitialValue_CompletionPropagatesIfEmptyChangesetsAreSuppressed( + StreamCompletionStrategy completionStrategy, + EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal>() + : Observable.Empty>(); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateChanged is ReactiveUI.Primitives.Signals.Signal> subject) + subject.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.HasCompleted).IsFalse().Because("additional empty changesets can occur"); + else + await Assert.That(results.HasCompleted).IsTrue().Because("only empty changesets can occur"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task PredicateChangedFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var error = new Exception("Test"); + + var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal>() + : Observable.Throw>(error); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateChanged is ReactiveUI.Primitives.Signals.Signal> subject) + subject.OnError(error); + + await Assert.That(results.Error).IsEqualTo(error).Because("errors should propagate downstream"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + } + + [Test] + public async Task PredicateChangedIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.Filter( + source: Observable.Return(ChangeSet.Empty), + reapplyFilter: Observable.Never(), + predicateChanged: null!)).Throws(); + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task SourceCompletesWhenEmpty_CompletionPropagatesWhenEmptyChangesetsAreSuppressed( + StreamCompletionStrategy completionStrategy, + EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect() + .Filter( + predicateChanged: Observable.Concat( + Observable.Return(Item.FilterByIsIncluded), + Observable.Never>()), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.HasCompleted).IsFalse().Because("the source has completed, but further empty changesets can occur"); + else + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no further changesets can occur"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task SourceCompletesWhenNotEmpty_CompletionWaitsForPredicateChangedCompletion(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect() + .Filter(predicateChanged) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the collection could still change due to new predicates"); + + // UUT Action + predicateChanged.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("no changes should have been made"); + await Assert.That(results.HasCompleted).IsTrue().Because("all source streams have completed"); + + // Final Verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() + { + // Setup + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + + // UUT Initialization + using var subscription = source + .Filter(predicateChanged) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + subscription.Dispose(); + + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + await Assert.That(predicateChanged.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + } + + protected override IObservable> BuildUut( + IObservable> source, + Func predicate, + bool suppressEmptyChangeSets) + => source.Filter( + predicateChanged: Observable.Return(predicate), + suppressEmptyChangeSets: suppressEmptyChangeSets); + } + } +} diff --git a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.IntegrationTests.cs b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.IntegrationTests.cs index 8491fe821..7cc4be558 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.IntegrationTests.cs @@ -1,15 +1,4 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; - using Bogus; -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; @@ -20,65 +9,71 @@ public static partial class DynamicPredicateAndReFiltering public sealed class IntegrationTests : IntegrationTestFixtureBase { - [Fact(Timeout = 60_000)] - public async Task NotificationsOccurOnDifferentThreads_OperatorIsThreadSafe() + [Test, Timeout(60_000)] + public async Task NotificationsOccurOnDifferentThreads_OperatorIsThreadSafe(CancellationToken cancellationToken) { // Setup var randomizer = new Randomizer(0x1234567); (var items, var changeSets) = GenerateStressItemsAndChangeSets( - editCount: 5_000, + editCount: 5_000, maxChangeCount: 20, - randomizer: randomizer); - + randomizer: randomizer); + var predicates = GenerateRandomIdInclusionMasks( valueCount: 5_000, randomizer: randomizer) .Select(mask => new Func(item => Item.FilterByIdInclusionMask(mask, item))) .ToArray(); - using var source = new Subject>(); - using var predicateChanged = new Subject>(); - using var reapplyFilter = new Subject(); - + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateChanged = new ReactiveUI.Primitives.Signals.Signal>(); + using var reapplyFilter = new ReactiveUI.Primitives.Signals.Signal(); // UUT Initialization using var subscription = source .Filter( - predicateChanged: predicateChanged, - reapplyFilter: reapplyFilter) + predicateChanged: predicateChanged, + reapplyFilter: reapplyFilter) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - // UUT Action await Task.WhenAll( Task.Run(() => { foreach (var changeSet in changeSets) + { + cancellationToken.ThrowIfCancellationRequested(); source.OnNext(changeSet); - }), + } + }, cancellationToken), Task.Run(() => { foreach (var predicate in predicates) + { + cancellationToken.ThrowIfCancellationRequested(); predicateChanged.OnNext(predicate); - }), + } + }, cancellationToken), Task.Run(() => { for (var i = 0; i < 10_000; ++i) + { + cancellationToken.ThrowIfCancellationRequested(); reapplyFilter.OnNext(Unit.Default); - })); + } + }, cancellationToken)); var finalPredicate = predicates[^1]; - results.Error.Should().BeNull(); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items.Items.Where(finalPredicate), "the source colleciton should be filtered to include only items matching the final predicate"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items.Items.Where(finalPredicate)).Because("the source colleciton should be filtered to include only items matching the final predicate"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } } } diff --git a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.UnitTests.cs b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.UnitTests.cs index e1a1fb5eb..6788b2d0c 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.UnitTests.cs @@ -1,627 +1,585 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - -namespace DynamicData.Tests.Cache; - -public static partial class FilterFixture -{ - public static partial class DynamicPredicateAndReFiltering - { - public sealed class UnitTests - : Base - { - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ChangesAreMadeBeforeInitialPredicateChangedValue_ItemsAreExcluded(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - - // UUT Initialization - using var subscription = source.Connect() - .Filter( - predicateChanged: Observable.Never>(), - reapplyFilter: Observable.Never(), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - // Add changes - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = false }, - new Item() { Id = 4, IsIncluded = false } - }); - - // Refresh changes, with no item mutations. - source.Refresh(); - - // Refresh changes, with item mutations affecting filtering. - foreach (var item in source.Items) - item.IsIncluded = !item.IsIncluded; - source.Refresh(); - - // Remove changes - source.RemoveKeys(new[] { 2, 3 }); - - // Update changes, not affecting filtering - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = false }, - new Item() { Id = 4, IsIncluded = true } - }); - - // Update changes, affecting filtering - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false } - }); - - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.RecordedChangeSets.Count.Should().Be(6, "6 source operations were performed"); - else - results.RecordedChangeSets.Should().BeEmpty("empty changesets should be suppressed"); - results.RecordedItemsByKey.Should().BeEmpty("the predicate has not initialized"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void PredicateChangedChanges_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - using var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - - // UUT Initialization - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: Observable.Never(), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - predicateChanged.OnNext(Item.FilterByEvenId); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 predicate change occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByEvenId), "newly-matching items should have been added, and newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous, DynamicParameter.Source)] - [InlineData(StreamCompletionStrategy.Asynchronous, DynamicParameter.ReapplyFilter)] - [InlineData(StreamCompletionStrategy.Immediate, DynamicParameter.Source)] - [InlineData(StreamCompletionStrategy.Immediate, DynamicParameter.ReapplyFilter)] - public void PredicateChangedCompletesAfterInitialValue_CompletionWaitsForSourceAndReapplyFilterCompletion( - StreamCompletionStrategy completionStrategy, - DynamicParameter lastCompletion) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject>() - : Observable.Return(Item.FilterByIsIncluded); - - var reapplyFilter = new Subject(); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: reapplyFilter) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateChanged is Subject> subject) - { - subject.OnNext(Item.FilterByIsIncluded); - subject.OnCompleted(); - } - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial predicate, was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("changes could still be generated by the source"); - - - // UUT Action (second completion) - if (lastCompletion is DynamicParameter.ReapplyFilter) - source.Complete(); - else - reapplyFilter.OnCompleted(); - - results.Error.Should().BeNull(); - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no source operations were performed"); - else - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("changes could still be generated by the filtering sources"); - - - // UUT Action (last completion) - if (lastCompletion is DynamicParameter.ReapplyFilter) - reapplyFilter.OnCompleted(); - else - source.Complete(); - - results.Error.Should().BeNull(); - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no source operations were performed"); - else - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all source streams have completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void PredicateChangedCompletesBeforeInitialValue_CompletionPropagatesIfEmptyChangesetsAreSuppressed( - StreamCompletionStrategy completionStrategy, - EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject>() - : Observable.Empty>(); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: Observable.Never(), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateChanged is Subject> subject) - subject.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.HasCompleted.Should().BeFalse("the source has completed, but further empty changesets can occur"); - else - results.HasCompleted.Should().BeTrue("the source has completed, and no further changesets can occur"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void PredicateChangedFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var error = new Exception("Test"); - - var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject>() - : Observable.Throw>(error); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: Observable.Never()) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateChanged is Subject> subject) - subject.OnError(error); - - results.Error.Should().Be(error, "errors should propagate downstream"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - } - - [Fact] - public void PredicateChangedIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.Filter( - source: Observable.Return(ChangeSet.Empty), - reapplyFilter: Observable.Never(), - predicateChanged: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(StreamCompletionStrategy.Immediate, DynamicParameter.PredicateChanged)] - [InlineData(StreamCompletionStrategy.Immediate, DynamicParameter.Source)] - [InlineData(StreamCompletionStrategy.Asynchronous, DynamicParameter.PredicateChanged)] - [InlineData(StreamCompletionStrategy.Asynchronous, DynamicParameter.Source)] - public void ReapplyFilterCompletes_CompletionWaitsForSourceAndPredicateChangedCompletion( - StreamCompletionStrategy completionStrategy, - DynamicParameter lastCompletion) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - - var reapplyFilter = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject() - : Observable.Empty(); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: reapplyFilter) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (reapplyFilter is Subject subject) - subject.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("changes could still be generated by the source"); - - - // UUT Action (second completion) - if (lastCompletion is DynamicParameter.PredicateChanged) - source.Complete(); - else - predicateChanged.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("changes could still be generated by other source streams"); - - - // UUT Action (last completion) - if (lastCompletion is DynamicParameter.PredicateChanged) - predicateChanged.OnCompleted(); - else - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all input streams have completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void ReapplyFilterFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var error = new Exception("Test"); - - var reapplyFilter = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject() - : Observable.Throw(error); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicateChanged: Observable.Return(Item.FilterByIsIncluded), - reapplyFilter: reapplyFilter) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (reapplyFilter is Subject subject) - subject.OnError(error); - - results.Error.Should().Be(error, "errors should propagate downstream"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - } - - [Fact] - public void ReapplyFilterIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.Filter( - source: Observable.Return(ChangeSet.Empty), - predicateChanged: Observable.Return(Item.FilterByIsIncluded), - reapplyFilter: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ReapplyFilterOccurs_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - using var reapplyFilter = new Subject(); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - var predicate = Item.FilterByIsIncluded; - - - // UUT Initialization - using var subscription = source.Connect() - .Filter( - predicateChanged: Observable.Return>(item => predicate.Invoke(item)), - reapplyFilter: reapplyFilter, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(predicate), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - source.Items[1].IsIncluded = false; - source.Items[5].IsIncluded = true; - predicate = Item.FilterByEvenId; - reapplyFilter.OnNext(Unit.Default); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 re-filter request occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(predicate), "newly-matching items should have been added, and newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void SourceCompletesWhenEmpty_CompletionPropagatesWhenEmptyChangesetsAreSuppressed( - StreamCompletionStrategy completionStrategy, - EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect() - .Filter( - predicateChanged: Observable.Concat( - Observable.Return(Item.FilterByIsIncluded), - Observable.Never>()), - reapplyFilter: Observable.Never(), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.HasCompleted.Should().BeFalse("the source has completed, but further empty changesets can occur"); - else - results.HasCompleted.Should().BeTrue("the source has completed, and no further changesets can occur"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous, DynamicParameter.PredicateChanged)] - [InlineData(StreamCompletionStrategy.Asynchronous, DynamicParameter.ReapplyFilter)] - [InlineData(StreamCompletionStrategy.Immediate, DynamicParameter.PredicateChanged)] - [InlineData(StreamCompletionStrategy.Immediate, DynamicParameter.ReapplyFilter)] - public void SourceCompletesWhenNotEmpty_CompletionWaitsForPredicateChangedAndReapplyFilterCompletion( - StreamCompletionStrategy completionStrategy, - DynamicParameter lastCompletion) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - using var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - using var reapplyFilter = new Subject(); - - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect() - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: reapplyFilter) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the collection could still change due to new predicates"); - - - // UUT Action (second completion) - if (lastCompletion is DynamicParameter.PredicateChanged) - reapplyFilter.OnCompleted(); - else - predicateChanged.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "no changes should have been made"); - results.HasCompleted.Should().BeFalse("the collection could still change due to outstanding source streams"); - - - // UUT Action (last completion) - if (lastCompletion is DynamicParameter.PredicateChanged) - predicateChanged.OnCompleted(); - else - reapplyFilter.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "no changes should have been made"); - results.HasCompleted.Should().BeTrue("all source streams have completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() - { - // Setup - using var source = new Subject>(); - using var predicateChanged = new BehaviorSubject>(Item.FilterByIsIncluded); - using var reapplyFilter = new Subject(); - - - // UUT Initialization - using var subscription = source - .Filter( - predicateChanged: predicateChanged, - reapplyFilter: reapplyFilter) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - subscription.Dispose(); - - source .HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - predicateChanged.HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - reapplyFilter .HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - } - - protected override IObservable> BuildUut( - IObservable> source, - Func predicate, - bool suppressEmptyChangeSets) - => source.Filter( - predicateChanged: Observable.Return(predicate), - reapplyFilter: Observable.Never(), - suppressEmptyChangeSets: suppressEmptyChangeSets); - } - } -} +namespace DynamicData.Tests.Cache; + +public static partial class FilterFixture +{ + public static partial class DynamicPredicateAndReFiltering + { + [InheritsTests] + public sealed class UnitTests + : Base + { + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ChangesAreMadeBeforeInitialPredicateChangedValue_ItemsAreExcluded(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization + using var subscription = source.Connect() + .Filter( + predicateChanged: Observable.Never>(), + reapplyFilter: Observable.Never(), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + // Add changes + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = false }, + new Item() { Id = 4, IsIncluded = false } + }); + + // Refresh changes, with no item mutations. + source.Refresh(); + + // Refresh changes, with item mutations affecting filtering. + foreach (var item in source.Items) + item.IsIncluded = !item.IsIncluded; + source.Refresh(); + + // Remove changes + source.RemoveKeys(new[] { 2, 3 }); + + // Update changes, not affecting filtering + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = false }, + new Item() { Id = 4, IsIncluded = true } + }); + + // Update changes, affecting filtering + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false } + }); + + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(6).Because("6 source operations were performed"); + else + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("empty changesets should be suppressed"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("the predicate has not initialized"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task PredicateChangedChanges_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + // UUT Initialization + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: Observable.Never(), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + predicateChanged.OnNext(Item.FilterByEvenId); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 predicate change occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByEvenId)).Because("newly-matching items should have been added, and newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous, DynamicParameter.Source)] + [Arguments(StreamCompletionStrategy.Asynchronous, DynamicParameter.ReapplyFilter)] + [Arguments(StreamCompletionStrategy.Immediate, DynamicParameter.Source)] + [Arguments(StreamCompletionStrategy.Immediate, DynamicParameter.ReapplyFilter)] + public async Task PredicateChangedCompletesAfterInitialValue_CompletionWaitsForSourceAndReapplyFilterCompletion( + StreamCompletionStrategy completionStrategy, + DynamicParameter lastCompletion) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal>() + : Observable.Return(Item.FilterByIsIncluded); + + var reapplyFilter = new ReactiveUI.Primitives.Signals.Signal(); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: reapplyFilter) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateChanged is ReactiveUI.Primitives.Signals.Signal> subject) + { + subject.OnNext(Item.FilterByIsIncluded); + subject.OnCompleted(); + } + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial predicate, was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by the source"); + + // UUT Action (second completion) + if (lastCompletion is DynamicParameter.ReapplyFilter) + source.Complete(); + else + reapplyFilter.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no source operations were performed"); + else + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by the filtering sources"); + + // UUT Action (last completion) + if (lastCompletion is DynamicParameter.ReapplyFilter) + reapplyFilter.OnCompleted(); + else + source.Complete(); + + await Assert.That(results.Error).IsNull(); + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no source operations were performed"); + else + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all source streams have completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task PredicateChangedCompletesBeforeInitialValue_CompletionPropagatesIfEmptyChangesetsAreSuppressed( + StreamCompletionStrategy completionStrategy, + EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal>() + : Observable.Empty>(); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: Observable.Never(), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateChanged is ReactiveUI.Primitives.Signals.Signal> subject) + subject.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.HasCompleted).IsFalse().Because("the source has completed, but further empty changesets can occur"); + else + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no further changesets can occur"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task PredicateChangedFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var error = new Exception("Test"); + + var predicateChanged = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal>() + : Observable.Throw>(error); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: Observable.Never()) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateChanged is ReactiveUI.Primitives.Signals.Signal> subject) + subject.OnError(error); + + await Assert.That(results.Error).IsEqualTo(error).Because("errors should propagate downstream"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + } + + [Test] + public async Task PredicateChangedIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.Filter( + source: Observable.Return(ChangeSet.Empty), + reapplyFilter: Observable.Never(), + predicateChanged: null!)).Throws(); + + [Test] + [Arguments(StreamCompletionStrategy.Immediate, DynamicParameter.PredicateChanged)] + [Arguments(StreamCompletionStrategy.Immediate, DynamicParameter.Source)] + [Arguments(StreamCompletionStrategy.Asynchronous, DynamicParameter.PredicateChanged)] + [Arguments(StreamCompletionStrategy.Asynchronous, DynamicParameter.Source)] + public async Task ReapplyFilterCompletes_CompletionWaitsForSourceAndPredicateChangedCompletion( + StreamCompletionStrategy completionStrategy, + DynamicParameter lastCompletion) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + + var reapplyFilter = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal() + : Observable.Empty(); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: reapplyFilter) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (reapplyFilter is ReactiveUI.Primitives.Signals.Signal subject) + subject.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by the source"); + + // UUT Action (second completion) + if (lastCompletion is DynamicParameter.PredicateChanged) + source.Complete(); + else + predicateChanged.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by other source streams"); + + // UUT Action (last completion) + if (lastCompletion is DynamicParameter.PredicateChanged) + predicateChanged.OnCompleted(); + else + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all input streams have completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task ReapplyFilterFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var error = new Exception("Test"); + + var reapplyFilter = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal() + : Observable.Throw(error); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicateChanged: Observable.Return(Item.FilterByIsIncluded), + reapplyFilter: reapplyFilter) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (reapplyFilter is ReactiveUI.Primitives.Signals.Signal subject) + subject.OnError(error); + + await Assert.That(results.Error).IsEqualTo(error).Because("errors should propagate downstream"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + } + + [Test] + public async Task ReapplyFilterIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.Filter( + source: Observable.Return(ChangeSet.Empty), + predicateChanged: Observable.Return(Item.FilterByIsIncluded), + reapplyFilter: null!)).Throws(); + + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ReapplyFilterOccurs_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + using var reapplyFilter = new ReactiveUI.Primitives.Signals.Signal(); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + var predicate = Item.FilterByIsIncluded; + + // UUT Initialization + using var subscription = source.Connect() + .Filter( + predicateChanged: Observable.Return>(item => predicate.Invoke(item)), + reapplyFilter: reapplyFilter, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(predicate)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + source.Items[1].IsIncluded = false; + source.Items[5].IsIncluded = true; + predicate = Item.FilterByEvenId; + reapplyFilter.OnNext(Unit.Default); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 re-filter request occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(predicate)).Because("newly-matching items should have been added, and newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task SourceCompletesWhenEmpty_CompletionPropagatesWhenEmptyChangesetsAreSuppressed( + StreamCompletionStrategy completionStrategy, + EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect() + .Filter( + predicateChanged: Observable.Concat( + Observable.Return(Item.FilterByIsIncluded), + Observable.Never>()), + reapplyFilter: Observable.Never(), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.HasCompleted).IsFalse().Because("the source has completed, but further empty changesets can occur"); + else + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no further changesets can occur"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous, DynamicParameter.PredicateChanged)] + [Arguments(StreamCompletionStrategy.Asynchronous, DynamicParameter.ReapplyFilter)] + [Arguments(StreamCompletionStrategy.Immediate, DynamicParameter.PredicateChanged)] + [Arguments(StreamCompletionStrategy.Immediate, DynamicParameter.ReapplyFilter)] + public async Task SourceCompletesWhenNotEmpty_CompletionWaitsForPredicateChangedAndReapplyFilterCompletion( + StreamCompletionStrategy completionStrategy, + DynamicParameter lastCompletion) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + using var reapplyFilter = new ReactiveUI.Primitives.Signals.Signal(); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect() + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: reapplyFilter) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the collection could still change due to new predicates"); + + // UUT Action (second completion) + if (lastCompletion is DynamicParameter.PredicateChanged) + reapplyFilter.OnCompleted(); + else + predicateChanged.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("no changes should have been made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the collection could still change due to outstanding source streams"); + + // UUT Action (last completion) + if (lastCompletion is DynamicParameter.PredicateChanged) + predicateChanged.OnCompleted(); + else + reapplyFilter.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("no changes should have been made"); + await Assert.That(results.HasCompleted).IsTrue().Because("all source streams have completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() + { + // Setup + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(Item.FilterByIsIncluded); + using var reapplyFilter = new ReactiveUI.Primitives.Signals.Signal(); + + // UUT Initialization + using var subscription = source + .Filter( + predicateChanged: predicateChanged, + reapplyFilter: reapplyFilter) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + subscription.Dispose(); + + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + await Assert.That(predicateChanged.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + await Assert.That(reapplyFilter.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + } + + protected override IObservable> BuildUut( + IObservable> source, + Func predicate, + bool suppressEmptyChangeSets) + => source.Filter( + predicateChanged: Observable.Return(predicate), + reapplyFilter: Observable.Never(), + suppressEmptyChangeSets: suppressEmptyChangeSets); + } + } +} diff --git a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.IntegrationTests.cs b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.IntegrationTests.cs index 49654ba16..370fa5e21 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.IntegrationTests.cs @@ -1,13 +1,4 @@ -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; - using Bogus; -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; @@ -18,36 +9,34 @@ public static partial class DynamicPredicateState public sealed class IntegrationTests : IntegrationTestFixtureBase { - [Fact] + [Test] public async Task NotificationsOccurOnDifferentThreads_OperatorIsThreadSafe() { // Setup var randomizer = new Randomizer(0x1234567); (var items, var changeSets) = GenerateStressItemsAndChangeSets( - editCount: 5_000, + editCount: 5_000, maxChangeCount: 20, - randomizer: randomizer); - + randomizer: randomizer); + var predicateStates = GenerateRandomIdInclusionMasks( valueCount: 5_000, randomizer: randomizer) .ToArray(); - using var source = new Subject>(); - using var predicateState = new Subject(); - + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); // UUT Initialization using var subscription = source .Filter( - predicate: Item.FilterByIdInclusionMask, + predicate: Item.FilterByIdInclusionMask, predicateState: predicateState) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - // UUT Action await Task.WhenAll( Task.Run(() => @@ -63,13 +52,12 @@ await Task.WhenAll( var finalPredicateState = predicateStates[^1]; - results.Error.Should().BeNull(); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items.Items.Where(item => Item.FilterByIdInclusionMask(finalPredicateState, item)), "the source colleciton should be filtered to include only items matching the final predicate"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items.Items.Where(item => Item.FilterByIdInclusionMask(finalPredicateState, item))).Because("the source colleciton should be filtered to include only items matching the final predicate"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); } } } diff --git a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.UnitTests.cs b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.UnitTests.cs index 6fa22b720..aa7d29d1d 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.UnitTests.cs @@ -1,424 +1,393 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - -namespace DynamicData.Tests.Cache; - -public static partial class FilterFixture -{ - public static partial class DynamicPredicateState - { - public sealed class UnitTests - : Base - { - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ChangesAreMadeBeforeInitialPredicateStateValue_ItemsAreExcluded(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - - // UUT Initialization - using var subscription = source - .Connect() - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: Observable.Never(), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - // Add changes - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = false }, - new Item() { Id = 4, IsIncluded = false } - }); - - // Refresh changes, with no item mutations. - source.Refresh(); - - // Refresh changes, with item mutations affecting filtering. - foreach (var item in source.Items) - item.IsIncluded = !item.IsIncluded; - source.Refresh(); - - // Remove changes - source.RemoveKeys(new[] { 2, 3 }); - - // Update changes, not affecting filtering - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = false }, - new Item() { Id = 4, IsIncluded = true } - }); - - // Update changes, affecting filtering - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false } - }); - - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.RecordedChangeSets.Count.Should().Be(6, "6 source operations were performed"); - else - results.RecordedChangeSets.Should().BeEmpty("empty changesets should be suppressed"); - results.RecordedItemsByKey.Should().BeEmpty("the predicate has not initialized"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Fact] - public void PredicateIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.Filter( - source: Observable.Return(ChangeSet.Empty), - predicate: null!, - predicateState: Observable.Empty())) - .Should() - .Throw(); - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void PredicateStateCompletesAfterInitialValue_CompletionWaitsForSourceCompletion(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - var predicateState = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject() - : Observable.Return(new object()); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: predicateState) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateState is Subject subject) - { - subject.OnNext(new()); - subject.OnCompleted(); - } - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial predicate, was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("changes could still be generated by the source"); - - - // UUT Action - source.Complete(); - - results.Error.Should().BeNull(); - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no source operations were performed"); - else - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("all source streams have completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void PredicateStateCompletesBeforeInitialValue_CompletionPropagatesIfEmptyChangesetsAreSuppressed( - StreamCompletionStrategy completionStrategy, - EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var predicateState = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject() - : Observable.Empty(); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: predicateState, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(static item => item.Id) - .RecordCacheItems(out var results); - - if (predicateState is Subject subject) - subject.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.HasCompleted.Should().BeFalse("additional empty changesets can occur"); - else - results.HasCompleted.Should().BeTrue("only empty changesets can occur"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void PredicateStateFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - var error = new Exception("Test"); - - var predicateState = (completionStrategy is StreamCompletionStrategy.Asynchronous) - ? new Subject() - : Observable.Throw(error); - - - // UUT Initialization & Action - using var subscription = source.Connect() - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: predicateState) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (predicateState is Subject subject) - subject.OnError(error); - - results.Error.Should().Be(error, "errors should propagate downstream"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - } - - [Fact] - public void PredicateStateIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.Filter( - source: Observable.Return(ChangeSet.Empty), - predicate: static (object _, Item item) => item.IsIncluded, - predicateState: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void PredicateStateChanges_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - using var predicateState = new BehaviorSubject(0x5); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - - // UUT Initialization - using var subscription = source.Connect() - .Filter( - predicate: Item.FilterByIdInclusionMask, - predicateState: predicateState, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(item => Item.FilterByIdInclusionMask(predicateState.Value, item)), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - predicateState.OnNext(0xA); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 predicate change occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(item => Item.FilterByIdInclusionMask(predicateState.Value, item)), "newly-matching items should have been added, and newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void SourceCompletesWhenEmpty_CompletionPropagatesWhenEmptyChangesetsAreSuppressed( - StreamCompletionStrategy completionStrategy, - EmptyChangesetPolicy emptyChangesetPolicy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect() - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: Observable.Concat( - Observable.Return(new object()), - Observable.Never()), - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) - results.HasCompleted.Should().BeFalse("the source has completed, but further empty changesets can occur"); - else - results.HasCompleted.Should().BeTrue("the source has completed, and no further changesets can occur"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void SourceCompletesWhenNotEmpty_CompletionWaitsForPredicateChangedCompletion(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - source.AddOrUpdate(new[] - { - new Item() { Id = 1, IsIncluded = true }, - new Item() { Id = 2, IsIncluded = true }, - new Item() { Id = 3, IsIncluded = true }, - new Item() { Id = 4, IsIncluded = false }, - new Item() { Id = 5, IsIncluded = false }, - new Item() { Id = 6, IsIncluded = false } - }); - - using var predicateState = new BehaviorSubject(new object()); - - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect() - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: predicateState) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset was published"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the collection could still change due to new predicates"); - - - // UUT Action - predicateState.OnCompleted(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "no changes should have been made"); - results.HasCompleted.Should().BeTrue("all source streams have completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() - { - // Setup - using var source = new Subject>(); - using var predicateState = new BehaviorSubject(new()); - - - // UUT Initialization - using var subscription = source - .Filter( - predicate: static (_, item) => item.IsIncluded, - predicateState: predicateState) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - subscription.Dispose(); - - source .HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - predicateState .HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - } - - protected override IObservable> BuildUut( - IObservable> source, - Func predicate, - bool suppressEmptyChangeSets) - => source.Filter( - predicate: (_, item) => predicate.Invoke(item), - predicateState: Observable.Return(new object()), - suppressEmptyChangeSets: suppressEmptyChangeSets); - } - } -} +namespace DynamicData.Tests.Cache; + +public static partial class FilterFixture +{ + public static partial class DynamicPredicateState + { + [InheritsTests] + public sealed class UnitTests + : Base + { + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ChangesAreMadeBeforeInitialPredicateStateValue_ItemsAreExcluded(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization + using var subscription = source + .Connect() + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: Observable.Never(), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + // Add changes + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = false }, + new Item() { Id = 4, IsIncluded = false } + }); + + // Refresh changes, with no item mutations. + source.Refresh(); + + // Refresh changes, with item mutations affecting filtering. + foreach (var item in source.Items) + item.IsIncluded = !item.IsIncluded; + source.Refresh(); + + // Remove changes + source.RemoveKeys(new[] { 2, 3 }); + + // Update changes, not affecting filtering + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = false }, + new Item() { Id = 4, IsIncluded = true } + }); + + // Update changes, affecting filtering + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false } + }); + + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(6).Because("6 source operations were performed"); + else + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("empty changesets should be suppressed"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("the predicate has not initialized"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + public async Task PredicateIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.Filter( + source: Observable.Return(ChangeSet.Empty), + predicate: null!, + predicateState: Observable.Empty())).Throws(); + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task PredicateStateCompletesAfterInitialValue_CompletionWaitsForSourceCompletion(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + var predicateState = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal() + : Observable.Return(new object()); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: predicateState) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateState is ReactiveUI.Primitives.Signals.Signal subject) + { + subject.OnNext(new()); + subject.OnCompleted(); + } + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial predicate, was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by the source"); + + // UUT Action + source.Complete(); + + await Assert.That(results.Error).IsNull(); + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no source operations were performed"); + else + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all source streams have completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task PredicateStateCompletesBeforeInitialValue_CompletionPropagatesIfEmptyChangesetsAreSuppressed( + StreamCompletionStrategy completionStrategy, + EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var predicateState = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal() + : Observable.Empty(); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: predicateState, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(static item => item.Id) + .RecordCacheItems(out var results); + + if (predicateState is ReactiveUI.Primitives.Signals.Signal subject) + subject.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.HasCompleted).IsFalse().Because("additional empty changesets can occur"); + else + await Assert.That(results.HasCompleted).IsTrue().Because("only empty changesets can occur"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task PredicateStateFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + var error = new Exception("Test"); + + var predicateState = (completionStrategy is StreamCompletionStrategy.Asynchronous) + ? new ReactiveUI.Primitives.Signals.Signal() + : Observable.Throw(error); + + // UUT Initialization & Action + using var subscription = source.Connect() + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: predicateState) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (predicateState is ReactiveUI.Primitives.Signals.Signal subject) + subject.OnError(error); + + await Assert.That(results.Error).IsEqualTo(error).Because("errors should propagate downstream"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + } + + [Test] + public async Task PredicateStateIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.Filter( + source: Observable.Return(ChangeSet.Empty), + predicate: static (object _, Item item) => item.IsIncluded, + predicateState: null!)).Throws(); + + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task PredicateStateChanges_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(0x5); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + // UUT Initialization + using var subscription = source.Connect() + .Filter( + predicate: Item.FilterByIdInclusionMask, + predicateState: predicateState, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(item => Item.FilterByIdInclusionMask(predicateState.Value, item))).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + predicateState.OnNext(0xA); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 predicate change occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(item => Item.FilterByIdInclusionMask(predicateState.Value, item))).Because("newly-matching items should have been added, and newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Asynchronous, EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(StreamCompletionStrategy.Immediate, EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task SourceCompletesWhenEmpty_CompletionPropagatesWhenEmptyChangesetsAreSuppressed( + StreamCompletionStrategy completionStrategy, + EmptyChangesetPolicy emptyChangesetPolicy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect() + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: Observable.Concat( + Observable.Return(new object()), + Observable.Never()), + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) + await Assert.That(results.HasCompleted).IsFalse().Because("the source has completed, but further empty changesets can occur"); + else + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no further changesets can occur"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task SourceCompletesWhenNotEmpty_CompletionWaitsForPredicateChangedCompletion(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + source.AddOrUpdate(new[] + { + new Item() { Id = 1, IsIncluded = true }, + new Item() { Id = 2, IsIncluded = true }, + new Item() { Id = 3, IsIncluded = true }, + new Item() { Id = 4, IsIncluded = false }, + new Item() { Id = 5, IsIncluded = false }, + new Item() { Id = 6, IsIncluded = false } + }); + + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(new object()); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect() + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: predicateState) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset was published"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the collection could still change due to new predicates"); + + // UUT Action + predicateState.OnCompleted(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("no changes should have been made"); + await Assert.That(results.HasCompleted).IsTrue().Because("all source streams have completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() + { + // Setup + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(new()); + + // UUT Initialization + using var subscription = source + .Filter( + predicate: static (_, item) => item.IsIncluded, + predicateState: predicateState) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + subscription.Dispose(); + + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + } + + protected override IObservable> BuildUut( + IObservable> source, + Func predicate, + bool suppressEmptyChangeSets) + => source.Filter( + predicate: (_, item) => predicate.Invoke(item), + predicateState: Observable.Return(new object()), + suppressEmptyChangeSets: suppressEmptyChangeSets); + } + } +} diff --git a/src/DynamicData.Tests/Cache/FilterFixture.Static.cs b/src/DynamicData.Tests/Cache/FilterFixture.Static.cs index a596f3460..c510f9156 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.Static.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.Static.cs @@ -1,143 +1,128 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -namespace DynamicData.Tests.Cache; - -public static partial class FilterFixture -{ - public sealed class Static - : Base - { - [Fact] - public void FilterIsNull_ThrowsException() - => FluentActions.Invoking(static () => ObservableCacheEx.Filter( - source: Observable.Empty>(), - filter: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void SourceCompletes_CompletionPropagates(StreamCompletionStrategy completionStrategy) - { - // Setup - using var source = new TestSourceCache(Item.SelectId); - - - // UUT Initialization & Action - if (completionStrategy is StreamCompletionStrategy.Immediate) - source.Complete(); - - using var subscription = source.Connect(suppressEmptyChangeSets: false) - .Filter(Item.FilterByIsIncluded) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - if (completionStrategy is StreamCompletionStrategy.Asynchronous) - source.Complete(); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.HasCompleted.Should().BeTrue("the source has completed"); - - - // Final verification - results.ShouldNotSupportSorting("sorting is not supported by filter operators"); - } - - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() - { - // Setup - using var source = new Subject>(); - - - // UUT Intialization - using var subscription = source - .Filter(Item.FilterByIsIncluded) - .ValidateSynchronization() - .ValidateChangeSets(Item.SelectId) - .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); - results.RecordedItemsByKey.Values.Should().BeEmpty("the source has not initialized"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - - - // UUT Action - subscription.Dispose(); - - source.HasObservers.Should().BeFalse("subscription disposal should propagate to all sources"); - } - - protected override IObservable> BuildUut( - IObservable> source, - Func predicate, - bool suppressEmptyChangeSets) - => source.Filter( - filter: predicate, - suppressEmptyChangeSets: suppressEmptyChangeSets); - [Fact] - public void AutoRefreshRemoveKeyFilterUpdate_CollectionUpdated() - { - RandomPersonGenerator generator = new(); - using var source = new SourceCache(p => p.Key); - var people = generator.Take(100).ToArray(); - var average = people.Average(x => x.Age); - ReadOnlyObservableCollection collection; - using var subscription = source.Connect() - .AutoRefresh(x => x.Age) - .RemoveKey() - .Filter(x => x.Age < average) - .Bind(out collection) - .Subscribe(); - source.AddOrUpdate(people); - - Assert.Equivalent(people.Where(x => x.Age < average), collection); - - foreach (var person in people) - { - person.Age = person.Age + 1; - } - Assert.Equivalent(people.Where(x => x.Age < average), collection); - } - - [Fact] - public void AutoRefreshFilterRemoveKeyUpdate_CollectionUpdated() - { - RandomPersonGenerator generator = new(); - using var source = new SourceCache(p => p.Key); - var people = generator.Take(100).ToArray(); - var average = people.Average(x => x.Age); - ReadOnlyObservableCollection collection; - using var subscription = source.Connect() - .AutoRefresh(x => x.Age) - .Filter(x => x.Age < average) - .RemoveKey() - .Bind(out collection) - .Subscribe(); - source.AddOrUpdate(people); - - Assert.Equivalent(people.Where(x => x.Age < average), collection); - - foreach (var person in people) - { - person.Age = person.Age + 1; - } - Assert.Equivalent(people.Where(x => x.Age < average), collection); - } - } - -} +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.Cache; + +public static partial class FilterFixture +{ + [InheritsTests] + public sealed class Static + : Base + { + [Test] + public async Task FilterIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.Filter( + source: Observable.Empty>(), + filter: null!)).Throws(); + + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task SourceCompletes_CompletionPropagates(StreamCompletionStrategy completionStrategy) + { + // Setup + using var source = new TestSourceCache(Item.SelectId); + + // UUT Initialization & Action + if (completionStrategy is StreamCompletionStrategy.Immediate) + source.Complete(); + + using var subscription = source.Connect(suppressEmptyChangeSets: false) + .Filter(Item.FilterByIsIncluded) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + if (completionStrategy is StreamCompletionStrategy.Asynchronous) + source.Complete(); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + + // Final verification + await results.ShouldNotSupportSorting("sorting is not supported by filter operators"); + } + + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() + { + // Setup + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + + // UUT Intialization + using var subscription = source + .Filter(Item.FilterByIsIncluded) + .ValidateSynchronization() + .ValidateChangeSets(Item.SelectId) + .RecordCacheItems(out var results); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("the source has not initialized"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); + + // UUT Action + subscription.Dispose(); + + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate to all sources"); + } + + protected override IObservable> BuildUut( + IObservable> source, + Func predicate, + bool suppressEmptyChangeSets) + => source.Filter( + filter: predicate, + suppressEmptyChangeSets: suppressEmptyChangeSets); + [Test] + public async Task AutoRefreshRemoveKeyFilterUpdate_CollectionUpdated() + { + RandomPersonGenerator generator = new(); + using var source = new SourceCache(p => p.Key); + var people = generator.Take(100).ToArray(); + var average = people.Average(x => x.Age); + ReadOnlyObservableCollection collection; + using var subscription = source.Connect() + .AutoRefresh(x => x.Age) + .RemoveKey() + .Filter(x => x.Age < average) + .Bind(out collection) + .Subscribe(); + source.AddOrUpdate(people); + + await Assert.That(collection).IsEquivalentTo(people.Where(x => x.Age < average)); + + foreach (var person in people) + { + person.Age = person.Age + 1; + } + await Assert.That(collection).IsEquivalentTo(people.Where(x => x.Age < average)); + } + + [Test] + public async Task AutoRefreshFilterRemoveKeyUpdate_CollectionUpdated() + { + RandomPersonGenerator generator = new(); + using var source = new SourceCache(p => p.Key); + var people = generator.Take(100).ToArray(); + var average = people.Average(x => x.Age); + ReadOnlyObservableCollection collection; + using var subscription = source.Connect() + .AutoRefresh(x => x.Age) + .Filter(x => x.Age < average) + .RemoveKey() + .Bind(out collection) + .Subscribe(); + source.AddOrUpdate(people); + + await Assert.That(collection).IsEquivalentTo(people.Where(x => x.Age < average)); + + foreach (var person in people) + { + person.Age = person.Age + 1; + } + await Assert.That(collection).IsEquivalentTo(people.Where(x => x.Age < average)); + } + } + +} diff --git a/src/DynamicData.Tests/Cache/FilterFixture.cs b/src/DynamicData.Tests/Cache/FilterFixture.cs index 8ff9a3a29..22e5a239c 100644 --- a/src/DynamicData.Tests/Cache/FilterFixture.cs +++ b/src/DynamicData.Tests/Cache/FilterFixture.cs @@ -1,7 +1,3 @@ -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; - using Bogus; namespace DynamicData.Tests.Cache; @@ -30,22 +26,22 @@ public static bool FilterByIsIncluded(Item item) => item.IsIncluded; public static bool FilterByIdInclusionMask( - int idInclusionMask, - Item item) + int idInclusionMask, + Item item) => ((item.Id & idInclusionMask) == 0) && item.IsIncluded; public static int SelectId(Item item) => item.Id; - + public required int Id { get; init; } public bool IsIncluded { get; set; } } private static (ICache items, IReadOnlyList> changeSets) GenerateStressItemsAndChangeSets( - int editCount, - int maxChangeCount, - Randomizer randomizer) + int editCount, + int maxChangeCount, + Randomizer randomizer) { // Not exercising Moved, since ChangeAwareCache<> doesn't support it, and I'm too lazy to implement it by hand. var changeReasons = new[] @@ -88,20 +84,20 @@ private static (ICache items, IReadOnlyList> ch { var changeReason = randomizer.WeightedRandom(changeReasons, items.Count switch { - 0 => changeReasonWeightsWhenCountIs0, - _ => changeReasonWeightsOtherwise + 0 => changeReasonWeightsWhenCountIs0, + _ => changeReasonWeightsOtherwise }); switch (changeReason) { case ChangeReason.Add: items.AddOrUpdate( - item: new Item() + item: new Item() { - Id = nextItemId, - IsIncluded = randomizer.Bool() + Id = nextItemId, + IsIncluded = randomizer.Bool() }, - key: nextItemId); + key: nextItemId); ++nextItemId; break; @@ -116,12 +112,12 @@ private static (ICache items, IReadOnlyList> ch case ChangeReason.Update: var id = items.Keys.ElementAt(randomizer.Int(0, items.Count - 1)); items.AddOrUpdate( - item: new Item() + item: new Item() { - Id = id, - IsIncluded = randomizer.Bool() + Id = id, + IsIncluded = randomizer.Bool() }, - key: id); + key: id); break; } } @@ -133,8 +129,8 @@ private static (ICache items, IReadOnlyList> ch } private static IReadOnlyList GenerateRandomIdInclusionMasks( - int valueCount, - Randomizer randomizer) + int valueCount, + Randomizer randomizer) { var values = new List(capacity: valueCount); diff --git a/src/DynamicData.Tests/Cache/FilterImmutableFixture.cs b/src/DynamicData.Tests/Cache/FilterImmutableFixture.cs index 5abf88761..99df2b6d4 100644 --- a/src/DynamicData.Tests/Cache/FilterImmutableFixture.cs +++ b/src/DynamicData.Tests/Cache/FilterImmutableFixture.cs @@ -1,29 +1,17 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using DynamicData.Tests.Utilities; - -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Cache; public sealed class FilterImmutableFixture { - [Fact] - public void ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded() + [Test] + public async Task ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .FilterImmutable(predicate: Item.Predicate) .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - // Add items var item1 = new Item() { Id = 1, IsIncluded = true }; var item2 = new Item() { Id = 2, IsIncluded = false }; @@ -33,10 +21,9 @@ public void ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded( new(reason: ChangeReason.Add, key: item2.Id, current: item2, index: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "2 items were added, with 1 excluded"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("2 items were added, with 1 excluded"); // Replace items, changing inclusion var item3 = new Item() { Id = item1.Id, IsIncluded = false }; @@ -47,10 +34,9 @@ public void ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded( new(reason: ChangeReason.Update, key: item4.Id, current: item4, previous: item2, currentIndex: 1, previousIndex: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4 }, "2 items were replaced, with 1 excluded"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4 }).Because("2 items were replaced, with 1 excluded"); // Replace items, not changing inclusion var item5 = new Item() { Id = item3.Id, IsIncluded = false }; @@ -61,10 +47,9 @@ public void ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded( new(reason: ChangeReason.Update, key: item6.Id, current: item6, previous: item4, currentIndex: 1, previousIndex: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item6 }, "2 items were replaced, with 1 excluded"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item6 }).Because("2 items were replaced, with 1 excluded"); // Refresh items source.OnNext(new ChangeSet() @@ -73,10 +58,9 @@ public void ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded( new(reason: ChangeReason.Refresh, key: item6.Id, current: item6, index: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item6 }, "2 items were refreshed, with 1 excluded"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item6 }).Because("2 items were refreshed, with 1 excluded"); // Remove items source.OnNext(new ChangeSet() @@ -85,25 +69,23 @@ public void ItemsAreManipulated_UnmatchedItemsAreExcludedAndIndexesAreDiscarded( new(reason: ChangeReason.Remove, key: item6.Id, current: item6, index: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Should().BeEmpty("2 items were removed, with one excluded"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("2 items were removed, with one excluded"); - results.RecordedChangeSets.SelectMany(static changes => changes).Should().AllSatisfy( - change => - { - change.CurrentIndex.Should().Be(-1); - change.PreviousIndex.Should().Be(-1); - }, - because: "indexes should not be preserved"); - results.HasCompleted.Should().BeFalse(); + foreach (var change in results.RecordedChangeSets.SelectMany(static changes => changes)) + { + await Assert.That(change.CurrentIndex).IsEqualTo(-1).Because("indexes should not be preserved"); + await Assert.That(change.PreviousIndex).IsEqualTo(-1).Because("indexes should not be preserved"); + } + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void ItemsAreMoved_ChangesAreNotPropagated() + [Test] + public async Task ItemsAreMoved_ChangesAreNotPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .FilterImmutable(predicate: Item.Predicate) @@ -122,7 +104,6 @@ public void ItemsAreMoved_ChangesAreNotPropagated() }); var changeSetsBeforeMove = results.RecordedChangeSets.Count; - // Move items source.OnNext(new ChangeSet() { @@ -130,21 +111,20 @@ public void ItemsAreMoved_ChangesAreNotPropagated() new(reason: ChangeReason.Moved, key: item2.Id, current: item2, previous: default, currentIndex: 0, previousIndex: 1) }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(changeSetsBeforeMove).Should().BeEmpty("move operations should not be propagated"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(changeSetsBeforeMove)).IsEmpty().Because("move operations should not be propagated"); } - [Fact] - public void PredicateIsNull_ThrowsException() - => FluentActions.Invoking(() => Observable + [Test] + public async Task PredicateIsNull_ThrowsException() + => await Assert.That(() => Observable .Never>() - .FilterImmutable(predicate: null!)) - .Should().Throw(); + .FilterImmutable(predicate: null!)).Throws(); - [Fact] - public void PredicateThrows_ExceptionIsCaptured() + [Test] + public async Task PredicateThrows_ExceptionIsCaptured() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception(); @@ -153,29 +133,27 @@ public void PredicateThrows_ExceptionIsCaptured() .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - var item1 = new Item() { Id = 1, IsIncluded = true }; source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: item1.Id, current: item1) }); - results.Error.Should().Be(error); - results.RecordedChangeSets.Should().BeEmpty("no source operations should have been processed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations should have been processed"); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void SourceCompletes_CompletionIsPropagated() + [Test] + public async Task SourceCompletes_CompletionIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .FilterImmutable(predicate: Item.Predicate) .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - var item1 = new Item() { Id = 1, IsIncluded = true }; source.OnNext(new ChangeSet() { @@ -183,10 +161,10 @@ public void SourceCompletes_CompletionIsPropagated() }); source.OnCompleted(); - results.Error.Should().BeNull(); - results.HasCompleted.Should().BeTrue(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); // Make sure no extraneous notifications are published. @@ -196,11 +174,11 @@ public void SourceCompletes_CompletionIsPropagated() new(reason: ChangeReason.Add, key: item2.Id, current: item2) }); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations should have been processed"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations should have been processed"); } - [Fact] - public void SourceCompletesImmediately_CompletionIsPropagated() + [Test] + public async Task SourceCompletesImmediately_CompletionIsPropagated() { var item1 = new Item() { Id = 1, IsIncluded = true }; @@ -221,17 +199,16 @@ public void SourceCompletesImmediately_CompletionIsPropagated() .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - - results.Error.Should().BeNull(); - results.HasCompleted.Should().BeTrue(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); } - [Fact] - public void SourceErrors_ErrorIsPropagated() + [Test] + public async Task SourceErrors_ErrorIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception(); @@ -240,7 +217,6 @@ public void SourceErrors_ErrorIsPropagated() .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - var item1 = new Item() { Id = 1, IsIncluded = true }; source.OnNext(new ChangeSet() { @@ -248,10 +224,10 @@ public void SourceErrors_ErrorIsPropagated() }); source.OnError(error); - results.Error.Should().Be(error); - results.HasCompleted.Should().BeFalse(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); // Make sure no extraneous notifications are published. @@ -261,11 +237,11 @@ public void SourceErrors_ErrorIsPropagated() new(reason: ChangeReason.Add, key: item2.Id, current: item2) }); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("no source operations should have been processed"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("no source operations should have been processed"); } - [Fact] - public void SourceErrorsImmediately_ErrorIsPropagated() + [Test] + public async Task SourceErrorsImmediately_ErrorIsPropagated() { var item1 = new Item() { Id = 1, IsIncluded = true }; var error = new Exception(); @@ -287,24 +263,22 @@ public void SourceErrorsImmediately_ErrorIsPropagated() .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - - results.Error.Should().Be(error); - results.HasCompleted.Should().BeFalse(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.FilterImmutable( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.FilterImmutable( source: (null as IObservable>)!, - predicate: Item.Predicate)) - .Should().Throw(); + predicate: Item.Predicate)).Throws(); - [Fact] - public void SuppressEmptyChangesetsIsFalse_EmptyChangesetsArePublished() + [Test] + public async Task SuppressEmptyChangesetsIsFalse_EmptyChangesetsArePublished() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .FilterImmutable( @@ -313,34 +287,32 @@ public void SuppressEmptyChangesetsIsFalse_EmptyChangesetsArePublished() .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - ManipulateExcludedItems(source); - results.Error.Should().BeNull(); - results.HasCompleted.Should().BeFalse(); - results.RecordedChangeSets.Count.Should().Be(5, "5 source operations were performed"); - results.RecordedChangeSets.Should().AllSatisfy(changes => changes.Should().BeEmpty(), "no included items were manipulated"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(5).Because("5 source operations were performed"); + foreach (var changes in results.RecordedChangeSets) { await Assert.That(changes).IsEmpty().Because("no included items were manipulated"); } } - [Fact] - public void SuppressEmptyChangesetsIsTrue_EmptyChangesetsAreNotPublished() + [Test] + public async Task SuppressEmptyChangesetsIsTrue_EmptyChangesetsAreNotPublished() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .FilterImmutable(predicate: Item.Predicate) .ValidateChangeSets(Item.KeySelector) .RecordCacheItems(out var results); - ManipulateExcludedItems(source); - results.Error.Should().BeNull(); - results.HasCompleted.Should().BeFalse(); - results.RecordedChangeSets.Should().BeEmpty("no source operations should have generated changes"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations should have generated changes"); } - private static void ManipulateExcludedItems(ISubject> source) + private static void ManipulateExcludedItems(ReactiveUI.Primitives.Signals.ISignal> source) { var item1 = new Item() { Id = 1, IsIncluded = false }; source.OnNext(new ChangeSet() @@ -373,13 +345,13 @@ private static void ManipulateExcludedItems(ISubject> sour }); } - [Fact] - public void Update_PreviousMatchedCurrentDoesNot_EmitsRemoveCarryingPreviousAsCurrent() + [Test] + public async Task Update_PreviousMatchedCurrentDoesNot_EmitsRemoveCarryingPreviousAsCurrent() { // Per Change contract, a Remove change carries the item that was removed in Current. // For an Update where Previous matched the predicate but Current does not, the item that // leaves the filtered view is Previous (it was downstream; Current never reached downstream). - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .FilterImmutable(predicate: Item.Predicate) @@ -400,11 +372,11 @@ public void Update_PreviousMatchedCurrentDoesNot_EmitsRemoveCarryingPreviousAsCu }); var lastChangeSet = results.RecordedChangeSets[results.RecordedChangeSets.Count - 1]; - lastChangeSet.Count.Should().Be(1); + await Assert.That(lastChangeSet.Count).IsEqualTo(1); var removeChange = lastChangeSet.Single(); - removeChange.Reason.Should().Be(ChangeReason.Remove); - removeChange.Current.Should().BeSameAs(included, "Remove.Current must carry the item that left downstream (the previously-matching value), not the new value that never reached downstream"); + await Assert.That(removeChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(removeChange.Current).IsSameReferenceAs(included).Because("Remove.Current must carry the item that left downstream (the previously-matching value), not the new value that never reached downstream"); } private class Item diff --git a/src/DynamicData.Tests/Cache/FilterOnConnectFixture.cs b/src/DynamicData.Tests/Cache/FilterOnConnectFixture.cs index 7ed96e287..e8cbc4270 100644 --- a/src/DynamicData.Tests/Cache/FilterOnConnectFixture.cs +++ b/src/DynamicData.Tests/Cache/FilterOnConnectFixture.cs @@ -1,7 +1,3 @@ -using System.Linq; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Cache; /// @@ -9,8 +5,8 @@ namespace DynamicData.Tests.Cache; /// public class FilterOnConnectFixture { - [Fact] - public void ClearingSourceCacheWithPredicateShouldClearTheData() + [Test] + public async Task ClearingSourceCacheWithPredicateShouldClearTheData() { // having var source = new SourceCache(it => it); @@ -21,11 +17,11 @@ public void ClearingSourceCacheWithPredicateShouldClearTheData() source.Clear(); // then - results.Data.Count.Should().Be(0, "Should be 0"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("Should be 0"); } - [Fact] - public void UpdatesExistedBeforeConnectWithoutPredicateShouldBeVisibleAsPreviousWhenNewUpdatesTriggered() + [Test] + public async Task UpdatesExistedBeforeConnectWithoutPredicateShouldBeVisibleAsPreviousWhenNewUpdatesTriggered() { // having var source = new SourceCache(it => it); @@ -36,7 +32,7 @@ public void UpdatesExistedBeforeConnectWithoutPredicateShouldBeVisibleAsPrevious source.AddOrUpdate(1); // then - results.Messages.Count.Should().Be(2, "Should be 2 updates"); - results.Messages[1].First().Previous.HasValue.Should().Be(true, "Should have previous value"); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(results.Messages[1].First().Previous.HasValue).IsTrue().Because("Should have previous value"); } } diff --git a/src/DynamicData.Tests/Cache/FilterOnObservableFixture.cs b/src/DynamicData.Tests/Cache/FilterOnObservableFixture.cs index 84b487055..343bf27fe 100644 --- a/src/DynamicData.Tests/Cache/FilterOnObservableFixture.cs +++ b/src/DynamicData.Tests/Cache/FilterOnObservableFixture.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Microsoft.Reactive.Testing; -using Xunit; namespace DynamicData.Tests.Cache; @@ -28,8 +24,8 @@ public FilterOnObservableFixture() _sourceResults = _source.Connect().AsAggregator(); } - [Fact] - public void FactoryIsInvoked() + [Test] + public async Task FactoryIsInvoked() { // having var invoked = false; @@ -46,14 +42,14 @@ IObservable factory(Person p) AddPerson(MagicNumber); // then - _sourceResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); - val.Should().Be(MagicNumber, "Was value added to cache"); - Assert.Throws(() => _source.Connect().FilterOnObservable((Func>)null!)); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); + await Assert.That(val).IsEqualTo(MagicNumber).Because("Was value added to cache"); + await Assert.That(() => _source.Connect().FilterOnObservable((Func>)null!)).Throws(); } - [Fact] - public void FactoryWithKeyIsInvoked() + [Test] + public async Task FactoryWithKeyIsInvoked() { // having var invoked = false; @@ -70,15 +66,15 @@ IObservable factory(Person p, string name) AddPerson(MagicNumber); // then - _sourceResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); - val.Should().Be(MagicNumber, "Was value added to cache"); - Assert.Throws(() => _source.Connect().FilterOnObservable((Func>)null!)); - Assert.Throws(() => ObservableCacheEx.FilterOnObservable(null!, (Func>)null!)); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); + await Assert.That(val).IsEqualTo(MagicNumber).Because("Was value added to cache"); + await Assert.That(() => _source.Connect().FilterOnObservable((Func>)null!)).Throws(); + await Assert.That(() => ObservableCacheEx.FilterOnObservable(null!, (Func>)null!)).Throws(); } - [Fact] - public void FilteredOutIfNoObservableValue() + [Test] + public async Task FilteredOutIfNoObservableValue() { // having using var filterStats = _source.Connect().FilterOnObservable(p => Observable.Never()).AsAggregator(); @@ -87,14 +83,14 @@ public void FilteredOutIfNoObservableValue() AddPeople(MagicNumber); // then - _sourceResults.Data.Count.Should().Be(MagicNumber); - _sourceResults.Messages[0].Adds.Should().Be(MagicNumber); - _sourceResults.Messages.Count.Should().Be(1, "Should have all been added at once"); - filterStats.Messages.Count.Should().Be(0, "All items should be filtered out"); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(MagicNumber); + await Assert.That(_sourceResults.Messages[0].Adds).IsEqualTo(MagicNumber); + await Assert.That(_sourceResults.Messages.Count).IsEqualTo(1).Because("Should have all been added at once"); + await Assert.That(filterStats.Messages.Count).IsEqualTo(0).Because("All items should be filtered out"); } - [Fact] - public void ObservableFilterUsedToDetermineInclusion() + [Test] + public async Task ObservableFilterUsedToDetermineInclusion() { // having Predicate predicate = p => p.Age % 2 == 0; @@ -107,15 +103,15 @@ public void ObservableFilterUsedToDetermineInclusion() AddPeople(MagicNumber).ForEach(p => _ = predicate(p) ? passCount++ : failCount++); // then - _sourceResults.Data.Count.Should().Be(passCount + failCount); - filterStats.Data.Count.Should().Be(passCount); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(passCount + failCount); + await Assert.That(filterStats.Data.Count).IsEqualTo(passCount); } - [Fact] - public void ObservableFilterTriggersAddAndRemove() + [Test] + public async Task ObservableFilterTriggersAddAndRemove() { // having - ISubject filterSubject = new Subject(); + ReactiveUI.Primitives.Signals.ISignal filterSubject = new ReactiveUI.Primitives.Signals.Signal(); using var filterStats = _source.Connect().FilterOnObservable(_ => filterSubject).AsAggregator(); @@ -126,19 +122,19 @@ public void ObservableFilterTriggersAddAndRemove() filterSubject.OnNext(false); // then - _sourceResults.Data.Count.Should().Be(MagicNumber); - _sourceResults.Messages.Count.Should().Be(1, "Should have all been added at once"); - filterStats.Data.Count.Should().Be(0); - filterStats.Messages.Count.Should().Be(MagicNumber*2, "Each should be added and removed"); - filterStats.Summary.Overall.Adds.Should().Be(MagicNumber); - filterStats.Summary.Overall.Removes.Should().Be(MagicNumber); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(MagicNumber); + await Assert.That(_sourceResults.Messages.Count).IsEqualTo(1).Because("Should have all been added at once"); + await Assert.That(filterStats.Data.Count).IsEqualTo(0); + await Assert.That(filterStats.Messages.Count).IsEqualTo(MagicNumber * 2).Because("Each should be added and removed"); + await Assert.That(filterStats.Summary.Overall.Adds).IsEqualTo(MagicNumber); + await Assert.That(filterStats.Summary.Overall.Removes).IsEqualTo(MagicNumber); } - [Fact] - public void ObservableFilterDuplicateValuesHaveNoEffect() + [Test] + public async Task ObservableFilterDuplicateValuesHaveNoEffect() { // having - ISubject filterSubject = new Subject(); + ReactiveUI.Primitives.Signals.ISignal filterSubject = new ReactiveUI.Primitives.Signals.Signal(); using var filterStats = _source.Connect().FilterOnObservable(_ => filterSubject).AsAggregator(); @@ -153,19 +149,19 @@ public void ObservableFilterDuplicateValuesHaveNoEffect() filterSubject.OnNext(true); // then - _sourceResults.Data.Count.Should().Be(MagicNumber); - _sourceResults.Messages.Count.Should().Be(1, "Should have all been added at once"); - filterStats.Data.Count.Should().Be(MagicNumber); - filterStats.Messages.Count.Should().Be(MagicNumber, "Each should be added individually"); - filterStats.Summary.Overall.Adds.Should().Be(MagicNumber); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(MagicNumber); + await Assert.That(_sourceResults.Messages.Count).IsEqualTo(1).Because("Should have all been added at once"); + await Assert.That(filterStats.Data.Count).IsEqualTo(MagicNumber); + await Assert.That(filterStats.Messages.Count).IsEqualTo(MagicNumber).Because("Each should be added individually"); + await Assert.That(filterStats.Summary.Overall.Adds).IsEqualTo(MagicNumber); } - [Fact] - public void ObservableFilterChangesCanBeBuffered() + [Test] + public async Task ObservableFilterChangesCanBeBuffered() { // having TestScheduler? scheduler = new TestScheduler(); - ISubject filterSubject = new Subject(); + ReactiveUI.Primitives.Signals.ISignal filterSubject = new ReactiveUI.Primitives.Signals.Signal(); using var filterStats = _source.Connect().FilterOnObservable(_ => filterSubject, TimeSpan.FromSeconds(1), scheduler).AsAggregator(); @@ -176,11 +172,11 @@ public void ObservableFilterChangesCanBeBuffered() scheduler.AdvanceBy(TimeSpan.FromSeconds(2).Ticks); // then - _sourceResults.Data.Count.Should().Be(MagicNumber); - _sourceResults.Messages.Count.Should().Be(1, "Should have all been added at once"); - filterStats.Data.Count.Should().Be(MagicNumber); - filterStats.Messages.Count.Should().Be(1, "Should have all been added at once"); - filterStats.Summary.Overall.Adds.Should().Be(MagicNumber); + await Assert.That(_sourceResults.Data.Count).IsEqualTo(MagicNumber); + await Assert.That(_sourceResults.Messages.Count).IsEqualTo(1).Because("Should have all been added at once"); + await Assert.That(filterStats.Data.Count).IsEqualTo(MagicNumber); + await Assert.That(filterStats.Messages.Count).IsEqualTo(1).Because("Should have all been added at once"); + await Assert.That(filterStats.Summary.Overall.Adds).IsEqualTo(MagicNumber); } private static Person NewPerson(int n) => new("Name" + n, n); diff --git a/src/DynamicData.Tests/Cache/FilterParallelFixture.cs b/src/DynamicData.Tests/Cache/FilterParallelFixture.cs index bc1411684..a3f79962d 100644 --- a/src/DynamicData.Tests/Cache/FilterParallelFixture.cs +++ b/src/DynamicData.Tests/Cache/FilterParallelFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.PLinq; +#else using DynamicData.PLinq; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class FilterParallelFixture : IDisposable @@ -22,29 +19,29 @@ public FilterParallelFixture() _results = new ChangeSetAggregator(_source.Connect().Filter(p => p.Age > 20, new ParallelisationOptions(ParallelType.Ordered))); } - [Fact] - public void AddMatched() + [Test] + public async Task AddMatched() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddNotMatched() + [Test] + public async Task AddNotMatched() { var person = new Person("Adult1", 10); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void AddNotMatchedAndUpdateMatched() + [Test] + public async Task AddNotMatchedAndUpdateMatched() { const string key = "Adult1"; var notmatched = new Person(key, 19); @@ -57,48 +54,48 @@ public void AddNotMatchedAndUpdateMatched() updater.AddOrUpdate(matched); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].First().Current.Should().Be(matched, "Should be same person"); - _results.Data.Items[0].Should().Be(matched, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].First().Current).IsEqualTo(matched).Because("Should be same person"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(matched).Because("Should be same person"); } - [Fact] - public void AttemptedRemovalOfANonExistentKeyWillBeIgnored() + [Test] + public async Task AttemptedRemovalOfANonExistentKeyWillBeIgnored() { const string key = "Adult1"; _source.Remove(key); - _results.Messages.Count.Should().Be(0, "Should be 0 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be 0 updates"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddOrUpdate(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should return 80 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should return 80 adds"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Name).ToArray(); - _results.Data.Items.OrderBy(p => p.Name).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Name)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void BatchRemoves() + [Test] + public async Task BatchRemoves() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddOrUpdate(people); _source.Remove(people); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void BatchSuccessiveUpdates() + [Test] + public async Task BatchSuccessiveUpdates() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); foreach (var person in people) @@ -107,23 +104,23 @@ public void BatchSuccessiveUpdates() _source.AddOrUpdate(person1); } - _results.Messages.Count.Should().Be(80, "Should be 100 updates"); - _results.Data.Count.Should().Be(80, "Should be 100 in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(80).Because("Should be 100 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 100 in the cache"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddOrUpdate(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() @@ -132,8 +129,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -141,15 +138,15 @@ public void Remove() _source.AddOrUpdate(person); _source.Remove(key); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { const string key = "Adult1"; @@ -162,14 +159,14 @@ public void SameKeyChanges() updater.Remove(key); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[0].Updates.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Removes.Should().Be(1, "Should be 1 remove"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[0].Updates).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Removes).IsEqualTo(1).Because("Should be 1 remove"); } - [Fact] - public void UpdateMatched() + [Test] + public async Task UpdateMatched() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -178,13 +175,13 @@ public void UpdateMatched() _source.AddOrUpdate(newperson); _source.AddOrUpdate(updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[1].Updates.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[1].Updates).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void UpdateNotMatched() + [Test] + public async Task UpdateNotMatched() { const string key = "Adult1"; var newperson = new Person(key, 10); @@ -193,7 +190,7 @@ public void UpdateNotMatched() _source.AddOrUpdate(newperson); _source.AddOrUpdate(updated); - _results.Messages.Count.Should().Be(0, "Should be no updates"); - _results.Data.Count.Should().Be(0, "Should nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should nothing cached"); } } diff --git a/src/DynamicData.Tests/Cache/ForEachChangeFixture.cs b/src/DynamicData.Tests/Cache/ForEachChangeFixture.cs index 1da5de03a..d39f04258 100644 --- a/src/DynamicData.Tests/Cache/ForEachChangeFixture.cs +++ b/src/DynamicData.Tests/Cache/ForEachChangeFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class ForEachChangeFixture : IDisposable @@ -17,8 +10,8 @@ public class ForEachChangeFixture : IDisposable public void Dispose() => _source.Dispose(); - [Fact] - public void Test() + [Test] + public async Task Test() { var messages = new List>(); var messageWriter = _source.Connect().ForEachChange(messages.Add).Subscribe(); @@ -26,6 +19,6 @@ public void Test() _source.AddOrUpdate(new RandomPersonGenerator().Take(100)); messageWriter.Dispose(); - messages.Count.Should().Be(100); + await Assert.That(messages.Count).IsEqualTo(100); } } diff --git a/src/DynamicData.Tests/Cache/FromAsyncFixture.cs b/src/DynamicData.Tests/Cache/FromAsyncFixture.cs index 03f716d6d..a4303005f 100644 --- a/src/DynamicData.Tests/Cache/FromAsyncFixture.cs +++ b/src/DynamicData.Tests/Cache/FromAsyncFixture.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Threading.Tasks; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; public class FromAsyncFixture @@ -20,8 +8,8 @@ public class FromAsyncFixture public TestScheduler Scheduler { get; } - [Fact] - public void CanLoadFromTask() + [Test] + public async Task CanLoadFromTask() { Task> Loader() { @@ -32,11 +20,11 @@ Task> Loader() var data = Observable.FromAsync((Func>>)Loader).ToObservableChangeSet(p => p.Key).AsObservableCache(); - data.Count.Should().Be(100); + await Assert.That(data.Count).IsEqualTo(100); } - [Fact] - public void HandlesErrorsInObservable() + [Test] + public async Task HandlesErrorsInObservable() { Task> Loader() { @@ -48,11 +36,11 @@ Task> Loader() var data = Observable.FromAsync((Func>>)Loader).ToObservableChangeSet(p => p.Key).Subscribe((changes) => { }, ex => error = ex); - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } - [Fact] - public void HandlesErrorsObservableList() + [Test] + public async Task HandlesErrorsObservableList() { Task> Loader() { @@ -66,8 +54,8 @@ Task> Loader() var data2 = Observable.FromAsync(Loader).ToObservableChangeSet(p => p.Key).AsObservableCache().Connect().Subscribe(changes => { }, ex => error = ex); //var subscribed = data.Connect() - // + // - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } } diff --git a/src/DynamicData.Tests/Cache/FullJoinFixture.cs b/src/DynamicData.Tests/Cache/FullJoinFixture.cs index e290edcf1..82cccbb24 100644 --- a/src/DynamicData.Tests/Cache/FullJoinFixture.cs +++ b/src/DynamicData.Tests/Cache/FullJoinFixture.cs @@ -1,12 +1,3 @@ -using System; -using System.Linq; - -using DynamicData.Kernel; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class FullJoinFixture : IDisposable @@ -25,8 +16,8 @@ public FullJoinFixture() _result = _left.Connect().FullJoin(_right.Connect(), meta => meta.Name, (key, device, meta) => new DeviceWithMetadata(key, device, meta)).AsAggregator(); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { _left.Edit( innerCache => @@ -36,17 +27,17 @@ public void AddLeftOnly() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); - _result.Data.Lookup("Device1").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device2").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device3").HasValue.Should().BeTrue(); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Lookup("Device1").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device2").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device3").HasValue).IsTrue(); - _result.Data.Items.All(dwm => dwm.MetaData == Optional.None).Should().BeTrue(); - _result.Data.Items.All(dwm => dwm.Device != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData == ReactiveUI.Primitives.Optional.None)).IsTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddLetThenRight() + [Test] + public async Task AddLetThenRight() { _left.Edit( innerCache => @@ -64,13 +55,13 @@ public void AddLetThenRight() innerCache.AddOrUpdate(new DeviceMetaData("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddRightOnly() + [Test] + public async Task AddRightOnly() { _right.Edit( innerCache => @@ -80,16 +71,16 @@ public void AddRightOnly() innerCache.AddOrUpdate(new DeviceMetaData("Device3")); }); - _result.Data.Count.Should().Be(3); - _result.Data.Lookup("Device1").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device2").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device3").HasValue.Should().BeTrue(); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); - _result.Data.Items.All(dwm => dwm.Device == Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Lookup("Device1").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device2").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device3").HasValue).IsTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device == ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddRightThenLeft() + [Test] + public async Task AddRightThenLeft() { _right.Edit( innerCache => @@ -107,9 +98,9 @@ public void AddRightThenLeft() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); } public void Dispose() @@ -119,8 +110,8 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RemoveVarious() + [Test] + public async Task RemoveVarious() { _left.Edit( innerCache => @@ -137,23 +128,23 @@ public void RemoveVarious() innerCache.AddOrUpdate(new DeviceMetaData("Device2")); innerCache.AddOrUpdate(new DeviceMetaData("Device3")); }); - _result.Data.Lookup("Device1").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device2").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device3").HasValue.Should().BeTrue(); + await Assert.That(_result.Data.Lookup("Device1").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device2").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device3").HasValue).IsTrue(); _right.Remove("Device3"); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Count(dwm => dwm.MetaData != Optional.None).Should().Be(2); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Count(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsEqualTo(2); _left.Remove("Device1"); - _result.Data.Lookup("Device1").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device2").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device3").HasValue.Should().BeTrue(); + await Assert.That(_result.Data.Lookup("Device1").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device2").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device3").HasValue).IsTrue(); } - [Fact] - public void UpdateRight() + [Test] + public async Task UpdateRight() { _right.Edit( innerCache => @@ -171,9 +162,9 @@ public void UpdateRight() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); } public class Device(string name) : IEquatable @@ -280,13 +271,13 @@ public override int GetHashCode() public override string ToString() => $"Metadata: {Name}. IsAutoConnect = {IsAutoConnect}"; } - public class DeviceWithMetadata(string key, Optional device, Optional metaData) : IEquatable + public class DeviceWithMetadata(string key, ReactiveUI.Primitives.Optional device, ReactiveUI.Primitives.Optional metaData) : IEquatable { - public Optional Device { get; set; } = device; + public ReactiveUI.Primitives.Optional Device { get; set; } = device; public string Key { get; } = key; - public Optional MetaData { get; } = metaData; + public ReactiveUI.Primitives.Optional MetaData { get; } = metaData; public static bool operator ==(DeviceWithMetadata left, DeviceWithMetadata right) => Equals(left, right); diff --git a/src/DynamicData.Tests/Cache/FullJoinManyFixture.cs b/src/DynamicData.Tests/Cache/FullJoinManyFixture.cs index 0a0c99c29..0181b6fc9 100644 --- a/src/DynamicData.Tests/Cache/FullJoinManyFixture.cs +++ b/src/DynamicData.Tests/Cache/FullJoinManyFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class FullJoinManyFixture : IDisposable @@ -22,8 +19,8 @@ public FullJoinManyFixture() _result = _people.Connect().FullJoinMany(_people.Connect(), pac => pac.ParentName, (personid, person, grouping) => new ParentAndChildren(personid, person, grouping.Items.Select(p => p).ToArray())).AsAggregator(); } - [Fact] - public void AddChild() + [Test] + public async Task AddChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -39,20 +36,20 @@ public void AddChild() var updatedPeople = people.Union(new[] { person11 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { var people = Enumerable.Range(1, 1000).Select(i => new Person("Person" + i, i)).ToArray(); _people.AddOrUpdate(people); - AssertDataIsCorrectlyFormed(people); + await AssertDataIsCorrectlyFormed(people); } - [Fact] - public void AddPeopleWithParents() + [Test] + public async Task AddPeopleWithParents() { var people = Enumerable.Range(1, 10).Select( i => @@ -62,7 +59,7 @@ public void AddPeopleWithParents() }).ToArray(); _people.AddOrUpdate(people); - AssertDataIsCorrectlyFormed(people); + await AssertDataIsCorrectlyFormed(people); } public void Dispose() @@ -71,8 +68,8 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RemoveChild() + [Test] + public async Task RemoveChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -88,11 +85,11 @@ public void RemoveChild() var updatedPeople = people.Where(p => p.Name != last.Name).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateChild() + [Test] + public async Task UpdateChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -109,11 +106,11 @@ public void UpdateChild() var updatedPeople = people.Where(p => p.Name != "Person6").Union(new[] { person6 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateParent() + [Test] + public async Task UpdateParent() { var people = Enumerable.Range(1, 10).Select( i => @@ -130,10 +127,10 @@ public void UpdateParent() var updatedPeople = people.Take(9).Union(new[] { person10 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - private void AssertDataIsCorrectlyFormed(Person[] allPeople) + private async Task AssertDataIsCorrectlyFormed(Person[] allPeople) { var people = allPeople.ToDictionary(p => p.Name); var parentNames = allPeople.Select(p => p.ParentName).Distinct(); @@ -147,21 +144,20 @@ private void AssertDataIsCorrectlyFormed(Person[] allPeople) return new ParentAndChildren(key, parent, children); }).ToArray(); - _result.Data.Count.Should().Be(all.Length); + await Assert.That(_result.Data.Count).IsEqualTo(all.Length); - all.ForEach( - parentAndChild => - { - var result = parentAndChild.ParentId is null ? null : _result.Data.Lookup(parentAndChild.ParentId).ValueOrDefault(); + foreach (var parentAndChild in all) + { + var result = parentAndChild.ParentId is null ? null : _result.Data.Lookup(parentAndChild.ParentId).ValueOrDefault(); - if (result is null) - { - throw new InvalidOperationException(nameof(result)); - } + if (result is null) + { + throw new InvalidOperationException(nameof(result)); + } - var children = result.Children; - children.Should().BeEquivalentTo(parentAndChild.Children); - }); + var children = result.Children; + await Assert.That(children).IsEquivalentTo(parentAndChild.Children); + } } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] diff --git a/src/DynamicData.Tests/Cache/GroupControllerFixture.cs b/src/DynamicData.Tests/Cache/GroupControllerFixture.cs index 31686cadd..f967e223f 100644 --- a/src/DynamicData.Tests/Cache/GroupControllerFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupControllerFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class GroupControllerFixture : IDisposable @@ -25,14 +16,14 @@ public class GroupControllerFixture : IDisposable return p.Age <= 60 ? AgeBracket.Adult : AgeBracket.Pensioner; }; - private readonly ISubject _refresher; + private readonly ReactiveUI.Primitives.Signals.Signal _refresher; private readonly ISourceCache _source; public GroupControllerFixture() { _source = new SourceCache(p => p.Name); - _refresher = new Subject(); + _refresher = new ReactiveUI.Primitives.Signals.Signal(); _grouped = _source.Connect().Group(_grouper, _refresher).AsObservableCache(); } @@ -49,10 +40,11 @@ public void Dispose() { _source?.Dispose(); _grouped?.Dispose(); + _refresher.Dispose(); } - [Fact] - public void RegroupRecaluatesGroupings() + [Test] + public async Task RegroupRecaluatesGroupings() { var p1 = new Person("P1", 10); var p2 = new Person("P2", 15); @@ -62,10 +54,10 @@ public void RegroupRecaluatesGroupings() _source.AddOrUpdate(people); - IsContainedIn("P1", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P4", AgeBracket.Pensioner).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P4", AgeBracket.Pensioner)).IsTrue(); p1.Age = 60; p2.Age = 80; @@ -74,19 +66,19 @@ public void RegroupRecaluatesGroupings() _refresher.OnNext(Unit.Default); - IsContainedIn("P1", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Pensioner).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P4", AgeBracket.Adult).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Pensioner)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P4", AgeBracket.Adult)).IsTrue(); - IsContainedOnlyInOneGroup("P1").Should().BeTrue(); - IsContainedOnlyInOneGroup("P2").Should().BeTrue(); - IsContainedOnlyInOneGroup("P3").Should().BeTrue(); - IsContainedOnlyInOneGroup("P4").Should().BeTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P1")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P2")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P3")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P4")).IsTrue(); } - [Fact] - public void RegroupRecaluatesGroupings2() + [Test] + public async Task RegroupRecaluatesGroupings2() { var p1 = new Person("P1", 10); var p2 = new Person("P2", 15); @@ -96,10 +88,10 @@ public void RegroupRecaluatesGroupings2() _source.AddOrUpdate(people); - IsContainedIn("P1", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P4", AgeBracket.Pensioner).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P4", AgeBracket.Pensioner)).IsTrue(); p1.Age = 60; p2.Age = 80; @@ -110,15 +102,15 @@ public void RegroupRecaluatesGroupings2() _source.Refresh(new[] { p1, p2, p3, p4 }); - IsContainedIn("P1", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Pensioner).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P4", AgeBracket.Adult).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Pensioner)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P4", AgeBracket.Adult)).IsTrue(); - IsContainedOnlyInOneGroup("P1").Should().BeTrue(); - IsContainedOnlyInOneGroup("P2").Should().BeTrue(); - IsContainedOnlyInOneGroup("P3").Should().BeTrue(); - IsContainedOnlyInOneGroup("P4").Should().BeTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P1")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P2")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P3")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P4")).IsTrue(); } private bool IsContainedIn(string name, AgeBracket bracket) diff --git a/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs b/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs index 871f5498c..2566f2024 100644 --- a/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class GroupControllerForFilteredItemsFixture : IDisposable @@ -25,7 +16,7 @@ public class GroupControllerForFilteredItemsFixture : IDisposable return p.Age <= 60 ? AgeBracket.Adult : AgeBracket.Pensioner; }; - private readonly ISubject _refreshSubject = new Subject(); + private readonly ReactiveUI.Primitives.Signals.Signal _refreshSubject = new ReactiveUI.Primitives.Signals.Signal(); private readonly ISourceCache _source; @@ -49,10 +40,11 @@ public void Dispose() { _source.Dispose(); _grouped.Dispose(); + _refreshSubject.Dispose(); } - [Fact] - public void RegroupRecaluatesGroupings() + [Test] + public async Task RegroupRecaluatesGroupings() { var p1 = new Person("P1", 10); var p2 = new Person("P2", 15); @@ -62,9 +54,9 @@ public void RegroupRecaluatesGroupings() _source.AddOrUpdate(people); - IsContainedIn("P1", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Adult).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Adult)).IsTrue(); p1.Age = 60; p2.Age = 80; @@ -73,15 +65,15 @@ public void RegroupRecaluatesGroupings() _refreshSubject.OnNext(Unit.Default); - IsContainedIn("P1", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Under20).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Under20)).IsTrue(); - IsContainedOnlyInOneGroup("P1").Should().BeTrue(); - IsContainedOnlyInOneGroup("P2").Should().BeTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P1")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P2")).IsTrue(); } - [Fact] - public void RegroupRecaluatesGroupings2() + [Test] + public async Task RegroupRecaluatesGroupings2() { var p1 = new Person("P1", 10); var p2 = new Person("P2", 15); @@ -91,10 +83,10 @@ public void RegroupRecaluatesGroupings2() _source.AddOrUpdate(people); - IsContainedIn("P1", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P3", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P4", AgeBracket.Pensioner).Should().BeFalse(); + await Assert.That(IsContainedIn("P1", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P3", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P4", AgeBracket.Pensioner)).IsFalse(); p1.Age = 60; p2.Age = 80; @@ -105,15 +97,15 @@ public void RegroupRecaluatesGroupings2() _source.Refresh(new[] { p1, p2, p3, p4 }); - IsContainedIn("P1", AgeBracket.Adult).Should().BeTrue(); - IsContainedIn("P2", AgeBracket.Pensioner).Should().BeFalse(); - IsContainedIn("P3", AgeBracket.Under20).Should().BeTrue(); - IsContainedIn("P4", AgeBracket.Adult).Should().BeTrue(); + await Assert.That(IsContainedIn("P1", AgeBracket.Adult)).IsTrue(); + await Assert.That(IsContainedIn("P2", AgeBracket.Pensioner)).IsFalse(); + await Assert.That(IsContainedIn("P3", AgeBracket.Under20)).IsTrue(); + await Assert.That(IsContainedIn("P4", AgeBracket.Adult)).IsTrue(); - IsContainedOnlyInOneGroup("P1").Should().BeTrue(); - IsNotContainedAnyWhere("P2").Should().BeTrue(); - IsContainedOnlyInOneGroup("P3").Should().BeTrue(); - IsContainedOnlyInOneGroup("P4").Should().BeTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P1")).IsTrue(); + await Assert.That(IsNotContainedAnyWhere("P2")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P3")).IsTrue(); + await Assert.That(IsContainedOnlyInOneGroup("P4")).IsTrue(); } private bool IsContainedIn(string name, AgeBracket bracket) diff --git a/src/DynamicData.Tests/Cache/GroupFixture.cs b/src/DynamicData.Tests/Cache/GroupFixture.cs index c0139eed5..8afadf2e5 100644 --- a/src/DynamicData.Tests/Cache/GroupFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupFixture.cs @@ -1,15 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class GroupFixture : IDisposable @@ -20,8 +10,8 @@ public class GroupFixture : IDisposable public GroupFixture() => _source = new SourceCache(p => p.Name); - [Fact] - public void Kaboom() + [Test] + public async Task Kaboom() { SourceCache cache = new(x => x.Key); List listWithDuplicates = @@ -50,32 +40,36 @@ class Mytype(int key, string grouping) public override string ToString() => $"{Key}, {Grouping}"; } - [Fact] - public void Add() + [Test] + public async Task Add() { var called = false; + var observedCounts = new List(); + var observedReasons = new List(); var subscriber = _source.Connect().Group(p => p.Age).Subscribe( updates => { - updates.Count.Should().Be(1, "Should be 1 add"); - updates.First().Reason.Should().Be(ChangeReason.Add); + observedCounts.Add(updates.Count); + observedReasons.Add(updates.First().Reason); called = true; }); _source.AddOrUpdate(new Person("Person1", 20)); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); + await Assert.That(observedCounts).IsEquivalentTo(new[] { 1 }); + await Assert.That(observedReasons).IsEquivalentTo(new[] { ChangeReason.Add }); } - [Fact] - public void AddItemAfterUpdateItemProcessAdd() + [Test] + public async Task AddItemAfterUpdateItemProcessAdd() { var subscriber = _source.Connect().Group(x => x.Name[0].ToString()).Transform(x => new GroupViewModel(x)).Bind(out _entries).Subscribe(); _source.Edit(x => x.AddOrUpdate(new Person("Adam", 1))); var firstGroup = _entries.First(); - firstGroup.Entries.Count.Should().Be(1); + await Assert.That(firstGroup.Entries.Count).IsEqualTo(1); _source.Edit( x => @@ -84,36 +78,34 @@ public void AddItemAfterUpdateItemProcessAdd() x.AddOrUpdate(new Person("Alfred", 1)); // add }); - firstGroup.Entries.Count.Should().Be(2); + await Assert.That(firstGroup.Entries.Count).IsEqualTo(2); subscriber.Dispose(); } public void Dispose() => _source.Dispose(); - [Fact] - public void FiresCompletedWhenDisposed() + [Test] + public async Task FiresCompletedWhenDisposed() { var completed = false; var subscriber = _source.Connect().Group(p => p.Age).Subscribe(updates => { }, () => completed = true); _source.Dispose(); subscriber.Dispose(); - completed.Should().BeTrue(); + await Assert.That(completed).IsTrue(); } - [Fact] - public void FiresManyValueForBatchOfDifferentAdds() + [Test] + public async Task FiresManyValueForBatchOfDifferentAdds() { var called = false; + var observedCounts = new List(); + var observedReasons = new List(); var subscriber = _source.Connect().Group(p => p.Age).Subscribe( updates => { - updates.Count.Should().Be(4, "Should be 4 adds"); - foreach (var update in updates) - { - update.Reason.Should().Be(ChangeReason.Add); - } - + observedCounts.Add(updates.Count); + observedReasons.AddRange(updates.Select(update => update.Reason)); called = true; }); _source.Edit( @@ -126,18 +118,22 @@ public void FiresManyValueForBatchOfDifferentAdds() }); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); + await Assert.That(observedCounts).IsEquivalentTo(new[] { 4 }); + await Assert.That(observedReasons).IsEquivalentTo(Enumerable.Repeat(ChangeReason.Add, 4)); } - [Fact] - public void FiresOnlyOnceForABatchOfUniqueValues() + [Test] + public async Task FiresOnlyOnceForABatchOfUniqueValues() { var called = false; + var observedCounts = new List(); + var observedReasons = new List(); var subscriber = _source.Connect().Group(p => p.Age).Subscribe( updates => { - updates.Count.Should().Be(1, "Should be 1 add"); - updates.First().Reason.Should().Be(ChangeReason.Add); + observedCounts.Add(updates.Count); + observedReasons.Add(updates.First().Reason); called = true; }); _source.Edit( @@ -150,23 +146,23 @@ public void FiresOnlyOnceForABatchOfUniqueValues() }); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); + await Assert.That(observedCounts).IsEquivalentTo(new[] { 1 }); + await Assert.That(observedReasons).IsEquivalentTo(new[] { ChangeReason.Add }); } - [Fact] - public void FiresRemoveWhenEmptied() + [Test] + public async Task FiresRemoveWhenEmptied() { var called = false; + var observedCounts = new List(); + var observedReasons = new List(); //skip first one a this is setting up the stream var subscriber = _source.Connect().Group(p => p.Age).Skip(1).Subscribe( updates => { - updates.Count.Should().Be(1, "Should be 1 update"); - foreach (var update in updates) - { - update.Reason.Should().Be(ChangeReason.Remove); - } - + observedCounts.Add(updates.Count); + observedReasons.AddRange(updates.Select(update => update.Reason)); called = true; }); var person = new Person("Person1", 20); @@ -177,56 +173,62 @@ public void FiresRemoveWhenEmptied() _source.Remove(person); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); + await Assert.That(observedCounts).IsEquivalentTo(new[] { 1 }); + await Assert.That(observedReasons).IsEquivalentTo(new[] { ChangeReason.Remove }); } - [Fact] - public void ReceivesUpdateWhenFeederIsInvoked() + [Test] + public async Task ReceivesUpdateWhenFeederIsInvoked() { var called = false; var subscriber = _source.Connect().Group(p => p.Age).Subscribe(updates => called = true); _source.AddOrUpdate(new Person("Person1", 20)); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var called = false; + var observedCounts = new List(); + var observedReasons = new List(); var subscriber = _source.Connect().Group(p => p.Age).Skip(1).Subscribe( updates => { - updates.Count.Should().Be(1, "Should be 1 add"); - updates.First().Reason.Should().Be(ChangeReason.Remove); + observedCounts.Add(updates.Count); + observedReasons.Add(updates.First().Reason); called = true; }); _source.AddOrUpdate(new Person("Person1", 20)); _source.Remove(new Person("Person1", 20)); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); + await Assert.That(observedCounts).IsEquivalentTo(new[] { 1 }); + await Assert.That(observedReasons).IsEquivalentTo(new[] { ChangeReason.Remove }); } - [Fact] - public void UpdateAnItemWillChangedThegroup() + [Test] + public async Task UpdateAnItemWillChangedThegroup() { var called = false; var subscriber = _source.Connect().Group(p => p.Age).Subscribe(updates => called = true); _source.AddOrUpdate(new Person("Person1", 20)); _source.AddOrUpdate(new Person("Person1", 21)); subscriber.Dispose(); - called.Should().BeTrue(); + await Assert.That(called).IsTrue(); } - [Fact] - public void UpdateItemAfterAddItemProcessAdd() + [Test] + public async Task UpdateItemAfterAddItemProcessAdd() { var subscriber = _source.Connect().Group(x => x.Name[0].ToString()).Transform(x => new GroupViewModel(x)).Bind(out _entries).Subscribe(); _source.Edit(x => x.AddOrUpdate(new Person("Adam", 1))); var firstGroup = _entries.First(); - firstGroup.Entries.Count.Should().Be(1); + await Assert.That(firstGroup.Entries.Count).IsEqualTo(1); _source.Edit( x => @@ -235,20 +237,20 @@ public void UpdateItemAfterAddItemProcessAdd() x.AddOrUpdate(new Person("Adam", 3)); // update }); - firstGroup.Entries.Count.Should().Be(2); + await Assert.That(firstGroup.Entries.Count).IsEqualTo(2); subscriber.Dispose(); } - [Fact] - public void UpdateNotPossible() + [Test] + public async Task UpdateNotPossible() { var called = false; var subscriber = _source.Connect().Group(p => p.Age).Skip(1).Subscribe(updates => called = true); _source.AddOrUpdate(new Person("Person1", 20)); _source.AddOrUpdate(new Person("Person1", 20)); subscriber.Dispose(); - called.Should().BeFalse(); + await Assert.That(called).IsFalse(); } public class GroupEntryViewModel(Person person) diff --git a/src/DynamicData.Tests/Cache/GroupFromDistinctFixture.cs b/src/DynamicData.Tests/Cache/GroupFromDistinctFixture.cs index b5f3292dc..9145c2598 100644 --- a/src/DynamicData.Tests/Cache/GroupFromDistinctFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupFromDistinctFixture.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class GroupFromDistinctFixture : IDisposable @@ -29,8 +25,8 @@ public void Dispose() _employmentCache?.Dispose(); } - [Fact] - public void GroupFromDistinct() + [Test] + public async Task GroupFromDistinct() { const int numberOfPeople = 1000; var random = new Random(); @@ -53,14 +49,17 @@ public void GroupFromDistinct() _personCache.AddOrUpdate(people); _employmentCache.AddOrUpdate(emphistory); - allpeopleWithEmpHistory.Count.Should().Be(numberOfPeople); - allpeopleWithEmpHistory.Items.SelectMany(d => d.EmploymentData.Items).Count().Should().Be(emphistory.Count); + await Assert.That(allpeopleWithEmpHistory.Count).IsEqualTo(numberOfPeople); + await Assert.That(allpeopleWithEmpHistory.Items.SelectMany(d => d.EmploymentData.Items).Count()).IsEqualTo(emphistory.Count); //check grouped items have the same key as the parent - allpeopleWithEmpHistory.Items.ForEach(p => { p.EmploymentData.Items.All(emph => emph.Name == p.Person).Should().BeTrue(); }); + foreach (var personWithEmployment in allpeopleWithEmpHistory.Items) + { + await Assert.That(personWithEmployment.EmploymentData.Items.All(employment => employment.Name == personWithEmployment.Person)).IsTrue(); + } _personCache.Edit(updater => updater.Remove("Person1")); - allpeopleWithEmpHistory.Count.Should().Be(numberOfPeople - 1); + await Assert.That(allpeopleWithEmpHistory.Count).IsEqualTo(numberOfPeople - 1); _employmentCache.Edit(updater => updater.Remove(emphistory)); allpeopleWithEmpHistory.Dispose(); } diff --git a/src/DynamicData.Tests/Cache/GroupImmutableFixture.cs b/src/DynamicData.Tests/Cache/GroupImmutableFixture.cs index 8640bccb7..f5517297c 100644 --- a/src/DynamicData.Tests/Cache/GroupImmutableFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupImmutableFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class GroupImmutableFixture : IDisposable @@ -22,43 +19,41 @@ public GroupImmutableFixture() _results = _source.Connect().GroupWithImmutableState(p => p.Age).AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _source.AddOrUpdate(new Person("Person1", 20)); - _results.Data.Count.Should().Be(1, "Should be 1 add"); - _results.Messages.First().Adds.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 add"); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); } - [Fact] - public void ChanegMultipleGroups() + [Test] + public async Task ChanegMultipleGroups() { var initialPeople = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i % 10)).ToArray(); _source.AddOrUpdate(initialPeople); - initialPeople.GroupBy(p => p.Age).ForEach( - group => - { - var cache = _results.Data.Lookup(group.Key).Value; - cache.Items.Should().BeEquivalentTo(group); - }); + foreach (var group in initialPeople.GroupBy(p => p.Age)) + { + var cache = _results.Data.Lookup(group.Key).Value; + await Assert.That(cache.Items).IsEquivalentTo(group); + } var changedPeople = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i % 5)).ToArray(); _source.AddOrUpdate(changedPeople); - changedPeople.GroupBy(p => p.Age).ForEach( - group => - { - var cache = _results.Data.Lookup(group.Key).Value; - cache.Items.Should().BeEquivalentTo(group); - }); + foreach (var group in changedPeople.GroupBy(p => p.Age)) + { + var cache = _results.Data.Lookup(group.Key).Value; + await Assert.That(cache.Items).IsEquivalentTo(group); + } - _results.Messages.Count.Should().Be(2); - _results.Messages.First().Adds.Should().Be(10); - _results.Messages.Skip(1).First().Removes.Should().Be(5); - _results.Messages.Skip(1).First().Updates.Should().Be(5); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(10); + await Assert.That(_results.Messages.Skip(1).First().Removes).IsEqualTo(5); + await Assert.That(_results.Messages.Skip(1).First().Updates).IsEqualTo(5); } public void Dispose() @@ -67,8 +62,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void FiresManyValueForBatchOfDifferentAdds() + [Test] + public async Task FiresManyValueForBatchOfDifferentAdds() { _source.Edit( updater => @@ -79,17 +74,17 @@ public void FiresManyValueForBatchOfDifferentAdds() updater.AddOrUpdate(new Person("Person4", 23)); }); - _results.Data.Count.Should().Be(4); - _results.Messages.Count.Should().Be(1); - _results.Messages.First().Count.Should().Be(4); + await Assert.That(_results.Data.Count).IsEqualTo(4); + await Assert.That(_results.Messages.Count).IsEqualTo(1); + await Assert.That(_results.Messages.First().Count).IsEqualTo(4); foreach (var update in _results.Messages.First()) { - update.Reason.Should().Be(ChangeReason.Add); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Add); } } - [Fact] - public void FiresOnlyOnceForABatchOfUniqueValues() + [Test] + public async Task FiresOnlyOnceForABatchOfUniqueValues() { _source.Edit( updater => @@ -100,18 +95,18 @@ public void FiresOnlyOnceForABatchOfUniqueValues() updater.AddOrUpdate(new Person("Person4", 20)); }); - _results.Messages.Count.Should().Be(1); - _results.Messages.First().Adds.Should().Be(1); - _results.Data.Items[0].Count.Should().Be(4); + await Assert.That(_results.Messages.Count).IsEqualTo(1); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); + await Assert.That(_results.Data.Items[0].Count).IsEqualTo(4); } - [Fact] - public void Reevaluate() + [Test] + public async Task Reevaluate() { var initialPeople = Enumerable.Range(1, 10).Select(i => new Person("Person" + i, i % 2)).ToArray(); _source.AddOrUpdate(initialPeople); - _results.Messages.Count.Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); //do an inline update foreach (var person in initialPeople) @@ -122,59 +117,58 @@ public void Reevaluate() //signal operators to evaluate again _source.Refresh(); - initialPeople.GroupBy(p => p.Age).ForEach( - group => - { - var cache = _results.Data.Lookup(group.Key).Value; - cache.Items.Should().BeEquivalentTo(group); - }); + foreach (var group in initialPeople.GroupBy(p => p.Age)) + { + var cache = _results.Data.Lookup(group.Key).Value; + await Assert.That(cache.Items).IsEquivalentTo(group); + } - _results.Data.Count.Should().Be(2); - _results.Messages.Count.Should().Be(2); + await Assert.That(_results.Data.Count).IsEqualTo(2); + await Assert.That(_results.Messages.Count).IsEqualTo(2); var secondMessage = _results.Messages.Skip(1).First(); - secondMessage.Removes.Should().Be(1); - secondMessage.Updates.Should().Be(1); - secondMessage.Adds.Should().Be(1); + await Assert.That(secondMessage.Removes).IsEqualTo(1); + await Assert.That(secondMessage.Updates).IsEqualTo(1); + await Assert.That(secondMessage.Adds).IsEqualTo(1); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _source.AddOrUpdate(new Person("Person1", 20)); _source.Remove(new Person("Person1", 20)); - _results.Messages.Count.Should().Be(2); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void UpdateAnItemWillChangedThegroup() + [Test] + public async Task UpdateAnItemWillChangedThegroup() { _source.AddOrUpdate(new Person("Person1", 20)); _source.AddOrUpdate(new Person("Person1", 21)); - _results.Data.Count.Should().Be(1); - _results.Messages.First().Adds.Should().Be(1); - _results.Messages.Skip(1).First().Adds.Should().Be(1); - _results.Messages.Skip(1).First().Removes.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); + await Assert.That(_results.Messages.Skip(1).First().Adds).IsEqualTo(1); + await Assert.That(_results.Messages.Skip(1).First().Removes).IsEqualTo(1); var group = _results.Data.Items[0]; - group.Count.Should().Be(1); + await Assert.That(group.Count).IsEqualTo(1); - group.Key.Should().Be(21); + await Assert.That(group.Key).IsEqualTo(21); } - [Fact] - public void UpdatesArePermissible() + [Test] + public async Task UpdatesArePermissible() { _source.AddOrUpdate(new Person("Person1", 20)); _source.AddOrUpdate(new Person("Person2", 20)); - _results.Data.Count.Should().Be(1); //1 group - _results.Messages.First().Adds.Should().Be(1); - _results.Messages.Skip(1).First().Updates.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); //1 group + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); + await Assert.That(_results.Messages.Skip(1).First().Updates).IsEqualTo(1); var group = _results.Data.Items[0]; - group.Count.Should().Be(2); + await Assert.That(group.Count).IsEqualTo(2); } } diff --git a/src/DynamicData.Tests/Cache/GroupOnDynamicFixture.cs b/src/DynamicData.Tests/Cache/GroupOnDynamicFixture.cs index ab5fd0bd4..f46ac0032 100644 --- a/src/DynamicData.Tests/Cache/GroupOnDynamicFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupOnDynamicFixture.cs @@ -1,17 +1,10 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; - using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Xunit; - using Person = DynamicData.Tests.Domain.Person; namespace DynamicData.Tests.Cache; @@ -34,8 +27,8 @@ public class GroupOnDynamicFixture : IDisposable private readonly GroupChangeSetAggregator _groupResults; private readonly Faker _faker; private readonly Randomizer _randomizer; - private readonly BehaviorSubject?> _keySelectionSubject = new (null); - private readonly Subject _regroupSubject = new (); + private readonly ReactiveUI.Primitives.Signals.StateSignal?> _keySelectionSubject = new(null); + private readonly ReactiveUI.Primitives.Signals.Signal _regroupSubject = new(); public GroupOnDynamicFixture() { @@ -45,12 +38,12 @@ public GroupOnDynamicFixture() _groupResults = _cache.Connect().Group(KeySelectionObservable, _regroupSubject).AsAggregator(); } - [Theory] - [InlineData(5)] - [InlineData(10)] + [Test] + [Arguments(5)] + [Arguments(10)] #if !DEBUG - [InlineData(200)] - [InlineData(500)] + [Arguments(200)] + [Arguments(500)] #endif public async Task MultiThreadedStressTest(int changeCount) { @@ -104,11 +97,11 @@ await _randomizer.Interval(MaxIntervalTime) await Task.WhenAll(taskCacheChanges, taskGrouperChanges, taskRegrouperChanges); // Verify the results - VerifyGroupingResults(); + await VerifyGroupingResults(); } - [Fact] - public void ResultEmptyIfSelectionKeyDoesNotFire() + [Test] + public async Task ResultEmptyIfSelectionKeyDoesNotFire() { // Arrange @@ -116,14 +109,14 @@ public void ResultEmptyIfSelectionKeyDoesNotFire() InitialPopulate(); // Assert - _results.Data.Count.Should().Be(InitialCount); - _results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); - _groupResults.Messages.Count.Should().Be(0); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); + await Assert.That(_groupResults.Messages.Count).IsEqualTo(0); + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsAllInitialChildren() + [Test] + public async Task ResultContainsAllInitialChildren() { // Arrange InitialPopulate(); @@ -132,14 +125,14 @@ public void ResultContainsAllInitialChildren() GroupByFavColor(); // Assert - _results.Data.Count.Should().Be(InitialCount); - _results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().Be(1)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsEqualTo(1); } + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsAllAddedChildren() + [Test] + public async Task ResultContainsAllAddedChildren() { // Arrange GroupByFavColor(); @@ -148,14 +141,14 @@ public void ResultContainsAllAddedChildren() InitialPopulate(); // Assert - _results.Data.Count.Should().Be(InitialCount); - _results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().Be(1)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsEqualTo(1); } + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsAddedValues() + [Test] + public async Task ResultContainsAddedValues() { // Arrange InitialPopulate(); @@ -165,14 +158,14 @@ public void ResultContainsAddedValues() _cache.AddOrUpdate(_faker.Generate(AddCount)); // Assert - _results.Data.Count.Should().Be(InitialCount + AddCount); - _results.Messages.Count.Should().Be(2, "Initial Adds and then the subsequent Additions should each be a single message"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount + AddCount); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Initial Adds and then the subsequent Additions should each be a single message"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void ResultDoesNotContainRemovedValues() + [Test] + public async Task ResultDoesNotContainRemovedValues() { // Arrange InitialPopulate(); @@ -182,14 +175,14 @@ public void ResultDoesNotContainRemovedValues() _cache.RemoveKeys(_randomizer.ListItems(_cache.Items.ToList(), RemoveCount).Select(p => p.UniqueKey)); // Assert - _results.Data.Count.Should().Be(InitialCount - RemoveCount); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Removes"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount - RemoveCount); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Removes"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsUpdatedValues() + [Test] + public async Task ResultContainsUpdatedValues() { // Arrange GroupByPetType(); @@ -201,14 +194,14 @@ public void ResultContainsUpdatedValues() _cache.AddOrUpdate(replacements); // Assert - _results.Data.Count.Should().Be(InitialCount, "Only replacements were made"); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Updates"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount).Because("Only replacements were made"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Updates"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsRefreshedValues() + [Test] + public async Task ResultContainsRefreshedValues() { // Arrange GroupByPetType(); @@ -220,13 +213,13 @@ public void ResultContainsRefreshedValues() _cache.Refresh(refreshList); // Assert - _results.Data.Count.Should().Be(InitialCount, "Only replacements were made"); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Updates"); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount).Because("Only replacements were made"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Updates"); + await VerifyGroupingResults(); } - [Fact] - public void ResultIsCorrectWhenGroupSelectorChanges() + [Test] + public async Task ResultIsCorrectWhenGroupSelectorChanges() { // Arrange InitialPopulate(); @@ -238,16 +231,16 @@ public void ResultIsCorrectWhenGroupSelectorChanges() GroupByPetType(); // Assert - _results.Data.Count.Should().Be(InitialCount); - _results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); - _groupResults.Summary.Overall.Adds.Should().Be(usedColorList.Count + usedPetTypeList.Count); - _groupResults.Summary.Overall.Removes.Should().Be(usedColorList.Count); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); + await Assert.That(_groupResults.Summary.Overall.Adds).IsEqualTo(usedColorList.Count + usedPetTypeList.Count); + await Assert.That(_groupResults.Summary.Overall.Removes).IsEqualTo(usedColorList.Count); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void ResultIsCorrectAfterForcedRegroup() + [Test] + public async Task ResultIsCorrectAfterForcedRegroup() { // Arrange InitialPopulate(); @@ -258,23 +251,22 @@ public void ResultIsCorrectAfterForcedRegroup() ForceRegroup(); // Assert - _results.Data.Count.Should().Be(InitialCount); - _results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2, "1 for adds and 1 for regrouping")); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2).Because("1 for adds and 1 for regrouping"); } + await VerifyGroupingResults(); } - - [Theory] - [InlineData(false, false, false)] - [InlineData(false, false, true)] - [InlineData(false, true, false)] - [InlineData(false, true, true)] - [InlineData(true, false, false)] - [InlineData(true, false, true)] - [InlineData(true, true, false)] - [InlineData(true, true, true)] - public void ResultCompletesOnlyWhenAllInputsComplete(bool completeSource, bool completeKeySelector, bool completeRegrouper) + [Test] + [Arguments(false, false, false)] + [Arguments(false, false, true)] + [Arguments(false, true, false)] + [Arguments(false, true, true)] + [Arguments(true, false, false)] + [Arguments(true, false, true)] + [Arguments(true, true, false)] + [Arguments(true, true, true)] + public async Task ResultCompletesOnlyWhenAllInputsComplete(bool completeSource, bool completeKeySelector, bool completeRegrouper) { // Arrange InitialPopulate(); @@ -295,12 +287,12 @@ public void ResultCompletesOnlyWhenAllInputsComplete(bool completeSource, bool c } // Assert - _results.IsCompleted.Should().Be(completeSource); - _groupResults.IsCompleted.Should().Be(completeSource && completeKeySelector && completeRegrouper); + await Assert.That(_results.IsCompleted).IsEqualTo(completeSource); + await Assert.That(_groupResults.IsCompleted).IsEqualTo(completeSource && completeKeySelector && completeRegrouper); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange InitialPopulate(); @@ -312,11 +304,11 @@ public void ResultFailsIfSourceFails() _cache.Dispose(); // Assert - results.Error.Should().Be(expectedError); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Fact] - public void ResultFailsIfGroupObservableFails() + [Test] + public async Task ResultFailsIfGroupObservableFails() { // Arrange InitialPopulate(); @@ -326,11 +318,11 @@ public void ResultFailsIfGroupObservableFails() _keySelectionSubject.OnError(expectedError); // Assert - _groupResults.Error.Should().Be(expectedError); + await Assert.That(_groupResults.Error).IsEqualTo(expectedError); } - [Fact] - public void ResultFailsIfRegrouperFails() + [Test] + public async Task ResultFailsIfRegrouperFails() { // Arrange InitialPopulate(); @@ -340,7 +332,7 @@ public void ResultFailsIfRegrouperFails() _regroupSubject.OnError(expectedError); // Assert - _groupResults.Error.Should().Be(expectedError); + await Assert.That(_groupResults.Error).IsEqualTo(expectedError); } public void Dispose() @@ -356,15 +348,15 @@ public void Dispose() private void InitialPopulate() => _cache.AddOrUpdate(_faker.Generate(InitialCount)); - private void VerifyGroupingResults() => + private Task VerifyGroupingResults() => VerifyGroupingResults(_cache, _results, _groupResults, _keySelectionSubject.Value); - private static void VerifyGroupingResults(ISourceCache cache, ChangeSetAggregator cacheResults, GroupChangeSetAggregator groupResults, Func? groupKeySelector) + private static async Task VerifyGroupingResults(ISourceCache cache, ChangeSetAggregator cacheResults, GroupChangeSetAggregator groupResults, Func? groupKeySelector) { if (groupKeySelector is null) { - groupResults.Data.Count.Should().Be(0); - groupResults.Groups.Count.Should().Be(0); + await Assert.That(groupResults.Data.Count).IsEqualTo(0); + await Assert.That(groupResults.Groups.Count).IsEqualTo(0); return; } @@ -372,14 +364,14 @@ private static void VerifyGroupingResults(ISourceCache cache, Ch var expectedGroupings = expectedItems.GroupBy(p => groupKeySelector(p, string.Empty)).ToList(); // These datasets should be equivalent - expectedItems.Should().BeEquivalentTo(cacheResults.Data.Items); - expectedGroupings.Select(g => g.Key).Should().BeEquivalentTo(groupResults.Groups.Keys); + await Assert.That(expectedItems).IsEquivalentTo(cacheResults.Data.Items); + await Assert.That(expectedGroupings.Select(g => g.Key)).IsEquivalentTo(groupResults.Groups.Keys); // Check each group - expectedGroupings.ForEach(grouping => grouping.Should().BeEquivalentTo(groupResults.Groups.Lookup(grouping.Key).Value.Data.Items)); + foreach (var grouping in expectedGroupings) { await Assert.That(grouping).IsEquivalentTo(groupResults.Groups.Lookup(grouping.Key).Value.Data.Items); } // No groups should be empty - groupResults.Groups.Items.ForEach(group => group.Data.Count.Should().BeGreaterThan(0, "Empty groups should be removed")); + foreach (var group in groupResults.Groups.Items) { await Assert.That(group.Data.Count).IsGreaterThan(0).Because("Empty groups should be removed"); } } private void ForceRegroup() => _regroupSubject.OnNext(Unit.Default); diff --git a/src/DynamicData.Tests/Cache/GroupOnObservableFixture.cs b/src/DynamicData.Tests/Cache/GroupOnObservableFixture.cs index 1909b2abb..243013b02 100644 --- a/src/DynamicData.Tests/Cache/GroupOnObservableFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupOnObservableFixture.cs @@ -1,17 +1,15 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; - using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; - using Person = DynamicData.Tests.Domain.Person; namespace DynamicData.Tests.Cache; @@ -29,10 +27,10 @@ public class GroupOnObservableFixture : IDisposable private const int RemoveCount = 37; private const int UpdateCount = 101; #endif - private readonly SourceCache _cache = new (p => p.UniqueKey); + private readonly SourceCache _cache = new(p => p.UniqueKey); private readonly ChangeSetAggregator _results; private readonly GroupChangeSetAggregator _groupResults; - private readonly Subject _grouperShutdown; + private readonly ReactiveUI.Primitives.Signals.Signal _grouperShutdown; private readonly Faker _faker; private readonly Randomizer _randomizer = new(0x3141_5926); @@ -44,8 +42,8 @@ public GroupOnObservableFixture() _groupResults = _cache.Connect().GroupOnObservable(CreateFavoriteColorObservable).AsAggregator(); } - [Fact] - public void ResultContainsAllInitialChildren() + [Test] + public async Task ResultContainsAllInitialChildren() { // Arrange @@ -53,14 +51,14 @@ public void ResultContainsAllInitialChildren() _cache.AddOrUpdate(_faker.Generate(InitialCount)); // Assert - _results.Data.Count.Should().Be(InitialCount); - _results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().Be(1)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsEqualTo(1); } + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsAddedValues() + [Test] + public async Task ResultContainsAddedValues() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -69,14 +67,14 @@ public void ResultContainsAddedValues() _cache.AddOrUpdate(_faker.Generate(AddCount)); // Assert - _results.Data.Count.Should().Be(InitialCount + AddCount); - _results.Messages.Count.Should().Be(2, "Initial Adds and then the subsequent Additions should each be a single message"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount + AddCount); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Initial Adds and then the subsequent Additions should each be a single message"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void ResultDoesNotContainRemovedValues() + [Test] + public async Task ResultDoesNotContainRemovedValues() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -85,14 +83,14 @@ public void ResultDoesNotContainRemovedValues() _cache.RemoveKeys(_randomizer.ListItems(_cache.Items.ToList(), RemoveCount).Select(p => p.UniqueKey)); // Assert - _results.Data.Count.Should().Be(InitialCount - RemoveCount); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Removes"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount - RemoveCount); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Removes"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void ResultContainsUpdatedValues() + [Test] + public async Task ResultContainsUpdatedValues() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -103,14 +101,14 @@ public void ResultContainsUpdatedValues() _cache.AddOrUpdate(replacements); // Assert - _results.Data.Count.Should().Be(InitialCount, "Only replacements were made"); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Updates"); - _groupResults.Groups.Items.ForEach(group => group.Messages.Count.Should().BeLessThanOrEqualTo(2)); - VerifyGroupingResults(); + await Assert.That(_results.Data.Count).IsEqualTo(InitialCount).Because("Only replacements were made"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Updates"); + foreach (var group in _groupResults.Groups.Items) { await Assert.That(group.Messages.Count).IsLessThanOrEqualTo(2); } + await VerifyGroupingResults(); } - [Fact] - public void GroupRemovedWhenEmpty() + [Test] + public async Task GroupRemovedWhenEmpty() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -122,17 +120,17 @@ public void GroupRemovedWhenEmpty() _cache.Edit(updater => updater.Remove(updater.Items.Where(p => p.FavoriteColor == removeColor).Select(p => p.UniqueKey))); // Assert - _cache.Items.Select(p => p.FavoriteColor).Distinct().Count().Should().Be(colorCount - 1); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Removes"); - _groupResults.Data.Count.Should().Be(colorCount - 1, "{0} colors were used and then all of the {1} were removed", colorCount, removeColor); - _groupResults.Messages.Count.Should().Be(2, "1 for Adds and 1 for Removes"); - _groupResults.Summary.Overall.Adds.Should().Be(colorCount); - _groupResults.Summary.Overall.Removes.Should().Be(1); - VerifyGroupingResults(); + await Assert.That(_cache.Items.Select(p => p.FavoriteColor).Distinct().Count()).IsEqualTo(colorCount - 1); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Removes"); + await Assert.That(_groupResults.Data.Count).IsEqualTo(colorCount - 1).Because($"{colorCount} colors were used and then all of the {removeColor} were removed"); + await Assert.That(_groupResults.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Removes"); + await Assert.That(_groupResults.Summary.Overall.Adds).IsEqualTo(colorCount); + await Assert.That(_groupResults.Summary.Overall.Removes).IsEqualTo(1); + await VerifyGroupingResults(); } - [Fact] - public void GroupNotRemovedIfAddedBackImmediately() + [Test] + public async Task GroupNotRemovedIfAddedBackImmediately() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -150,18 +148,18 @@ public void GroupNotRemovedIfAddedBackImmediately() }); // Assert - _cache.Items.Select(p => p.FavoriteColor).Distinct().Count().Should().Be(colorCount); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Other Added Value"); - _groupResults.Data.Count.Should().Be(colorCount); - _groupResults.Messages.Count.Should().Be(1, "Shouldn't be removed/re-added"); - _groupResults.Summary.Overall.Adds.Should().Be(colorCount); - _groupResults.Summary.Overall.Removes.Should().Be(0); - _groupResults.Groups.Lookup(removeColor).Value.Data.Count.Should().Be(1, "All the {0} were removed and then 1 was added back", removeColor); - VerifyGroupingResults(); + await Assert.That(_cache.Items.Select(p => p.FavoriteColor).Distinct().Count()).IsEqualTo(colorCount); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Other Added Value"); + await Assert.That(_groupResults.Data.Count).IsEqualTo(colorCount); + await Assert.That(_groupResults.Messages.Count).IsEqualTo(1).Because("Shouldn't be removed/re-added"); + await Assert.That(_groupResults.Summary.Overall.Adds).IsEqualTo(colorCount); + await Assert.That(_groupResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(_groupResults.Groups.Lookup(removeColor).Value.Data.Count).IsEqualTo(1).Because($"All the {removeColor} were removed and then 1 was added back"); + await VerifyGroupingResults(); } - [Fact] - public void GroupingSequenceCompletesWhenEmpty() + [Test] + public async Task GroupingSequenceCompletesWhenEmpty() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -178,12 +176,12 @@ public void GroupingSequenceCompletesWhenEmpty() _cache.Edit(updater => updater.Remove(updater.Items.Where(p => p.FavoriteColor == removeColor).Select(p => p.UniqueKey))); // Assert - results.IsCompleted.Should().BeTrue(); - VerifyGroupingResults(); + await Assert.That(results.IsCompleted).IsTrue(); + await VerifyGroupingResults(); } - [Fact] - public void AllSequencesShouldCompleteWhenSourceAndGroupingObservablesComplete() + [Test] + public async Task AllSequencesShouldCompleteWhenSourceAndGroupingObservablesComplete() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -197,12 +195,12 @@ public void AllSequencesShouldCompleteWhenSourceAndGroupingObservablesComplete() _grouperShutdown.OnNext(Unit.Default); // Assert - results.IsCompleted.Should().BeTrue(); - VerifyGroupingResults(); + await Assert.That(results.IsCompleted).IsTrue(); + await VerifyGroupingResults(); } - [Fact] - public void AllGroupsRemovedWhenCleared() + [Test] + public async Task AllGroupsRemovedWhenCleared() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -213,15 +211,15 @@ public void AllGroupsRemovedWhenCleared() _cache.Clear(); // Assert - _cache.Items.Count.Should().Be(0); - _results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Removes"); - _groupResults.Summary.Overall.Adds.Should().Be(colorCount); - _groupResults.Summary.Overall.Removes.Should().Be(colorCount); - VerifyGroupingResults(); + await Assert.That(_cache.Items.Count).IsEqualTo(0); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Removes"); + await Assert.That(_groupResults.Summary.Overall.Adds).IsEqualTo(colorCount); + await Assert.That(_groupResults.Summary.Overall.Removes).IsEqualTo(colorCount); + await VerifyGroupingResults(); } - [Fact] - public void ResultsContainsCorrectRegroupedValues() + [Test] + public async Task ResultsContainsCorrectRegroupedValues() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -230,10 +228,10 @@ public void ResultsContainsCorrectRegroupedValues() Enumerable.Range(0, UpdateCount).ForEach(_ => RandomFavoriteColorChange()); // Assert - VerifyGroupingResults(); + await VerifyGroupingResults(); } - [Fact] + [Test] public async Task ResultsContainsCorrectRegroupedValuesAsync() { // Arrange @@ -244,15 +242,15 @@ public async Task ResultsContainsCorrectRegroupedValuesAsync() await Task.WhenAll(tasks.ToArray()); // Assert - VerifyGroupingResults(); + await VerifyGroupingResults(); } - [Theory] - [InlineData(false, false)] - [InlineData(true, false)] - [InlineData(false, true)] - [InlineData(true, true)] - public void ResultCompletesOnlyWhenSourceAndAllGroupingObservablesComplete(bool completeSource, bool completeGroups) + [Test] + [Arguments(false, false)] + [Arguments(true, false)] + [Arguments(false, true)] + [Arguments(true, true)] + public async Task ResultCompletesOnlyWhenSourceAndAllGroupingObservablesComplete(bool completeSource, bool completeGroups) { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -268,12 +266,12 @@ public void ResultCompletesOnlyWhenSourceAndAllGroupingObservablesComplete(bool } // Assert - _results.IsCompleted.Should().Be(completeSource); - _groupResults.IsCompleted.Should().Be(completeGroups && completeSource); + await Assert.That(_results.IsCompleted).IsEqualTo(completeSource); + await Assert.That(_groupResults.IsCompleted).IsEqualTo(completeGroups && completeSource); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -285,11 +283,11 @@ public void ResultFailsIfSourceFails() _cache.Dispose(); // Assert - results.Error.Should().Be(expectedError); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Fact] - public void ResultFailsIfGroupObservableFails() + [Test] + public async Task ResultFailsIfGroupObservableFails() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -300,11 +298,11 @@ public void ResultFailsIfGroupObservableFails() using var results = _cache.Connect().GroupOnObservable((person, key) => CreateFavoriteColorObservable(person, key).Take(1).Concat(throwObservable)).AsAggregator(); // Assert - results.Error.Should().Be(expectedError); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Fact] - public void OnErrorFiresIfSelectorThrows() + [Test] + public async Task OnErrorFiresIfSelectorThrows() { // Arrange _cache.AddOrUpdate(_faker.Generate(InitialCount)); @@ -314,7 +312,7 @@ public void OnErrorFiresIfSelectorThrows() using var results = _cache.Connect().GroupOnObservable(_ => throw expectedError).AsAggregator(); // Assert - results.Error.Should().Be(expectedError); + await Assert.That(results.Error).IsEqualTo(expectedError); } public void Dispose() @@ -335,23 +333,23 @@ private void RandomFavoriteColorChange() } } - private void VerifyGroupingResults() => + private Task VerifyGroupingResults() => VerifyGroupingResults(_cache, _results, _groupResults); - private static void VerifyGroupingResults(ISourceCache cache, ChangeSetAggregator cacheResults, GroupChangeSetAggregator groupResults) + private static async Task VerifyGroupingResults(ISourceCache cache, ChangeSetAggregator cacheResults, GroupChangeSetAggregator groupResults) { var expectedPersons = cache.Items.ToList(); var expectedGroupings = cache.Items.GroupBy(p => p.FavoriteColor).ToList(); // These datasets should be equivalent - expectedPersons.Should().BeEquivalentTo(cacheResults.Data.Items); - groupResults.Groups.Keys.Should().BeEquivalentTo(expectedGroupings.Select(g => g.Key)); + await Assert.That(expectedPersons).IsEquivalentTo(cacheResults.Data.Items); + await Assert.That(groupResults.Groups.Keys).IsEquivalentTo(expectedGroupings.Select(g => g.Key)); // Check each group - expectedGroupings.ForEach(grouping => grouping.Should().BeEquivalentTo(groupResults.Groups.Lookup(grouping.Key).Value.Data.Items)); + foreach (var grouping in expectedGroupings) { await Assert.That(grouping).IsEquivalentTo(groupResults.Groups.Lookup(grouping.Key).Value.Data.Items); } // No groups should be empty - groupResults.Groups.Items.ForEach(group => group.Data.Count.Should().BeGreaterThan(0, "Empty groups should be removed")); + foreach (var group in groupResults.Groups.Items) { await Assert.That(group.Data.Count).IsGreaterThan(0).Because("Empty groups should be removed"); } } private IObservable CreateFavoriteColorObservable(Person person, string key) => diff --git a/src/DynamicData.Tests/Cache/GroupOnPropertyFixture.cs b/src/DynamicData.Tests/Cache/GroupOnPropertyFixture.cs index 7af362118..7357795f7 100644 --- a/src/DynamicData.Tests/Cache/GroupOnPropertyFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupOnPropertyFixture.cs @@ -1,11 +1,9 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -21,21 +19,21 @@ public GroupOnPropertyFixture() _results = _source.Connect().GroupOnProperty(p => p.Age).AsAggregator(); } - [Fact] - public void CanGroupOnAdds() + [Test] + public async Task CanGroupOnAdds() { _source.AddOrUpdate(new Person("A", 10)); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Cache.Count.Should().Be(1); - firstGroup.Key.Should().Be(10); + await Assert.That(firstGroup.Cache.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(10); } - [Fact] - public void CanHandleAddBatch() + [Test] + public async Task CanHandleAddBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(1000).ToArray(); @@ -43,11 +41,11 @@ public void CanHandleAddBatch() _source.AddOrUpdate(people); var expectedGroupCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(expectedGroupCount); + await Assert.That(_results.Data.Count).IsEqualTo(expectedGroupCount); } - [Fact] - public void CanHandleChangedItemsBatch() + [Test] + public async Task CanHandleChangedItemsBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(100).ToArray(); @@ -55,27 +53,27 @@ public void CanHandleChangedItemsBatch() _source.AddOrUpdate(people); var initialCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(initialCount); + await Assert.That(_results.Data.Count).IsEqualTo(initialCount); people.Take(25).ForEach(p => p.Age = 200); var changedCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(changedCount); + await Assert.That(_results.Data.Count).IsEqualTo(changedCount); //check that each item is only in one cache var peopleInCache = _results.Data.Items.SelectMany(g => g.Cache.Items).ToArray(); - peopleInCache.Length.Should().Be(100); + await Assert.That(peopleInCache.Length).IsEqualTo(100); } - [Fact] - public void CanRemoveFromGroup() + [Test] + public async Task CanRemoveFromGroup() { var person = new Person("A", 10); _source.AddOrUpdate(person); _source.Remove(person); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() @@ -84,17 +82,17 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Regroup() + [Test] + public async Task Regroup() { var person = new Person("A", 10); _source.AddOrUpdate(person); person.Age = 20; - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Cache.Count.Should().Be(1); - firstGroup.Key.Should().Be(20); + await Assert.That(firstGroup.Cache.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(20); } } diff --git a/src/DynamicData.Tests/Cache/GroupOnPropertyWithImmutableStateFixture.cs b/src/DynamicData.Tests/Cache/GroupOnPropertyWithImmutableStateFixture.cs index 2321b6e3c..84a232edc 100644 --- a/src/DynamicData.Tests/Cache/GroupOnPropertyWithImmutableStateFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupOnPropertyWithImmutableStateFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class GroupOnPropertyWithImmutableStateFixture : IDisposable @@ -22,21 +19,21 @@ public GroupOnPropertyWithImmutableStateFixture() _results = _source.Connect().GroupOnPropertyWithImmutableState(p => p.Age).AsAggregator(); } - [Fact] - public void CanGroupOnAdds() + [Test] + public async Task CanGroupOnAdds() { _source.AddOrUpdate(new Person("A", 10)); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Count.Should().Be(1); - firstGroup.Key.Should().Be(10); + await Assert.That(firstGroup.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(10); } - [Fact] - public void CanHandleAddBatch() + [Test] + public async Task CanHandleAddBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(1000).ToArray(); @@ -44,11 +41,11 @@ public void CanHandleAddBatch() _source.AddOrUpdate(people); var expectedGroupCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(expectedGroupCount); + await Assert.That(_results.Data.Count).IsEqualTo(expectedGroupCount); } - [Fact] - public void CanHandleChangedItemsBatch() + [Test] + public async Task CanHandleChangedItemsBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(100).ToArray(); @@ -56,27 +53,27 @@ public void CanHandleChangedItemsBatch() _source.AddOrUpdate(people); var initialCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(initialCount); + await Assert.That(_results.Data.Count).IsEqualTo(initialCount); people.Take(25).ForEach(p => p.Age = 200); var changedCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(changedCount); + await Assert.That(_results.Data.Count).IsEqualTo(changedCount); //check that each item is only in one cache var peopleInCache = _results.Data.Items.SelectMany(g => g.Items).ToArray(); - peopleInCache.Length.Should().Be(100); + await Assert.That(peopleInCache.Length).IsEqualTo(100); } - [Fact] - public void CanRemoveFromGroup() + [Test] + public async Task CanRemoveFromGroup() { var person = new Person("A", 10); _source.AddOrUpdate(person); _source.Remove(person); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() @@ -85,17 +82,17 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Regroup() + [Test] + public async Task Regroup() { var person = new Person("A", 10); _source.AddOrUpdate(person); person.Age = 20; - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Count.Should().Be(1); - firstGroup.Key.Should().Be(20); + await Assert.That(firstGroup.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(20); } } diff --git a/src/DynamicData.Tests/Cache/IgnoreUpdateFixture.cs b/src/DynamicData.Tests/Cache/IgnoreUpdateFixture.cs index 7223a17af..caa98e2f5 100644 --- a/src/DynamicData.Tests/Cache/IgnoreUpdateFixture.cs +++ b/src/DynamicData.Tests/Cache/IgnoreUpdateFixture.cs @@ -1,11 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class IgnoreUpdateFixture : IDisposable @@ -26,15 +20,15 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void IgnoreFunctionWillIgnoreSubsequentUpdatesOfAnItem() + [Test] + public async Task IgnoreFunctionWillIgnoreSubsequentUpdatesOfAnItem() { var person = new Person("Person", 10); _source.AddOrUpdate(person); _source.AddOrUpdate(person); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } } diff --git a/src/DynamicData.Tests/Cache/IncludeUpdateFixture.cs b/src/DynamicData.Tests/Cache/IncludeUpdateFixture.cs index 5895a7e71..e34865775 100644 --- a/src/DynamicData.Tests/Cache/IncludeUpdateFixture.cs +++ b/src/DynamicData.Tests/Cache/IncludeUpdateFixture.cs @@ -1,11 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class IncludeUpdateFixture : IDisposable @@ -26,15 +20,15 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void IgnoreFunctionWillIgnoreSubsequentUpdatesOfAnItem() + [Test] + public async Task IgnoreFunctionWillIgnoreSubsequentUpdatesOfAnItem() { var person = new Person("Person", 10); _source.AddOrUpdate(person); _source.AddOrUpdate(person); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } } diff --git a/src/DynamicData.Tests/Cache/InnerJoinFixture.cs b/src/DynamicData.Tests/Cache/InnerJoinFixture.cs index bd5ffc054..6f479d1bd 100644 --- a/src/DynamicData.Tests/Cache/InnerJoinFixture.cs +++ b/src/DynamicData.Tests/Cache/InnerJoinFixture.cs @@ -1,18 +1,10 @@ -using System; - -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class InnerJoinFixture : IDisposable { private readonly SourceCache _left; - private readonly ChangeSetAggregator _result; + private readonly ChangeSetAggregator _result; private readonly SourceCache _right; @@ -24,8 +16,8 @@ public InnerJoinFixture() _result = _left.Connect().InnerJoin(_right.Connect(), meta => meta.Name, (key, device, meta) => new DeviceWithMetadata(key, device, meta)).AsAggregator(); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { _left.Edit( innerCache => @@ -35,11 +27,11 @@ public void AddLeftOnly() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(0); + await Assert.That(_result.Data.Count).IsEqualTo(0); } - [Fact] - public void AddLeftThenRight() + [Test] + public async Task AddLeftThenRight() { _left.Edit( innerCache => @@ -52,37 +44,37 @@ public void AddLeftThenRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); } - [Fact] - public void AddRightOnly() + [Test] + public async Task AddRightOnly() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(0); + await Assert.That(_result.Data.Count).IsEqualTo(0); } - [Fact] - public void AddRightThenLeft() + [Test] + public async Task AddRightThenLeft() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _left.Edit( @@ -93,7 +85,7 @@ public void AddRightThenLeft() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); } public void Dispose() @@ -103,8 +95,8 @@ public void Dispose() _result?.Dispose(); } - [Fact] - public void RefreshRightKey() + [Test] + public async Task RefreshRightKey() { _left.Edit( innerCache => @@ -117,47 +109,43 @@ public void RefreshRightKey() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); var refreshItem = _right.Lookup(2).Value; - // Change pairing refreshItem.Name = "Device3"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Keys.Should().Contain(("Device3", 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Keys).Contains(("Device3", 2)); // Remove pairing refreshItem.Name = "Device4"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(2); - _result.Data.Keys.Should().NotContain(pair => pair.rightKey == 2); - + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Keys).DoesNotContain(pair => pair.rightKey == 2); // Restore pairing refreshItem.Name = "Device2"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Keys.Should().Contain(("Device2", 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Keys).Contains(("Device2", 2)); // No change _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Keys.Should().Contain(("Device2", 2)); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Keys).Contains(("Device2", 2)); } - [Fact] - public void RemoveVarious() + [Test] + public async Task RemoveVarious() { _left.Edit( innerCache => @@ -170,35 +158,35 @@ public void RemoveVarious() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Lookup(("Device1",1)).HasValue.Should().BeTrue(); - _result.Data.Lookup(("Device2",2)).HasValue.Should().BeTrue(); - _result.Data.Lookup(("Device3",3)).HasValue.Should().BeTrue(); + await Assert.That(_result.Data.Lookup(("Device1", 1)).HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup(("Device2", 2)).HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup(("Device3", 3)).HasValue).IsTrue(); _right.Remove(3); - _result.Data.Count.Should().Be(2); + await Assert.That(_result.Data.Count).IsEqualTo(2); _left.Remove("Device1"); - _result.Data.Count.Should().Be(1); - _result.Data.Lookup(("Device1",1)).HasValue.Should().BeFalse(); - _result.Data.Lookup(("Device2",2)).HasValue.Should().BeTrue(); - _result.Data.Lookup(("Device3",3)).HasValue.Should().BeFalse(); + await Assert.That(_result.Data.Count).IsEqualTo(1); + await Assert.That(_result.Data.Lookup(("Device1", 1)).HasValue).IsFalse(); + await Assert.That(_result.Data.Lookup(("Device2", 2)).HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup(("Device3", 3)).HasValue).IsFalse(); } - [Fact] - public void UpdateRight() + [Test] + public async Task UpdateRight() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _left.Edit( @@ -209,11 +197,11 @@ public void UpdateRight() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); } - [Fact] - public void UpdateRightKey() + [Test] + public async Task UpdateRightKey() { _left.Edit( innerCache => @@ -226,42 +214,38 @@ public void UpdateRightKey() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - // Change pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device3")); - - _result.Data.Count.Should().Be(3); - _result.Data.Keys.Should().Contain(("Device3", 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device3")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Keys).Contains(("Device3", 2)); // Remove pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device4")); - - _result.Data.Count.Should().Be(2); - _result.Data.Keys.Should().NotContain(pair => pair.rightKey == 2); + _right.AddOrUpdate(new DeviceMetaData(2, "Device4")); + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Keys).DoesNotContain(pair => pair.rightKey == 2); // Restore pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device2")); - - _result.Data.Count.Should().Be(3); - _result.Data.Keys.Should().Contain(("Device2", 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Keys).Contains(("Device2", 2)); // No change - _right.AddOrUpdate(new DeviceMetaData(2,"Device2")); + _right.AddOrUpdate(new DeviceMetaData(2, "Device2")); - _result.Data.Count.Should().Be(3); - _result.Data.Keys.Should().Contain(("Device2", 2)); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Keys).Contains(("Device2", 2)); } - [Fact] - public void MultipleRight() + [Test] + public async Task MultipleRight() { _left.Edit( innerCache => @@ -274,16 +258,16 @@ public void MultipleRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device3")); // deliberate! - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device3")); // deliberate! + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); } - [Fact] - public void MoreRight() + [Test] + public async Task MoreRight() { _left.Edit( innerCache => @@ -296,40 +280,40 @@ public void MoreRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); - innerCache.AddOrUpdate(new DeviceMetaData(4,"Device4")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(4, "Device4")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Lookup(("Device4",4)).HasValue.Should().BeFalse(); + await Assert.That(_result.Data.Lookup(("Device4", 4)).HasValue).IsFalse(); } - [Fact] - public void InitializationWaitsForBothSources() + [Test] + public async Task InitializationWaitsForBothSources() { var left = new[] { 1, 2, 3 }; var right = new[] { 4, 6, 2 }; ObservableCacheEx .InnerJoin( - left: left.AsObservableChangeSet(static left => 2 * left), - right: right.AsObservableChangeSet(static right => right), - rightKeySelector: static right => right, - resultSelector: static (left, right) => (left, right)) + left: left.AsObservableChangeSet(static left => 2 * left), + right: right.AsObservableChangeSet(static right => right), + rightKeySelector: static right => right, + resultSelector: static (left, right) => (left, right)) .ValidateSynchronization() .ValidateChangeSets(static pair => (2 * pair.left, pair.right)) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); - results.RecordedChangeSets.Count.Should().Be(1, "Initialization should only emit one changeset."); - results.RecordedChangeSets[0].Should().OnlyContain(change => change.Reason == ChangeReason.Add, "Initialization should only emit Add changes."); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("Initialization should only emit one changeset."); + await Assert.That(results.RecordedChangeSets[0]).ContainsOnly(change => change.Reason == ChangeReason.Add).Because("Initialization should only emit Add changes."); - results.RecordedItemsByKey.Values.Should().OnlyContain(pair => (2 * pair.left) == pair.right, "Source items should have been joined correctly"); + await Assert.That(results.RecordedItemsByKey.Values).ContainsOnly(pair => (2 * pair.left) == pair.right).Because("Source items should have been joined correctly"); } public class Device(string name) : IEquatable @@ -400,7 +384,7 @@ public override bool Equals(object? obj) if (obj is null) return false; if (ReferenceEquals(this, obj)) return true; if (obj.GetType() != this.GetType()) return false; - return Equals((DeviceMetaData) obj); + return Equals((DeviceMetaData)obj); } public override int GetHashCode() => HashCode.Combine(IsAutoConnect, Key, Name); diff --git a/src/DynamicData.Tests/Cache/InnerJoinFixtureRaceCondition.cs b/src/DynamicData.Tests/Cache/InnerJoinFixtureRaceCondition.cs index bdad60ee9..7d6a3ef0e 100644 --- a/src/DynamicData.Tests/Cache/InnerJoinFixtureRaceCondition.cs +++ b/src/DynamicData.Tests/Cache/InnerJoinFixtureRaceCondition.cs @@ -1,9 +1,3 @@ -using System; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - -using Xunit; - namespace DynamicData.Tests.Cache; public class InnerJoinFixtureRaceCondition @@ -14,8 +8,8 @@ public class InnerJoinFixtureRaceCondition /// RP: 04-June-2020 Before the fix, this code occasionally caused a threading issue and the fix seems to have worked. /// I am leaving it here for a short period of time to see whether it produces traffic light test results. /// - [Fact] - public void LetsSeeWhetherWeCanRandomlyHitARaceCondition() + [Test] + public async Task LetsSeeWhetherWeCanRandomlyHitARaceCondition() { var ids = ObservableChangeSet.Create(sourceCache => { return Observable.Range(1, 1000000, Scheduler.Default).Subscribe(x => sourceCache.AddOrUpdate(x)); }, x => x); @@ -32,9 +26,9 @@ public void LetsSeeWhetherWeCanRandomlyHitARaceCondition() ids.InnerJoin(itemsCache.Connect(), x => x.Id, (_, thing) => thing).Subscribe((z) => { }, ex => { }, () => { }); } - // See https://github.com/reactivemarbles/DynamicData/issues/787 - [Fact] - public void LetsSeeWhetherWeCanRandomlyHitADifferentRaceCondition() + // See https://github.com/reactivemarbles/DynamicData/issues/787 + [Test] + public async Task LetsSeeWhetherWeCanRandomlyHitADifferentRaceCondition() { using var leftSource = new SourceCache(thing => thing.Id); using var rightSource = new SourceCache(thing => thing.Id); diff --git a/src/DynamicData.Tests/Cache/InnerJoinManyFixture.cs b/src/DynamicData.Tests/Cache/InnerJoinManyFixture.cs index edaad944a..058f3b92e 100644 --- a/src/DynamicData.Tests/Cache/InnerJoinManyFixture.cs +++ b/src/DynamicData.Tests/Cache/InnerJoinManyFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class InnerJoinManyFixture : IDisposable @@ -23,8 +20,8 @@ public InnerJoinManyFixture() _result = _people.Connect().InnerJoinMany(_people.Connect(), pac => pac.ParentName, (person, grouping) => new ParentAndChildren(person, grouping.Items.Select(p => p).ToArray())).AsAggregator(); } - [Fact] - public void AddChild() + [Test] + public async Task AddChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -40,21 +37,21 @@ public void AddChild() var updatedPeople = people.Union(new[] { person11 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { var people = Enumerable.Range(1, 10).Select(i => new Person("Person" + i, i)).ToArray(); _people.AddOrUpdate(people); - _result.Data.Count.Should().Be(0); + await Assert.That(_result.Data.Count).IsEqualTo(0); } - [Fact] - public void AddPeopleWithParents() + [Test] + public async Task AddPeopleWithParents() { var people = Enumerable.Range(1, 10).Select( i => @@ -65,7 +62,7 @@ public void AddPeopleWithParents() _people.AddOrUpdate(people); - AssertDataIsCorrectlyFormed(people); + await AssertDataIsCorrectlyFormed(people); } public void Dispose() @@ -74,54 +71,50 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RefreshRightKey() + [Test] + public async Task RefreshRightKey() { _people.Edit( innerCache => { - innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" } ); + innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty }); + innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); + innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" }); }); var refreshPerson = _people.Lookup("Person #2").Value; - // Change pairing refreshPerson.ParentName = "Person #3"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(2); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().NotContain(("Person #1", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #3", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).DoesNotContain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #3", "Person #2")); // Remove pairing refreshPerson.ParentName = "Person #4"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(1); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name))).Should().NotContain(pair => pair.chilldName == "Person #2"); - + await Assert.That(_result.Data.Count).IsEqualTo(1); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name)))).DoesNotContain(pair => pair.chilldName == "Person #2"); // Restore pairing refreshPerson.ParentName = "Person #1"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(2); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); // No change _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(2); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); } - [Fact] - public void RemoveChild() + [Test] + public async Task RemoveChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -137,11 +130,11 @@ public void RemoveChild() var updatedPeople = people.Where(p => p.Name != last.Name).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople, last.Name); + await AssertDataIsCorrectlyFormed(updatedPeople, last.Name); } - [Fact] - public void UpdateChild() + [Test] + public async Task UpdateChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -158,11 +151,11 @@ public void UpdateChild() var updatedPeople = people.Where(p => p.Name != "Person6").Union(new[] { person6 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateParent() + [Test] + public async Task UpdateParent() { var people = Enumerable.Range(1, 10).Select( i => @@ -179,69 +172,64 @@ public void UpdateParent() var updatedPeople = people.Take(9).Union(new[] { person10 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateRightKey() + [Test] + public async Task UpdateRightKey() { _people.Edit( innerCache => { - innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" } ); + innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty }); + innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); + innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" }); }); - // Change pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #3" }); - _result.Data.Count.Should().Be(2); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().NotContain(("Person #1", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #3", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).DoesNotContain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #3", "Person #2")); // Remove pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #4" }); - _result.Data.Count.Should().Be(1); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name))).Should().NotContain(pair => pair.chilldName == "Person #2"); - + await Assert.That(_result.Data.Count).IsEqualTo(1); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name)))).DoesNotContain(pair => pair.chilldName == "Person #2"); // Restore pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); - _result.Data.Count.Should().Be(2); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); // No change _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); - _result.Data.Count.Should().Be(2); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); } - private void AssertDataIsCorrectlyFormed(Person[] allPeople, params string[] missingParents) + private async Task AssertDataIsCorrectlyFormed(Person[] allPeople, params string[] missingParents) { var grouped = allPeople.GroupBy(p => p.ParentName).Where(p => p.Any() && !missingParents.Contains(p.Key)).AsArray(); - _result.Data.Count.Should().Be(grouped.Length); + await Assert.That(_result.Data.Count).IsEqualTo(grouped.Length); - grouped.ForEach( - grouping => + foreach (var grouping in grouped) + { + if (missingParents.Length > 0 && missingParents.Contains(grouping.Key)) { - if (missingParents.Length > 0 && missingParents.Contains(grouping.Key)) - { - return; - } + continue; + } - var result = _result.Data.Lookup(grouping.Key).ValueOrThrow(() => new Exception("Missing result for " + grouping.Key)); + var result = _result.Data.Lookup(grouping.Key).ValueOrThrow(() => new Exception("Missing result for " + grouping.Key)); - var children = result.Children; - children.Should().BeEquivalentTo(grouping); - }); + var children = result.Children; + await Assert.That(children).IsEquivalentTo(grouping); + } } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] diff --git a/src/DynamicData.Tests/Cache/KeyValueCollectionEx.cs b/src/DynamicData.Tests/Cache/KeyValueCollectionEx.cs index d8f46418e..f7f437f1c 100644 --- a/src/DynamicData.Tests/Cache/KeyValueCollectionEx.cs +++ b/src/DynamicData.Tests/Cache/KeyValueCollectionEx.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Linq; - namespace DynamicData.Tests.Cache; public static class KeyValueCollectionEx diff --git a/src/DynamicData.Tests/Cache/LeftJoinFixture.cs b/src/DynamicData.Tests/Cache/LeftJoinFixture.cs index c5d0fcd35..5abeff47e 100644 --- a/src/DynamicData.Tests/Cache/LeftJoinFixture.cs +++ b/src/DynamicData.Tests/Cache/LeftJoinFixture.cs @@ -1,12 +1,8 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; @@ -26,8 +22,8 @@ public LeftJoinFixture() _result = _left.Connect().LeftJoin(_right.Connect(), meta => meta.Name, (key, device, meta) => new DeviceWithMetadata(device, meta)).AsAggregator(); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { _left.Edit( innerCache => @@ -37,16 +33,16 @@ public void AddLeftOnly() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); - _result.Data.Lookup("Device1").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device2").HasValue.Should().BeTrue(); - _result.Data.Lookup("Device3").HasValue.Should().BeTrue(); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Lookup("Device1").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device2").HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup("Device3").HasValue).IsTrue(); - _result.Data.Items.All(dwm => dwm.MetaData == Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData == ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddLetThenRight() + [Test] + public async Task AddLetThenRight() { _left.Edit( innerCache => @@ -59,39 +55,39 @@ public void AddLetThenRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddRightOnly() + [Test] + public async Task AddRightOnly() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(0); + await Assert.That(_result.Data.Count).IsEqualTo(0); } - [Fact] - public void AddRightThenLeft() + [Test] + public async Task AddRightThenLeft() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _left.Edit( @@ -102,9 +98,9 @@ public void AddRightThenLeft() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); } public void Dispose() @@ -114,8 +110,8 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RefreshRightKey() + [Test] + public async Task RefreshRightKey() { _left.Edit( innerCache => @@ -128,47 +124,43 @@ public void RefreshRightKey() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); }); var refreshItem = _right.Lookup(2).Value; - // Change pairing refreshItem.Name = "Device3"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().NotContain(("Device2", 2)); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().Contain(("Device3", 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).DoesNotContain(("Device2", 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).Contains(("Device3", 2)); // Remove pairing refreshItem.Name = "Device4"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().NotContain(pair => pair.Key == 2); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).DoesNotContain(pair => pair.Key == 2); // Restore pairing refreshItem.Name = "Device2"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().Contain(("Device2", 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).Contains(("Device2", 2)); // No change _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().Contain(("Device2", 2)); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).Contains(("Device2", 2)); } - [Fact] - public void RemoveVarious() + [Test] + public async Task RemoveVarious() { _left.Edit( innerCache => @@ -181,29 +173,29 @@ public void RemoveVarious() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _right.Remove(3); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Count(dwm => dwm.MetaData != Optional.None).Should().Be(2); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Count(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsEqualTo(2); _left.Remove("Device1"); - _result.Data.Lookup("Device1").HasValue.Should().BeFalse(); + await Assert.That(_result.Data.Lookup("Device1").HasValue).IsFalse(); } - [Fact] - public void UpdateRight() + [Test] + public async Task UpdateRight() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _left.Edit( @@ -214,13 +206,13 @@ public void UpdateRight() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.MetaData != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.MetaData != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void UpdateRightKey() + [Test] + public async Task UpdateRightKey() { _left.Edit( innerCache => @@ -233,43 +225,39 @@ public void UpdateRightKey() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - // Change pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device3")); - - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().NotContain(("Device2", 2)); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().Contain(("Device3", 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device3")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).DoesNotContain(("Device2", 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).Contains(("Device3", 2)); // Remove pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device4")); - - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().NotContain(pair => pair.Key == 2); + _right.AddOrUpdate(new DeviceMetaData(2, "Device4")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).DoesNotContain(pair => pair.Key == 2); // Restore pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device2")); - - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().Contain(("Device2", 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).Contains(("Device2", 2)); // No change - _right.AddOrUpdate(new DeviceMetaData(2,"Device2")); + _right.AddOrUpdate(new DeviceMetaData(2, "Device2")); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key)).Should().Contain(("Device2", 2)); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.Name, pair.MetaData.ValueOrDefault()?.Key))).Contains(("Device2", 2)); } - [Fact] - public void InitializationWaitsForBothSources() + [Test] + public async Task InitializationWaitsForBothSources() { // https://github.com/reactivemarbles/DynamicData/issues/943 @@ -278,20 +266,20 @@ public void InitializationWaitsForBothSources() ObservableCacheEx .LeftJoin( - left: left.AsObservableChangeSet(static left => 2 * left), - right: right.AsObservableChangeSet(static right => right), - rightKeySelector: static right => right, - resultSelector: static (left, right) => (left, right: right.HasValue ? right.Value : default(int?))) + left: left.AsObservableChangeSet(static left => 2 * left), + right: right.AsObservableChangeSet(static right => right), + rightKeySelector: static right => right, + resultSelector: static (left, right) => (left, right: right.HasValue ? right.Value : default(int?))) .ValidateSynchronization() .ValidateChangeSets(static pair => 2 * pair.left) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); - results.RecordedChangeSets.Count.Should().Be(1, "Initialization should only emit one changeset."); - results.RecordedChangeSets[0].Should().OnlyContain(change => change.Reason == ChangeReason.Add, "Initialization should only emit Add changes."); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("Initialization should only emit one changeset."); + await Assert.That(results.RecordedChangeSets[0]).ContainsOnly(change => change.Reason == ChangeReason.Add).Because("Initialization should only emit Add changes."); - results.RecordedItemsByKey.Values.Should().OnlyContain(pair => (2 * pair.left) == pair.right, "Source items should have been joined correctly"); + await Assert.That(results.RecordedItemsByKey.Values).ContainsOnly(pair => (2 * pair.left) == pair.right).Because("Source items should have been joined correctly"); } public class Device(string name) : IEquatable @@ -362,17 +350,17 @@ public override bool Equals(object? obj) if (obj is null) return false; if (ReferenceEquals(this, obj)) return true; if (obj.GetType() != this.GetType()) return false; - return Equals((DeviceMetaData) obj); + return Equals((DeviceMetaData)obj); } public override int GetHashCode() => HashCode.Combine(IsAutoConnect, Key, Name); } - public class DeviceWithMetadata(Device device, Optional metaData) : IEquatable + public class DeviceWithMetadata(Device device, ReactiveUI.Primitives.Optional metaData) : IEquatable { public Device Device { get; } = device; - public Optional MetaData { get; } = metaData; + public ReactiveUI.Primitives.Optional MetaData { get; } = metaData; public static bool operator ==(DeviceWithMetadata left, DeviceWithMetadata right) => Equals(left, right); diff --git a/src/DynamicData.Tests/Cache/LeftJoinManyFixture.cs b/src/DynamicData.Tests/Cache/LeftJoinManyFixture.cs index dd4b22056..ccc955631 100644 --- a/src/DynamicData.Tests/Cache/LeftJoinManyFixture.cs +++ b/src/DynamicData.Tests/Cache/LeftJoinManyFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class LeftJoinManyFixture : IDisposable @@ -23,8 +20,8 @@ public LeftJoinManyFixture() _result = _people.Connect().LeftJoinMany(_people.Connect(), pac => pac.ParentName, (person, grouping) => new ParentAndChildren(person, grouping.Items.Select(p => p).ToArray())).AsAggregator(); } - [Fact] - public void AddChild() + [Test] + public async Task AddChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -40,24 +37,24 @@ public void AddChild() var updatedPeople = people.Union(new[] { person11 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { var people = Enumerable.Range(1, 10).Select(i => new Person("Person" + i, i)).ToArray(); _people.AddOrUpdate(people); - _result.Data.Count.Should().Be(10); - _result.Data.Items.Select(pac => pac.Parent).Should().BeEquivalentTo(people); + await Assert.That(_result.Data.Count).IsEqualTo(10); + await Assert.That(_result.Data.Items.Select(pac => pac.Parent)).IsEquivalentTo(people.Cast()); - _result.Data.Items.ForEach(pac => pac.Count.Should().Be(0)); + foreach (var pac in _result.Data.Items) { await Assert.That(pac.Count).IsEqualTo(0); } } - [Fact] - public void AddPeopleWithParents() + [Test] + public async Task AddPeopleWithParents() { var people = Enumerable.Range(1, 10).Select( i => @@ -68,7 +65,7 @@ public void AddPeopleWithParents() _people.AddOrUpdate(people); - AssertDataIsCorrectlyFormed(people); + await AssertDataIsCorrectlyFormed(people); } public void Dispose() @@ -77,54 +74,50 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RefreshRightKey() + [Test] + public async Task RefreshRightKey() { _people.Edit( innerCache => { - innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" } ); + innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty }); + innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); + innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" }); }); var refreshPerson = _people.Lookup("Person #2").Value; - // Change pairing refreshPerson.ParentName = "Person #3"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().NotContain(("Person #1", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #3", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).DoesNotContain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #3", "Person #2")); // Remove pairing refreshPerson.ParentName = "Person #4"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name))).Should().NotContain(pair => pair.chilldName == "Person #2"); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name)))).DoesNotContain(pair => pair.chilldName == "Person #2"); // Restore pairing refreshPerson.ParentName = "Person #1"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); // No change _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); } - [Fact] - public void RemoveChild() + [Test] + public async Task RemoveChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -140,11 +133,11 @@ public void RemoveChild() var updatedPeople = people.Where(p => p.Name != last.Name).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople, last.Name); + await AssertDataIsCorrectlyFormed(updatedPeople, last.Name); } - [Fact] - public void UpdateChild() + [Test] + public async Task UpdateChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -161,11 +154,11 @@ public void UpdateChild() var updatedPeople = people.Where(p => p.Name != "Person6").Union(new[] { person6 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateParent() + [Test] + public async Task UpdateParent() { var people = Enumerable.Range(1, 10).Select( i => @@ -182,68 +175,63 @@ public void UpdateParent() var updatedPeople = people.Take(9).Union(new[] { person10 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateRightKey() + [Test] + public async Task UpdateRightKey() { _people.Edit( innerCache => { - innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" } ); + innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty }); + innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); + innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" }); }); - // Change pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #3" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().NotContain(("Person #1", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #3", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).DoesNotContain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #3", "Person #2")); // Remove pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #4" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name))).Should().NotContain(pair => pair.chilldName == "Person #2"); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (parentName: family.Parent.Name, chilldName: child.Name)))).DoesNotContain(pair => pair.chilldName == "Person #2"); // Restore pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); // No change _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent.Name, child.Name)))).Contains(("Person #1", "Person #2")); } - private void AssertDataIsCorrectlyFormed(Person[] expected, params string[] missingParents) + private async Task AssertDataIsCorrectlyFormed(Person[] expected, params string[] missingParents) { - _result.Data.Count.Should().Be(expected.Length); - _result.Data.Items.Select(pac => pac.Parent).Should().BeEquivalentTo(expected); + await Assert.That(_result.Data.Count).IsEqualTo(expected.Length); + await Assert.That(_result.Data.Items.Select(pac => pac.Parent)).IsEquivalentTo(expected.Cast()); - expected.GroupBy(p => p.ParentName).ForEach( - grouping => + foreach (var grouping in expected.GroupBy(p => p.ParentName)) + { + if (missingParents.Length > 0 && missingParents.Contains(grouping.Key)) { - if (missingParents.Length > 0 && missingParents.Contains(grouping.Key)) - { - return; - } + continue; + } - var result = _result.Data.Lookup(grouping.Key).ValueOrThrow(() => new Exception("Missing result for " + grouping.Key)); + var result = _result.Data.Lookup(grouping.Key).ValueOrThrow(() => new Exception("Missing result for " + grouping.Key)); - var children = result.Children; - children.Should().BeEquivalentTo(grouping); - }); + var children = result.Children; + await Assert.That(children).IsEquivalentTo(grouping); + } } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] diff --git a/src/DynamicData.Tests/Cache/MergeChangeSetsFixture.cs b/src/DynamicData.Tests/Cache/MergeChangeSetsFixture.cs index b6f3047e2..0fe01d7d5 100644 --- a/src/DynamicData.Tests/Cache/MergeChangeSetsFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeChangeSetsFixture.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Microsoft.Reactive.Testing; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -31,18 +26,20 @@ public sealed partial class MergeChangeSetsFixture : IDisposable const decimal LowestPrice = BasePrice - 1.0m; public static readonly TimeSpan Interval = TimeSpan.FromSeconds(1); - public static readonly Random Random = new(0x12291977); private readonly List _marketList = new(); + private readonly Random _random = new(0x12291977); + + private static decimal GetDeterministicPrice(int marketIndex) => BasePrice + marketIndex; - private static decimal GetRandomPrice() => MarketPrice.RandomPrice(Random, BasePrice, PriceOffset); + private decimal GetRandomPrice() => MarketPrice.RandomPrice(_random, BasePrice, PriceOffset); public MergeChangeSetsFixture() { } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // having var emptyChangeSetObs = Observable.Empty>(); @@ -102,61 +99,61 @@ public void NullChecks() var enumObsEqComp2 = () => emptyChangeSetObsEnum.MergeChangeSets(equalityComparer, nullComparer); // then - emptyChangeSetObs.Should().NotBeNull(); - emptyChangeSetObsObs.Should().NotBeNull(); - emptyChangeSetObsEnum.Should().NotBeNull(); - comparer.Should().NotBeNull(); - equalityComparer.Should().NotBeNull(); - nullChangeSetObs.Should().BeNull(); - nullChangeSetObsObs.Should().BeNull(); - nullComparer.Should().BeNull(); - nullEqualityComparer.Should().BeNull(); - nullChangeSetObsEnum.Should().BeNull(); - - obsobs.Should().Throw(); - obsobsComp.Should().Throw(); - obsobsComp1.Should().Throw(); - obsobsEq.Should().Throw(); - obsobsEq1.Should().Throw(); - obsobsEqComp.Should().Throw(); - obsobsEqComp1.Should().Throw(); - obsobsEqComp2.Should().Throw(); - obspair.Should().Throw(); - obspairB.Should().Throw(); - obspairComp.Should().Throw(); - obspairCompB.Should().Throw(); - obspairComp1.Should().Throw(); - obspairEq.Should().Throw(); - obspairEqB.Should().Throw(); - obspairEq1.Should().Throw(); - obspairEqComp.Should().Throw(); - obspairEqCompB.Should().Throw(); - obspairEqComp1.Should().Throw(); - obspairEqComp2.Should().Throw(); - obsEnum.Should().Throw(); - obsEnumB.Should().Throw(); - obsEnumComp.Should().Throw(); - obsEnumCompB.Should().Throw(); - obsEnumComp1.Should().Throw(); - obsEnumEq.Should().Throw(); - obsEnumEqB.Should().Throw(); - obsEnumEq1.Should().Throw(); - obsEnumEqComp.Should().Throw(); - obsEnumEqCompB.Should().Throw(); - obsEnumEqComp1.Should().Throw(); - obsEnumEqComp2.Should().Throw(); - enumObs.Should().Throw(); - enumObsComp.Should().Throw(); - enumObsComp1.Should().Throw(); - enumObsEq.Should().Throw(); - enumObsEq1.Should().Throw(); - enumObsEqComp.Should().Throw(); - enumObsEqComp1.Should().Throw(); - enumObsEqComp2.Should().Throw(); - } - - [Fact] - public void AllExistingItemsPresentInResult() + await Assert.That(emptyChangeSetObs).IsNotNull(); + await Assert.That(emptyChangeSetObsObs).IsNotNull(); + await Assert.That(emptyChangeSetObsEnum).IsNotNull(); + await Assert.That(comparer).IsNotNull(); + await Assert.That(equalityComparer).IsNotNull(); + await Assert.That(nullChangeSetObs).IsNull(); + await Assert.That(nullChangeSetObsObs).IsNull(); + await Assert.That(nullComparer).IsNull(); + await Assert.That(nullEqualityComparer).IsNull(); + await Assert.That(nullChangeSetObsEnum).IsNull(); + + await Assert.That(obsobs).Throws(); + await Assert.That(obsobsComp).Throws(); + await Assert.That(obsobsComp1).Throws(); + await Assert.That(obsobsEq).Throws(); + await Assert.That(obsobsEq1).Throws(); + await Assert.That(obsobsEqComp).Throws(); + await Assert.That(obsobsEqComp1).Throws(); + await Assert.That(obsobsEqComp2).Throws(); + await Assert.That(obspair).Throws(); + await Assert.That(obspairB).Throws(); + await Assert.That(obspairComp).Throws(); + await Assert.That(obspairCompB).Throws(); + await Assert.That(obspairComp1).Throws(); + await Assert.That(obspairEq).Throws(); + await Assert.That(obspairEqB).Throws(); + await Assert.That(obspairEq1).Throws(); + await Assert.That(obspairEqComp).Throws(); + await Assert.That(obspairEqCompB).Throws(); + await Assert.That(obspairEqComp1).Throws(); + await Assert.That(obspairEqComp2).Throws(); + await Assert.That(obsEnum).Throws(); + await Assert.That(obsEnumB).Throws(); + await Assert.That(obsEnumComp).Throws(); + await Assert.That(obsEnumCompB).Throws(); + await Assert.That(obsEnumComp1).Throws(); + await Assert.That(obsEnumEq).Throws(); + await Assert.That(obsEnumEqB).Throws(); + await Assert.That(obsEnumEq1).Throws(); + await Assert.That(obsEnumEqComp).Throws(); + await Assert.That(obsEnumEqCompB).Throws(); + await Assert.That(obsEnumEqComp1).Throws(); + await Assert.That(obsEnumEqComp2).Throws(); + await Assert.That(enumObs).Throws(); + await Assert.That(enumObsComp).Throws(); + await Assert.That(enumObsComp1).Throws(); + await Assert.That(enumObsEq).Throws(); + await Assert.That(enumObsEq1).Throws(); + await Assert.That(enumObsEqComp).Throws(); + await Assert.That(enumObsEqComp1).Throws(); + await Assert.That(enumObsEqComp2).Throws(); + } + + [Test] + public async Task AllExistingItemsPresentInResult() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new Market(n))); @@ -167,18 +164,18 @@ public void AllExistingItemsPresentInResult() using var results = pricesCache.Connect().AsAggregator(); // then - _marketList.Count.Should().Be(MarketCount); - _marketList.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(_marketList.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AllNewSubItemsPresentInResult() + [Test] + public async Task AllNewSubItemsPresentInResult() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new Market(n))); @@ -189,18 +186,18 @@ public void AllNewSubItemsPresentInResult() _marketList.ForEach((m, index) => m.AddUniquePrices(index, PricesPerMarket, ItemIdStride, GetRandomPrice)); // then - _marketList.Count.Should().Be(MarketCount); - _marketList.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(_marketList.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AllRefreshedSubItemsAreRefreshed() + [Test] + public async Task AllRefreshedSubItemsAreRefreshed() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new Market(n))); @@ -211,96 +208,96 @@ public void AllRefreshedSubItemsAreRefreshed() _marketList.ForEach(m => m.RefreshAllPrices(GetRandomPrice)); // then - _marketList.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(MarketCount * PricesPerMarket); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(MarketCount * PricesPerMarket); } - [Fact] - public void AnyDuplicateKeyValuesShouldBeHidden() + [Test] + public async Task AnyDuplicateKeyValuesShouldBeHidden() { // having _marketList.AddRange(Enumerable.Range(0, 2).Select(n => new Market(n))); using var results = _marketList.Select(m => m.LatestPrices).MergeChangeSets(MarketPrice.EqualityComparer).AsAggregator(); // when - _marketList[0].SetPrices(0, PricesPerMarket, GetRandomPrice); - _marketList[1].SetPrices(0, PricesPerMarket, GetRandomPrice); + _marketList[0].SetPrices(0, PricesPerMarket, GetDeterministicPrice(0)); + _marketList[1].SetPrices(0, PricesPerMarket, GetDeterministicPrice(1)); // then - _marketList.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(_marketList[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(_marketList[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeNoOpWhenRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeNoOpWhenRemoved() { // having _marketList.AddRange(Enumerable.Range(0, 2).Select(n => new Market(n))); using var results = _marketList.Select(m => m.LatestPrices).MergeChangeSets(MarketPrice.EqualityComparer).AsAggregator(); - _marketList[0].SetPrices(0, PricesPerMarket, GetRandomPrice); - _marketList[1].SetPrices(0, PricesPerMarket, GetRandomPrice); + _marketList[0].SetPrices(0, PricesPerMarket, GetDeterministicPrice(0)); + _marketList[1].SetPrices(0, PricesPerMarket, GetDeterministicPrice(1)); // when _marketList[1].RemoveAllPrices(); // then - _marketList.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(_marketList[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(_marketList[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() { // having _marketList.AddRange(Enumerable.Range(0, 2).Select(n => new Market(n))); using var results = _marketList.Select(m => m.LatestPrices).MergeChangeSets(MarketPrice.EqualityComparer).AsAggregator(); - _marketList[0].SetPrices(0, PricesPerMarket, GetRandomPrice); - _marketList[1].SetPrices(0, PricesPerMarket, GetRandomPrice); + _marketList[0].SetPrices(0, PricesPerMarket, GetDeterministicPrice(0)); + _marketList[1].SetPrices(0, PricesPerMarket, GetDeterministicPrice(1)); // when _marketList[0].RemoveAllPrices(); // then - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(_marketList[1].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Messages.Count.Should().Be(2); - results.Messages[1].Updates.Should().Be(PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(_marketList[1].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Updates).IsEqualTo(PricesPerMarket); } - [Fact] - public void AnyDuplicateValuesShouldNotRefreshWhenHidden() + [Test] + public async Task AnyDuplicateValuesShouldNotRefreshWhenHidden() { // having _marketList.AddRange(Enumerable.Range(0, 2).Select(n => new Market(n))); using var results = _marketList.Select(m => m.LatestPrices).MergeChangeSets(MarketPrice.EqualityComparer).AsAggregator(); - _marketList[0].SetPrices(0, PricesPerMarket, GetRandomPrice); - _marketList[1].SetPrices(0, PricesPerMarket, GetRandomPrice); + _marketList[0].SetPrices(0, PricesPerMarket, GetDeterministicPrice(0)); + _marketList[1].SetPrices(0, PricesPerMarket, GetDeterministicPrice(1)); // when - _marketList[1].RefreshAllPrices(GetRandomPrice); + _marketList[1].RefreshAllPrices(GetDeterministicPrice(2)); // then - _marketList.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Zip(_marketList[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var pair in results.Data.Items.Zip(_marketList[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } } - [Fact] - public void AnyRemovedSubItemIsRemoved() + [Test] + public async Task AnyRemovedSubItemIsRemoved() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new Market(n))); @@ -311,16 +308,16 @@ public void AnyRemovedSubItemIsRemoved() _marketList.ForEach(m => m.PricesCache.Edit(updater => updater.RemoveKeys(updater.Keys.Take(RemoveCount).ToList()))); // then - _marketList.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * (PricesPerMarket - RemoveCount)); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Messages[0].Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(MarketCount * RemoveCount); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * (PricesPerMarket - RemoveCount)); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(MarketCount * RemoveCount); } - [Fact] - public void ComparerOnlyAddsBetterAddedValues() + [Test] + public async Task ComparerOnlyAddsBetterAddedValues() { // having var marketOriginal = Add(new Market(0)); @@ -336,19 +333,19 @@ public void ComparerOnlyAddsBetterAddedValues() marketHigh.SetPrices(0, PricesPerMarket, HighestPrice); // then - _marketList.Count.Should().Be(3); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); + await Assert.That(_marketList.Count).IsEqualTo(3); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHigh.Id); } } - [Fact] - public void ComparerOnlyAddsBetterExistingValues() + [Test] + public async Task ComparerOnlyAddsBetterExistingValues() { // having var marketOriginal = Add(new Market(0)); @@ -364,19 +361,19 @@ public void ComparerOnlyAddsBetterExistingValues() using var lowPriceResults = marketOriginal.LatestPrices.MergeChangeSets(others, MarketPrice.LowPriceCompare).AsAggregator(); // then - _marketList.Count.Should().Be(3); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); + await Assert.That(_marketList.Count).IsEqualTo(3); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHigh.Id); } } - [Fact] - public void ComparerUpdatesToCorrectValueOnRefresh() + [Test] + public async Task ComparerUpdatesToCorrectValueOnRefresh() { // having var marketOriginal = Add(new Market(0)); @@ -390,23 +387,23 @@ public void ComparerUpdatesToCorrectValueOnRefresh() marketFlipFlop.RefreshAllPrices(LowestPrice); // then - _marketList.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketFlipFlop.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnRemove() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketFlipFlop.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnRemove() { // having var marketOriginal = Add(new Market(0)); @@ -423,25 +420,25 @@ public void ComparerUpdatesToCorrectValueOnRemove() marketLow.RemoveAllPrices(); // then - _marketList.Count.Should().Be(3); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnUpdate() + await Assert.That(_marketList.Count).IsEqualTo(3); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHigh.Id); } + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnUpdate() { // having var marketOriginal = Add(new Market(0)); @@ -455,23 +452,23 @@ public void ComparerUpdatesToCorrectValueOnUpdate() marketFlipFlop.UpdateAllPrices(LowestPrice); // then - _marketList.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketFlipFlop.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerOnlyUpdatesVisibleValuesOnUpdate() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketFlipFlop.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerOnlyUpdatesVisibleValuesOnUpdate() { // having var marketOriginal = Add(new Market(0)); @@ -485,23 +482,23 @@ public void ComparerOnlyUpdatesVisibleValuesOnUpdate() marketLow.UpdateAllPrices(LowestPrice - 1); // then - _marketList.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerOnlyRefreshesVisibleValues() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerOnlyRefreshesVisibleValues() { // having var marketOriginal = Add(new Market(0)); @@ -515,23 +512,23 @@ public void ComparerOnlyRefreshesVisibleValues() marketLow.RefreshAllPrices(LowestPrice - 1); // then - _marketList.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void EnumObservableUsesTheScheduler() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task EnumObservableUsesTheScheduler() { // having var scheduler = new TestScheduler(); @@ -544,18 +541,18 @@ public void EnumObservableUsesTheScheduler() // Do not advance the scheduler so that nothing happens // then - _marketList.Count.Should().Be(MarketCount); - _marketList.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(0); - results.Messages.Count.Should().Be(0); - results.Summary.Overall.Adds.Should().Be(0); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(_marketList.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Messages.Count).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EnumObservableUsesTheSchedulerAndEmitsAll() + [Test] + public async Task EnumObservableUsesTheSchedulerAndEmitsAll() { // having var scheduler = new TestScheduler(); @@ -568,18 +565,18 @@ public void EnumObservableUsesTheSchedulerAndEmitsAll() scheduler.AdvanceBy(MarketCount); // then - _marketList.Count.Should().Be(MarketCount); - _marketList.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(_marketList.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EqualityComparerHidesUpdatesWithoutChanges() + [Test] + public async Task EqualityComparerHidesUpdatesWithoutChanges() { // having var market = Add(new Market(0)); @@ -590,17 +587,17 @@ public void EqualityComparerHidesUpdatesWithoutChanges() market.SetPrices(0, PricesPerMarket, LowestPrice); // then - _marketList.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketList.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EqualityComparerAndComparerWorkTogetherForUpdates() + [Test] + public async Task EqualityComparerAndComparerWorkTogetherForUpdates() { // having var market1 = Add(new Market(0)); @@ -615,22 +612,22 @@ public void EqualityComparerAndComparerWorkTogetherForUpdates() market2.SetPrices(0, PricesPerMarket, LowestPrice); // then - _marketList.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Messages.Count.Should().Be(2); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); - resultsTimeStamp.Messages.Count.Should().Be(3); - resultsTimeStamp.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsTimeStamp.Summary.Overall.Removes.Should().Be(0); - resultsTimeStamp.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - resultsTimeStamp.Summary.Overall.Refreshes.Should().Be(0); - } - - [Fact] - public void EqualityComparerAndComparerWorkTogetherForRefreshes() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Messages.Count).IsEqualTo(3); + await Assert.That(resultsTimeStamp.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsTimeStamp.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(resultsTimeStamp.Summary.Overall.Refreshes).IsEqualTo(0); + } + + [Test] + public async Task EqualityComparerAndComparerWorkTogetherForRefreshes() { // having var market1 = Add(new Market(0)); @@ -649,22 +646,22 @@ public void EqualityComparerAndComparerWorkTogetherForRefreshes() market2.RefreshAllPrices(LowestPrice); // then - _marketList.Count.Should().Be(2); - results1.Data.Count.Should().Be(PricesPerMarket); - results1.Messages.Count.Should().Be(3); - results1.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results1.Summary.Overall.Removes.Should().Be(0); - results1.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results1.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - results2.Messages.Count.Should().Be(4); - results2.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results2.Summary.Overall.Removes.Should().Be(0); - results2.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - results2.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - } - - [Fact] - public void EqualityComparerAndComparerRefreshesBecomeUpdates() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(results1.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results1.Messages.Count).IsEqualTo(3); + await Assert.That(results1.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results1.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results1.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results1.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + await Assert.That(results2.Messages.Count).IsEqualTo(4); + await Assert.That(results2.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results2.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results2.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results2.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + } + + [Test] + public async Task EqualityComparerAndComparerRefreshesBecomeUpdates() { // having var market1 = Add(new Market(0)); @@ -683,22 +680,22 @@ public void EqualityComparerAndComparerRefreshesBecomeUpdates() market2.RefreshAllPrices(GetRandomPrice); // then - _marketList.Count.Should().Be(2); - results1.Data.Count.Should().Be(PricesPerMarket); - results1.Messages.Count.Should().Be(3); - results1.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results1.Summary.Overall.Removes.Should().Be(0); - results1.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - results1.Summary.Overall.Refreshes.Should().Be(0); - results2.Messages.Count.Should().Be(4); - results2.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results2.Summary.Overall.Removes.Should().Be(0); - results2.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - results2.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - } - - [Fact] - public void EveryItemVisibleWhenSequenceCompletes() + await Assert.That(_marketList.Count).IsEqualTo(2); + await Assert.That(results1.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results1.Messages.Count).IsEqualTo(3); + await Assert.That(results1.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results1.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results1.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results1.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(results2.Messages.Count).IsEqualTo(4); + await Assert.That(results2.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results2.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results2.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results2.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + } + + [Test] + public async Task EveryItemVisibleWhenSequenceCompletes() { // having var fixedMarketList = Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket)).ToList(); @@ -707,18 +704,18 @@ public void EveryItemVisibleWhenSequenceCompletes() using var results = fixedMarketList.Select(m => m.LatestPrices).MergeChangeSets(completable: true).AsAggregator(); // then - results.IsCompleted.Should().Be(true); - results.Data.Count.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(results.IsCompleted).IsTrue(); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Theory] - [InlineData(false)] - [InlineData(true)] - public void MergedObservableCompletesWhenAllSourcesComplete(bool completeSources) + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task MergedObservableCompletesWhenAllSourcesComplete(bool completeSources) { // having var fixedMarketList = Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket, completable: completeSources)).ToList(); @@ -727,15 +724,15 @@ public void MergedObservableCompletesWhenAllSourcesComplete(bool completeSources using var results = fixedMarketList.Select(m => m.LatestPrices).MergeChangeSets(completable: true).AsAggregator(); // then - results.IsCompleted.Should().Be(completeSources); + await Assert.That(results.IsCompleted).IsEqualTo(completeSources); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void MergedObservableRespectsCompletableFlag(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task MergedObservableRespectsCompletableFlag(bool completeSource, bool completeChildren) { // having var fixedMarketList = Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket, completable: completeChildren)).ToList(); @@ -744,11 +741,11 @@ public void MergedObservableRespectsCompletableFlag(bool completeSource, bool co using var results = fixedMarketList.Select(m => m.LatestPrices).MergeChangeSets(completable: completeSource).AsAggregator(); // then - results.IsCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(results.IsCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void ObservableObservableContainsAllAddedValues() + [Test] + public async Task ObservableObservableContainsAllAddedValues() { // having var scheduler = new TestScheduler(); @@ -761,15 +758,15 @@ public void ObservableObservableContainsAllAddedValues() _marketList.ForEach((m, index) => m.AddUniquePrices(index, PricesPerMarket, ItemIdStride, GetRandomPrice)); // then - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void ObservableObservableContainsAllExistingValues() + [Test] + public async Task ObservableObservableContainsAllExistingValues() { // having var scheduler = new TestScheduler(); @@ -782,15 +779,15 @@ public void ObservableObservableContainsAllExistingValues() Enumerable.Range(0, MarketCount).ForEach(n => scheduler.AdvanceBy(Interval.Ticks)); // then - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void MergedObservableWillFailIfAnyChangeChangeSetFails() + [Test] + public async Task MergedObservableWillFailIfAnyChangeChangeSetFails() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new Market(n))); @@ -802,14 +799,14 @@ public void MergedObservableWillFailIfAnyChangeChangeSetFails() using var results = enumObservable.MergeChangeSets().AsAggregator(); // then - _marketList.Count.Should().Be(MarketCount); - _marketList.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Error.Should().Be(expectedError); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(_marketList.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Fact] - public void ObservableObservableWillFailIfSourceFails() + [Test] + public async Task ObservableObservableWillFailIfSourceFails() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new Market(n))); @@ -821,18 +818,18 @@ public void ObservableObservableWillFailIfSourceFails() using var results = observables.MergeChangeSets().AsAggregator(); // then - _marketList.Count.Should().Be(MarketCount); - _marketList.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Error.Should().Be(expectedError); + await Assert.That(_marketList.Count).IsEqualTo(MarketCount); + await Assert.That(_marketList.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void ObservableObservableCompletesIfAndOnlyIfSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task ObservableObservableCompletesIfAndOnlyIfSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { // having var fixedMarkets = Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket, completable: completeChildren)); @@ -846,7 +843,7 @@ public void ObservableObservableCompletesIfAndOnlyIfSourceAndAllChildrenComplete using var results = observableObservable.MergeChangeSets().AsAggregator(); // then - results.IsCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(results.IsCompleted).IsEqualTo(completeSource && completeChildren); } public void Dispose() => _marketList.ForEach(m => (m as IDisposable)?.Dispose()); diff --git a/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheFixture.cs b/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheFixture.cs index 949ec35bf..6b86eb9de 100644 --- a/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheFixture.cs @@ -1,19 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Threading.Tasks; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -46,17 +37,17 @@ public sealed class MergeManyChangeSetsCacheFixture : IDisposable public MergeManyChangeSetsCacheFixture() { _randomizer = new(0x21123737); - _marketFaker = Fakers.Market.WithSeed(_randomizer); + _marketFaker = Fakers.Market.Clone().WithSeed(_randomizer); _marketCacheResults = _marketCache.Connect().AsAggregator(); } - [Theory] - [InlineData(5, 7)] - [InlineData(10, 50)] + [Test] + [Arguments(5, 7)] + [Arguments(10, 50)] #if !DEBUG - [InlineData(10, 1_000)] - [InlineData(200, 500)] - [InlineData(1_000, 10)] + [Arguments(10, 1_000)] + [Arguments(200, 500)] + [Arguments(1_000, 10)] #endif public async Task MultiThreadedStressTest(int marketCount, int priceCount) { @@ -125,11 +116,11 @@ IObservable AddRemovePrices(Market market, int priceCount, int para await cacheCompleted; // Verify the results - CheckResultContents(_marketCacheResults, priceResults); + await CheckResultContents(_marketCacheResults, priceResults); } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // having var emptyChangeSetObs = Observable.Empty>(); @@ -156,31 +147,31 @@ public void NullChecks() var actionChildCompare2c = () => emptyChangeSetObs.MergeManyChangeSets(emptyKeySelector, comparer: nullChildComparer); // then - emptyChangeSetObs.Should().NotBeNull(); - emptyChildChangeSetObs.Should().NotBeNull(); - emptyChildComparer.Should().NotBeNull(); - emptyEqualityComparer.Should().NotBeNull(); - emptyKeySelector.Should().NotBeNull(); - emptyParentComparer.Should().NotBeNull(); - emptySelector.Should().NotBeNull(); - nullChangeSetObs.Should().BeNull(); - nullChildComparer.Should().BeNull(); - nullEqualityComparer.Should().BeNull(); - nullKeySelector.Should().BeNull(); - nullParentComparer.Should().BeNull(); - nullSelector.Should().BeNull(); - - actionDefault1.Should().Throw(); - actionDefault2a.Should().Throw(); - actionDefault2b.Should().Throw(); - actionChildCompare1.Should().Throw(); - actionChildCompare2a.Should().Throw(); - actionChildCompare2b.Should().Throw(); - actionChildCompare2c.Should().Throw(); - } - - [Fact] - public void AbleToInvokeFactory() + await Assert.That(emptyChangeSetObs).IsNotNull(); + await Assert.That(emptyChildChangeSetObs).IsNotNull(); + await Assert.That(emptyChildComparer).IsNotNull(); + await Assert.That(emptyEqualityComparer).IsNotNull(); + await Assert.That(emptyKeySelector).IsNotNull(); + await Assert.That(emptyParentComparer).IsNotNull(); + await Assert.That(emptySelector).IsNotNull(); + await Assert.That(nullChangeSetObs).IsNull(); + await Assert.That(nullChildComparer).IsNull(); + await Assert.That(nullEqualityComparer).IsNull(); + await Assert.That(nullKeySelector).IsNull(); + await Assert.That(nullParentComparer).IsNull(); + await Assert.That(nullSelector).IsNull(); + + await Assert.That(actionDefault1).Throws(); + await Assert.That(actionDefault2a).Throws(); + await Assert.That(actionDefault2b).Throws(); + await Assert.That(actionChildCompare1).Throws(); + await Assert.That(actionChildCompare2a).Throws(); + await Assert.That(actionChildCompare2b).Throws(); + await Assert.That(actionChildCompare2c).Throws(); + } + + [Test] + public async Task AbleToInvokeFactory() { // having var invoked = false; @@ -195,12 +186,12 @@ IObservable> factory(IMarket m) _marketCache.AddOrUpdate(new Market(0)); // then - _marketCacheResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); } - [Fact] - public void AbleToInvokeFactoryWithKey() + [Test] + public async Task AbleToInvokeFactoryWithKey() { // having var invoked = false; @@ -215,12 +206,12 @@ IObservable> factory(IMarket m, Guid g) _marketCache.AddOrUpdate(new Market(0)); // then - _marketCacheResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); } - [Fact] - public void AllExistingSubItemsPresentInResult() + [Test] + public async Task AllExistingSubItemsPresentInResult() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -231,17 +222,17 @@ public void AllExistingSubItemsPresentInResult() _marketCache.AddOrUpdate(markets); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AllNewSubItemsPresentInResult() + [Test] + public async Task AllNewSubItemsPresentInResult() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -252,17 +243,17 @@ public void AllNewSubItemsPresentInResult() AddUniquePrices(markets); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AllRefreshedSubItemsAreRefreshed() + [Test] + public async Task AllRefreshedSubItemsAreRefreshed() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -274,17 +265,17 @@ public void AllRefreshedSubItemsAreRefreshed() markets.ForEach(m => m.RefreshAllPrices(GetRandomPrice)); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(MarketCount * PricesPerMarket); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(MarketCount * PricesPerMarket); } - [Fact] - public void AnyDuplicateKeyValuesShouldBeHidden() + [Test] + public async Task AnyDuplicateKeyValuesShouldBeHidden() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -296,16 +287,16 @@ public void AnyDuplicateKeyValuesShouldBeHidden() markets[1].SetPrices(0, PricesPerMarket, GetRandomPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeNoOpWhenRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeNoOpWhenRemoved() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -318,16 +309,16 @@ public void AnyDuplicateValuesShouldBeNoOpWhenRemoved() markets[1].RemoveAllPrices(); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -340,15 +331,15 @@ public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() _marketCache.Remove(markets[0]); // then - _marketCacheResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[1].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Messages.Count.Should().Be(2); - results.Messages[1].Updates.Should().Be(PricesPerMarket); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[1].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Updates).IsEqualTo(PricesPerMarket); } - [Fact] - public void AnyDuplicateValuesShouldNotRefreshWhenHidden() + [Test] + public async Task AnyDuplicateValuesShouldNotRefreshWhenHidden() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -361,14 +352,14 @@ public void AnyDuplicateValuesShouldNotRefreshWhenHidden() markets[1].RefreshAllPrices(GetRandomPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } } - [Fact] - public void AnyRemovedSubItemIsRemoved() + [Test] + public async Task AnyRemovedSubItemIsRemoved() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -380,16 +371,16 @@ public void AnyRemovedSubItemIsRemoved() markets.ForEach(m => m.PricesCache.Edit(updater => updater.RemoveKeys(updater.Keys.Take(RemoveCount)))); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * (PricesPerMarket - RemoveCount)); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Messages[0].Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(MarketCount * RemoveCount); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * (PricesPerMarket - RemoveCount)); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(MarketCount * RemoveCount); } - [Fact] - public void AnySourceItemRemovedRemovesAllSourceValues() + [Test] + public async Task AnySourceItemRemovedRemovesAllSourceValues() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -401,15 +392,15 @@ public void AnySourceItemRemovedRemovesAllSourceValues() _marketCache.Edit(updater => updater.RemoveKeys(updater.Keys.Take(RemoveCount))); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount - RemoveCount); - results.Messages.Count.Should().Be(2); - results.Data.Count.Should().Be((MarketCount - RemoveCount) * PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket * RemoveCount); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount - RemoveCount); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo((MarketCount - RemoveCount) * PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket * RemoveCount); } - [Fact] - public void ClearingParentEmitsSingleChangeSet() + [Test] + public async Task ClearingParentEmitsSingleChangeSet() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -421,16 +412,16 @@ public void ClearingParentEmitsSingleChangeSet() _marketCache.Clear(); // then - _marketCacheResults.Data.Count.Should().Be(0); - results.Data.Count.Should().Be(0); - results.Messages.Count.Should().Be(2); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(0); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void ChangingSourceByUpdateRemovesPreviousAndAddsNewValues() + [Test] + public async Task ChangingSourceByUpdateRemovesPreviousAndAddsNewValues() { // having using var results = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); @@ -444,16 +435,16 @@ public void ChangingSourceByUpdateRemovesPreviousAndAddsNewValues() _marketCache.AddOrUpdate(updatedMarket); // then - _marketCacheResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket * 2); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * 3); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket); - results.Data.Items.Zip(updatedMarket.PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * 3); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(updatedMarket.PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } } - [Fact] - public void ComparerOnlyAddsBetterAddedValues() + [Test] + public async Task ComparerOnlyAddsBetterAddedValues() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -471,19 +462,19 @@ public void ComparerOnlyAddsBetterAddedValues() marketHigh.SetPrices(0, PricesPerMarket, HighestPrice); // then - _marketCacheResults.Data.Count.Should().Be(3); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(3); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHigh.Id); } } - [Fact] - public void ComparerOnlyAddsBetterExistingValues() + [Test] + public async Task ComparerOnlyAddsBetterExistingValues() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -501,19 +492,19 @@ public void ComparerOnlyAddsBetterExistingValues() _marketCache.AddOrUpdate(marketHigh); // then - _marketCacheResults.Data.Count.Should().Be(3); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(3); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHigh.Id); } } - [Fact] - public void ComparerOnlyAddsBetterValuesOnSourceUpdate() + [Test] + public async Task ComparerOnlyAddsBetterValuesOnSourceUpdate() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -531,21 +522,21 @@ public void ComparerOnlyAddsBetterValuesOnSourceUpdate() _marketCache.AddOrUpdate(marketLowLow); // then - _marketCacheResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLowLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnRefresh() + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLowLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnRefresh() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -561,23 +552,23 @@ public void ComparerUpdatesToCorrectValueOnRefresh() marketFlipFlop.RefreshAllPrices(LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketFlipFlop.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnRemove() + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketFlipFlop.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnRemove() { // having using var results = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); @@ -597,25 +588,25 @@ public void ComparerUpdatesToCorrectValueOnRemove() _marketCache.Remove(marketLow); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnUpdate() + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHigh.Id); } + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnUpdate() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -631,23 +622,23 @@ public void ComparerUpdatesToCorrectValueOnUpdate() marketFlipFlop.UpdateAllPrices(LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketFlipFlop.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerOnlyUpdatesVisibleValuesOnUpdate() + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketFlipFlop.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerOnlyUpdatesVisibleValuesOnUpdate() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -663,23 +654,23 @@ public void ComparerOnlyUpdatesVisibleValuesOnUpdate() marketLow.UpdateAllPrices(LowestPrice - 1); // then - _marketCacheResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerOnlyRefreshesVisibleValues() + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task ComparerOnlyRefreshesVisibleValues() { // having using var highPriceResults = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer, MarketPrice.HighPriceCompare).AsAggregator(); @@ -695,23 +686,23 @@ public void ComparerOnlyRefreshesVisibleValues() marketLow.RefreshAllPrices(LowestPrice - 1); // then - _marketCacheResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void EqualityComparerHidesUpdatesWithoutChanges() + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + foreach (var guid in lowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in highPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + } + + [Test] + public async Task EqualityComparerHidesUpdatesWithoutChanges() { // having var market = new Market(0); @@ -723,17 +714,17 @@ public void EqualityComparerHidesUpdatesWithoutChanges() market.SetPrices(0, PricesPerMarket, LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EveryItemVisibleWhenSequenceCompletes() + [Test] + public async Task EveryItemVisibleWhenSequenceCompletes() { // having _marketCache.AddOrUpdate(Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket))); @@ -743,19 +734,19 @@ public void EveryItemVisibleWhenSequenceCompletes() DisposeMarkets(); // then - results.Data.Count.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { // having _marketCache.AddOrUpdate(Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket, completable: completeChildren))); @@ -772,12 +763,12 @@ public void MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool c } // then - hasSourceSequenceCompleted.Should().Be(completeSource); - hasMergedSequenceCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(hasSourceSequenceCompleted).IsEqualTo(completeSource); + await Assert.That(hasMergedSequenceCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void MergedObservableWillFailIfSourceFails() + [Test] + public async Task MergedObservableWillFailIfSourceFails() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -793,11 +784,11 @@ public void MergedObservableWillFailIfSourceFails() DisposeMarkets(); // then - receivedError.Should().Be(expectedError); + await Assert.That(receivedError).IsEqualTo(expectedError); } - [Fact] - public void MergeManyChangeSetsWorksCorrectlyWithValueTypes() + [Test] + public async Task MergeManyChangeSetsWorksCorrectlyWithValueTypes() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -811,16 +802,15 @@ public void MergeManyChangeSetsWorksCorrectlyWithValueTypes() markets.ForEach(m => m.RemoveAllPrices()); // then - results.Data.Count.Should().Be(0); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket); } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public void OrderOfChangesIsPreserved(bool removeFirst) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task OrderOfChangesIsPreserved(bool removeFirst) { // Arrange var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -829,7 +819,7 @@ public void OrderOfChangesIsPreserved(bool removeFirst) var markets2 = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); AddUniquePrices(markets2); using var results = _marketCache.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); - (var firstReason, var nextReason, int expectedChanges) = removeFirst + (var firstReason, var nextReason, int expectedChanges) = removeFirst ? (ChangeReason.Remove, ChangeReason.Add, 2 * MarketCount * PricesPerMarket) : (ChangeReason.Add, ChangeReason.Remove, 3 * MarketCount * PricesPerMarket); @@ -850,33 +840,34 @@ public void OrderOfChangesIsPreserved(bool removeFirst) }); // Assert - results.Messages.Count.Should().Be(2); - results.Messages[0].All(change => change.Reason is ChangeReason.Add).Should().BeTrue(); - results.Messages[1].Count.Should().Be(expectedChanges); - results.Messages[1].Take(MarketCount * PricesPerMarket).All(change => change.Reason == firstReason).Should().BeTrue(); - results.Messages[1].Skip(MarketCount * PricesPerMarket).All(change => change.Reason == nextReason).Should().BeTrue(); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].All(change => change.Reason is ChangeReason.Add)).IsTrue(); + await Assert.That(results.Messages[1].Count).IsEqualTo(expectedChanges); + await Assert.That(results.Messages[1].Take(MarketCount * PricesPerMarket).All(change => change.Reason == firstReason)).IsTrue(); + await Assert.That(results.Messages[1].Skip(MarketCount * PricesPerMarket).All(change => change.Reason == nextReason)).IsTrue(); } public void Dispose() { _marketCacheResults.Dispose(); - DisposeMarkets(); + _marketCache.Items.ForEach(m => (m as IDisposable)?.Dispose()); + _marketCache.Dispose(); } private void AddUniquePrices(Market[] markets) => markets.ForEach(m => m.AddUniquePrices(PricesPerMarket, _ => GetRandomPrice())); - private void CheckResultContents(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults) + private async Task CheckResultContents(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults) { var expectedMarkets = _marketCache.Items.ToList(); var expectedPrices = expectedMarkets.SelectMany(market => ((Market)market).PricesCache.Items).ToList(); // These should be subsets of each other - expectedMarkets.Should().BeSubsetOf(marketResults.Data.Items); - marketResults.Data.Items.Count.Should().Be(expectedMarkets.Count); + await Assert.That(expectedMarkets.Except(marketResults.Data.Items).Any()).IsFalse(); + await Assert.That(marketResults.Data.Items.Count).IsEqualTo(expectedMarkets.Count); // These should be subsets of each other - expectedPrices.Should().BeSubsetOf(priceResults.Data.Items); - priceResults.Data.Items.Count.Should().Be(expectedPrices.Count); + await Assert.That(expectedPrices.Except(priceResults.Data.Items).Any()).IsFalse(); + await Assert.That(priceResults.Data.Items.Count).IsEqualTo(expectedPrices.Count); } private void DisposeMarkets() diff --git a/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheSourceCompareFixture.cs b/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheSourceCompareFixture.cs index ce6cc89fd..253cb384e 100644 --- a/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheSourceCompareFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheSourceCompareFixture.cs @@ -1,19 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Threading.Tasks; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -46,17 +37,17 @@ public sealed class MergeManyChangeSetsCacheSourceCompareFixture : IDisposable public MergeManyChangeSetsCacheSourceCompareFixture() { _randomizer = new(0x10012022); - _marketFaker = Fakers.Market.RuleFor(m => m.Rating, faker => faker.Random.Double(0, 5)).WithSeed(_randomizer); + _marketFaker = Fakers.Market.Clone().RuleFor(m => m.Rating, faker => faker.Random.Double(0, 5)).WithSeed(_randomizer); _marketCacheResults = _marketCache.Connect().AsAggregator(); } - [Theory] - [InlineData(5, 7)] - [InlineData(10, 50)] + [Test] + [Arguments(5, 7)] + [Arguments(10, 50)] #if false && !DEBUG - [InlineData(100, 100)] - [InlineData(10, 1_000)] - [InlineData(1_000, 10)] + [Arguments(100, 100)] + [Arguments(10, 1_000)] + [Arguments(1_000, 10)] #endif public async Task MultiThreadedStressTest(int marketCount, int priceCount) { @@ -125,11 +116,11 @@ IObservable AddRemovePrices(Market market, int priceCount, int para await cacheCompleted; // Verify the results - CheckResultContents(_marketCacheResults, priceResults, Market.RatingCompare); + await CheckResultContents(_marketCacheResults, priceResults, Market.RatingCompare); } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // having var emptyChangeSetObs = Observable.Empty>(); @@ -156,31 +147,31 @@ public void NullChecks() var actionParentCompareKey2b = () => emptyChangeSetObs.MergeManyChangeSets(nullKeySelector, sourceComparer: emptyParentComparer, equalityComparer: emptyEqualityComparer); // then - emptyChangeSetObs.Should().NotBeNull(); - emptyChildChangeSetObs.Should().NotBeNull(); - emptyChildComparer.Should().NotBeNull(); - emptyEqualityComparer.Should().NotBeNull(); - emptyKeySelector.Should().NotBeNull(); - emptyParentComparer.Should().NotBeNull(); - emptySelector.Should().NotBeNull(); - nullChangeSetObs.Should().BeNull(); - nullChildComparer.Should().BeNull(); - nullEqualityComparer.Should().BeNull(); - nullKeySelector.Should().BeNull(); - nullParentComparer.Should().BeNull(); - nullSelector.Should().BeNull(); - - actionParentCompare1.Should().Throw(); - actionParentCompareKey1a.Should().Throw(); - actionParentCompareKey1b.Should().Throw(); - actionParentCompareKey1c.Should().Throw(); - actionParentCompare2.Should().Throw(); - actionParentCompareKey2a.Should().Throw(); - actionParentCompareKey2b.Should().Throw(); + await Assert.That(emptyChangeSetObs).IsNotNull(); + await Assert.That(emptyChildChangeSetObs).IsNotNull(); + await Assert.That(emptyChildComparer).IsNotNull(); + await Assert.That(emptyEqualityComparer).IsNotNull(); + await Assert.That(emptyKeySelector).IsNotNull(); + await Assert.That(emptyParentComparer).IsNotNull(); + await Assert.That(emptySelector).IsNotNull(); + await Assert.That(nullChangeSetObs).IsNull(); + await Assert.That(nullChildComparer).IsNull(); + await Assert.That(nullEqualityComparer).IsNull(); + await Assert.That(nullKeySelector).IsNull(); + await Assert.That(nullParentComparer).IsNull(); + await Assert.That(nullSelector).IsNull(); + + await Assert.That(actionParentCompare1).Throws(); + await Assert.That(actionParentCompareKey1a).Throws(); + await Assert.That(actionParentCompareKey1b).Throws(); + await Assert.That(actionParentCompareKey1c).Throws(); + await Assert.That(actionParentCompare2).Throws(); + await Assert.That(actionParentCompareKey2a).Throws(); + await Assert.That(actionParentCompareKey2b).Throws(); } - [Fact] - public void AbleToInvokeFactory() + [Test] + public async Task AbleToInvokeFactory() { // having var invoked = false; @@ -195,12 +186,12 @@ IObservable> factory(IMarket m) _marketCache.AddOrUpdate(new Market(0)); // then - _marketCacheResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); } - [Fact] - public void AbleToInvokeFactoryWithKey() + [Test] + public async Task AbleToInvokeFactoryWithKey() { // having var invoked = false; @@ -215,12 +206,12 @@ IObservable> factory(IMarket m, Guid g) _marketCache.AddOrUpdate(new Market(0)); // then - _marketCacheResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); } - [Fact] - public void AllExistingSubItemsPresentInResult() + [Test] + public async Task AllExistingSubItemsPresentInResult() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -231,18 +222,18 @@ public void AllExistingSubItemsPresentInResult() _marketCache.AddOrUpdate(markets); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AllNewSubItemsPresentInResult() + [Test] + public async Task AllNewSubItemsPresentInResult() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -253,18 +244,18 @@ public void AllNewSubItemsPresentInResult() markets.Select((m, index) => new { Market = m, Index = index }).ForEach(m => m.Market.SetPrices(m.Index * ItemIdStride, (m.Index * ItemIdStride) + PricesPerMarket, GetRandomPrice)); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AllRefreshedSubItemsAreRefreshed() + [Test] + public async Task AllRefreshedSubItemsAreRefreshed() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -276,17 +267,17 @@ public void AllRefreshedSubItemsAreRefreshed() markets.ForEach(m => m.RefreshAllPrices(GetRandomPrice)); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount + 1); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(MarketCount * PricesPerMarket); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount + 1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(MarketCount * PricesPerMarket); } - [Fact] - public void AnyDuplicateKeyValuesShouldBeHidden() + [Test] + public async Task AnyDuplicateKeyValuesShouldBeHidden() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -299,17 +290,17 @@ public void AnyDuplicateKeyValuesShouldBeHidden() markets[1].SetPrices(0, PricesPerMarket, GetRandomPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeNoOpWhenRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeNoOpWhenRemoved() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -323,17 +314,17 @@ public void AnyDuplicateValuesShouldBeNoOpWhenRemoved() markets[1].RemoveAllPrices(); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -347,19 +338,19 @@ public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() _marketCache.Remove(markets[0]); // then - _marketCacheResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[1].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Messages.Count.Should().Be(2); - results.Messages[1].Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[1].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldNotRefreshWhenHidden() + [Test] + public async Task AnyDuplicateValuesShouldNotRefreshWhenHidden() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -373,18 +364,18 @@ public void AnyDuplicateValuesShouldNotRefreshWhenHidden() markets[1].RefreshAllPrices(GetRandomPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void SourceRefreshGeneratesUpdatesAsNeeded() + [Test] + public async Task SourceRefreshGeneratesUpdatesAsNeeded() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -398,17 +389,17 @@ public void SourceRefreshGeneratesUpdatesAsNeeded() SetRating(markets[1], 2.0); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[1].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[1].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void SourceRefreshDoesNothingIfDisabled() + [Test] + public async Task SourceRefreshDoesNothingIfDisabled() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -422,17 +413,17 @@ public void SourceRefreshDoesNothingIfDisabled() SetRating(markets[1], 2.0); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + foreach (var pair in results.Data.Items.Zip(markets[0].PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AnyRemovedSubItemIsRemoved() + [Test] + public async Task AnyRemovedSubItemIsRemoved() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -444,18 +435,18 @@ public void AnyRemovedSubItemIsRemoved() markets.ForEach(m => m.PricesCache.Edit(updater => updater.RemoveKeys(updater.Keys.Take(RemoveCount)))); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * (PricesPerMarket - RemoveCount)); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Messages[0].Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(MarketCount * RemoveCount); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * (PricesPerMarket - RemoveCount)); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(MarketCount * RemoveCount); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void AnySourceItemRemovedRemovesAllSourceValues() + [Test] + public async Task AnySourceItemRemovedRemovesAllSourceValues() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -467,16 +458,16 @@ public void AnySourceItemRemovedRemovesAllSourceValues() _marketCache.Edit(updater => updater.RemoveKeys(updater.Keys.Take(RemoveCount))); // then - _marketCacheResults.Data.Count.Should().Be(MarketCount - RemoveCount); - results.Data.Count.Should().Be((MarketCount - RemoveCount) * PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket * RemoveCount); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(MarketCount - RemoveCount); + await Assert.That(results.Data.Count).IsEqualTo((MarketCount - RemoveCount) * PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket * RemoveCount); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void ChangingSourceByUpdateRemovesPreviousAndAddsNewValues() + [Test] + public async Task ChangingSourceByUpdateRemovesPreviousAndAddsNewValues() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -490,17 +481,17 @@ public void ChangingSourceByUpdateRemovesPreviousAndAddsNewValues() _marketCache.AddOrUpdate(updatedMarket); // then - _marketCacheResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket * 2); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * 3); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Zip(updatedMarket.PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * 3); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var pair in results.Data.Items.Zip(updatedMarket.PricesCache.Items)) { await Assert.That(pair.First).IsEqualTo(pair.Second); } } - [Fact] - public void ChangingSourceByUpdateRemovesPreviousAndEmitsBetterValues() + [Test] + public async Task ChangingSourceByUpdateRemovesPreviousAndEmitsBetterValues() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -519,18 +510,18 @@ public void ChangingSourceByUpdateRemovesPreviousAndEmitsBetterValues() _marketCache.AddOrUpdate(updatedMarket); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket * 3); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * 3); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Take(PricesPerMarket).Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketWorse.Id)); - results.Data.Items.Skip(PricesPerMarket).Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(updatedMarket.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * 3); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * 3); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Take(PricesPerMarket).Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketWorse.Id); } + foreach (var guid in results.Data.Items.Skip(PricesPerMarket).Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(updatedMarket.Id); } } - [Fact] - public void UpdatesToCorrectValueOnRemove() + [Test] + public async Task UpdatesToCorrectValueOnRemove() { // having var marketOriginal = new Market(0); @@ -550,17 +541,17 @@ public void UpdatesToCorrectValueOnRemove() _marketCache.Remove(marketBest); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketBetter.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketBetter.Id); } } - [Fact] - public void OnlyUpdatesOnDuplicateIfNewItemIsFromBetterParent() + [Test] + public async Task OnlyUpdatesOnDuplicateIfNewItemIsFromBetterParent() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -576,23 +567,23 @@ public void OnlyUpdatesOnDuplicateIfNewItemIsFromBetterParent() _marketCache.AddOrUpdate(marketBetter); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketBetter.Id)); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsLow.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketBetter.Id); } + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLow.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } } - [Fact] - public void BestChoiceFromDuplicatesSelectedWhenChangeSetCreated() + [Test] + public async Task BestChoiceFromDuplicatesSelectedWhenChangeSetCreated() { // having var marketOriginal = new Market(0); @@ -608,23 +599,23 @@ public void BestChoiceFromDuplicatesSelectedWhenChangeSetCreated() using var resultsLow = ChangeSetByLowRating(false).AsAggregator(); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketBetter.Id)); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsLow.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketBetter.Id); } + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLow.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } } - [Fact] - public void OnlyAddsBetterValuesOnSourceUpdate() + [Test] + public async Task OnlyAddsBetterValuesOnSourceUpdate() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -640,23 +631,23 @@ public void OnlyAddsBetterValuesOnSourceUpdate() marketBetter.SetPrices(0, PricesPerMarket, GetRandomPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketBetter.Id)); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsLow.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketBetter.Id); } + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLow.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } } - [Fact] - public void UpdatesToCorrectValueOnRefresh() + [Test] + public async Task UpdatesToCorrectValueOnRefresh() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -675,35 +666,35 @@ public void UpdatesToCorrectValueOnRefresh() SetRating(marketBetter, 2.0); // then - _marketCacheResults.Data.Count.Should().Be(2); - _marketCacheResults.Summary.Overall.Refreshes.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Updates.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsLow.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketBetter.Id)); - resultsRefresh.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsRefresh.Summary.Overall.Updates.Should().Be(PricesPerMarket); - resultsRefresh.Summary.Overall.Removes.Should().Be(0); - resultsRefresh.Summary.Overall.Refreshes.Should().Be(0); - resultsRefresh.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketBetter.Id)); - resultsLowRefresh.Data.Count.Should().Be(PricesPerMarket); - resultsLowRefresh.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLowRefresh.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - resultsLowRefresh.Summary.Overall.Removes.Should().Be(0); - resultsLowRefresh.Summary.Overall.Refreshes.Should().Be(0); - resultsLowRefresh.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(_marketCacheResults.Summary.Overall.Refreshes).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLow.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketBetter.Id); } + await Assert.That(resultsRefresh.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsRefresh.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(resultsRefresh.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsRefresh.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsRefresh.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketBetter.Id); } + await Assert.That(resultsLowRefresh.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLowRefresh.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLowRefresh.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(resultsLowRefresh.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLowRefresh.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLowRefresh.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } } - [Fact] - public void ChildComparerUpdatesToCorrectValueOnUpdate() + [Test] + public async Task ChildComparerUpdatesToCorrectValueOnUpdate() { // having using var resultsLow = ChangeSetByLowRating(false).AsAggregator(); @@ -724,31 +715,31 @@ public void ChildComparerUpdatesToCorrectValueOnUpdate() marketLowest.UpdateAllPrices(LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(3); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsLow.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - - resultsLowPrice.Data.Count.Should().Be(PricesPerMarket); - resultsLowPrice.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLowPrice.Summary.Overall.Updates.Should().Be(PricesPerMarket * 3); - resultsLowPrice.Summary.Overall.Removes.Should().Be(0); - resultsLowPrice.Summary.Overall.Refreshes.Should().Be(0); - resultsLowPrice.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLowest.Id)); - - resultsHighPrice.Data.Count.Should().Be(PricesPerMarket); - resultsHighPrice.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsHighPrice.Summary.Overall.Updates.Should().Be(PricesPerMarket); - resultsHighPrice.Summary.Overall.Removes.Should().Be(0); - resultsHighPrice.Summary.Overall.Refreshes.Should().Be(0); - resultsHighPrice.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHighest.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(3); + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLow.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + + await Assert.That(resultsLowPrice.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLowPrice.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLowPrice.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 3); + await Assert.That(resultsLowPrice.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLowPrice.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsLowPrice.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLowest.Id); } + + await Assert.That(resultsHighPrice.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsHighPrice.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsHighPrice.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(resultsHighPrice.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsHighPrice.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in resultsHighPrice.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketHighest.Id); } } - [Fact] - public void ChildComparerOnlyUpdatesVisibleValuesOnUpdate() + [Test] + public async Task ChildComparerOnlyUpdatesVisibleValuesOnUpdate() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -770,29 +761,29 @@ public void ChildComparerOnlyUpdatesVisibleValuesOnUpdate() marketLowest.UpdateAllPrices(LowestPrice - 1); // then - _marketCacheResults.Data.Count.Should().Be(3); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - lowRatingLowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowRatingLowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowRatingLowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowRatingLowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowRatingLowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowRatingLowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLowest.Id)); - lowRatingHighPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowRatingHighPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowRatingHighPriceResults.Summary.Overall.Removes.Should().Be(0); - lowRatingHighPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 3); - lowRatingHighPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowRatingHighPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(3); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(lowRatingLowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowRatingLowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLowest.Id); } + await Assert.That(lowRatingHighPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 3); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowRatingHighPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } } - [Fact] - public void ChildComparerOnlyRefreshesVisibleValues() + [Test] + public async Task ChildComparerOnlyRefreshesVisibleValues() { // having using var results = ChangeSetByRating(false).AsAggregator(); @@ -814,29 +805,29 @@ public void ChildComparerOnlyRefreshesVisibleValues() marketLowest.RefreshAllPrices(LowestPrice - 1); // then - _marketCacheResults.Data.Count.Should().Be(3); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - lowRatingLowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowRatingLowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowRatingLowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowRatingLowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowRatingLowPriceResults.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - lowRatingLowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLowest.Id)); - lowRatingHighPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowRatingHighPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowRatingHighPriceResults.Summary.Overall.Removes.Should().Be(0); - lowRatingHighPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowRatingHighPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowRatingHighPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(3); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in results.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketOriginal.Id); } + await Assert.That(lowRatingLowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowRatingLowPriceResults.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + foreach (var guid in lowRatingLowPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLowest.Id); } + await Assert.That(lowRatingHighPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowRatingHighPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + foreach (var guid in lowRatingHighPriceResults.Data.Items.Select(cp => cp.MarketId)) { await Assert.That(guid).IsEqualTo(marketLow.Id); } } - [Fact] - public void EqualityComparerHidesUpdatesWithoutChanges() + [Test] + public async Task EqualityComparerHidesUpdatesWithoutChanges() { // having var market = new Market(0); @@ -848,17 +839,17 @@ public void EqualityComparerHidesUpdatesWithoutChanges() market.SetPrices(0, PricesPerMarket, LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EqualityComparerAndChildComparerWorkTogetherForUpdates() + [Test] + public async Task EqualityComparerAndChildComparerWorkTogetherForUpdates() { // having using var resultsLow = ChangeSetByLowRating().AsAggregator(); @@ -877,27 +868,27 @@ public void EqualityComparerAndChildComparerWorkTogetherForUpdates() market.UpdateAllPrices(LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Messages.Count.Should().Be(1); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsRecent.Messages.Count.Should().Be(3); - resultsRecent.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsRecent.Summary.Overall.Removes.Should().Be(0); - resultsRecent.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - resultsRecent.Summary.Overall.Refreshes.Should().Be(0); - resultsTimeStamp.Messages.Count.Should().Be(4); - resultsTimeStamp.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsTimeStamp.Summary.Overall.Removes.Should().Be(0); - resultsTimeStamp.Summary.Overall.Updates.Should().Be(PricesPerMarket * 3); - resultsTimeStamp.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Messages.Count).IsEqualTo(1); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(resultsRecent.Messages.Count).IsEqualTo(3); + await Assert.That(resultsRecent.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsRecent.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsRecent.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(resultsRecent.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Messages.Count).IsEqualTo(4); + await Assert.That(resultsTimeStamp.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsTimeStamp.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 3); + await Assert.That(resultsTimeStamp.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EqualityComparerAndChildComparerWorkTogetherForRefreshes() + [Test] + public async Task EqualityComparerAndChildComparerWorkTogetherForRefreshes() { // having using var resultsLow = ChangeSetByLowRating().AsAggregator(); @@ -920,27 +911,27 @@ public void EqualityComparerAndChildComparerWorkTogetherForRefreshes() market.RefreshAllPrices(LowestPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Messages.Count.Should().Be(1); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsRecent.Messages.Count.Should().Be(4); - resultsRecent.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsRecent.Summary.Overall.Removes.Should().Be(0); - resultsRecent.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - resultsRecent.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - resultsTimeStamp.Messages.Count.Should().Be(5); - resultsTimeStamp.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsTimeStamp.Summary.Overall.Removes.Should().Be(0); - resultsTimeStamp.Summary.Overall.Updates.Should().Be(PricesPerMarket * 3); - resultsTimeStamp.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Messages.Count).IsEqualTo(1); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(resultsRecent.Messages.Count).IsEqualTo(4); + await Assert.That(resultsRecent.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsRecent.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsRecent.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(resultsRecent.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + await Assert.That(resultsTimeStamp.Messages.Count).IsEqualTo(5); + await Assert.That(resultsTimeStamp.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsTimeStamp.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 3); + await Assert.That(resultsTimeStamp.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); } - [Fact] - public void EqualityComparerAndChildComparerRefreshesBecomeUpdates() + [Test] + public async Task EqualityComparerAndChildComparerRefreshesBecomeUpdates() { // having using var resultsLow = ChangeSetByLowRating().AsAggregator(); @@ -963,27 +954,27 @@ public void EqualityComparerAndChildComparerRefreshesBecomeUpdates() market.RefreshAllPrices(GetRandomPrice); // then - _marketCacheResults.Data.Count.Should().Be(2); - resultsLow.Data.Count.Should().Be(PricesPerMarket); - resultsLow.Messages.Count.Should().Be(1); - resultsLow.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsLow.Summary.Overall.Removes.Should().Be(0); - resultsLow.Summary.Overall.Updates.Should().Be(0); - resultsLow.Summary.Overall.Refreshes.Should().Be(0); - resultsRecent.Messages.Count.Should().Be(4); - resultsRecent.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsRecent.Summary.Overall.Removes.Should().Be(0); - resultsRecent.Summary.Overall.Updates.Should().Be(PricesPerMarket * 3); - resultsRecent.Summary.Overall.Refreshes.Should().Be(0); - resultsTimeStamp.Messages.Count.Should().Be(5); - resultsTimeStamp.Summary.Overall.Adds.Should().Be(PricesPerMarket); - resultsTimeStamp.Summary.Overall.Removes.Should().Be(0); - resultsTimeStamp.Summary.Overall.Updates.Should().Be(PricesPerMarket * 3); - resultsTimeStamp.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); + await Assert.That(_marketCacheResults.Data.Count).IsEqualTo(2); + await Assert.That(resultsLow.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Messages.Count).IsEqualTo(1); + await Assert.That(resultsLow.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsLow.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(resultsLow.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(resultsRecent.Messages.Count).IsEqualTo(4); + await Assert.That(resultsRecent.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsRecent.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsRecent.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 3); + await Assert.That(resultsRecent.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Messages.Count).IsEqualTo(5); + await Assert.That(resultsTimeStamp.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(resultsTimeStamp.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(resultsTimeStamp.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 3); + await Assert.That(resultsTimeStamp.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); } - [Fact] - public void EveryItemVisibleWhenSequenceCompletes() + [Test] + public async Task EveryItemVisibleWhenSequenceCompletes() { // having _marketCache.AddOrUpdate(Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket))); @@ -993,19 +984,19 @@ public void EveryItemVisibleWhenSequenceCompletes() DisposeMarkets(); // then - results.Data.Count.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { // having _marketCache.AddOrUpdate(Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket, completable: completeChildren))); @@ -1022,12 +1013,12 @@ public void MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool c } // then - hasSourceSequenceCompleted.Should().Be(completeSource); - hasMergedSequenceCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(hasSourceSequenceCompleted).IsEqualTo(completeSource); + await Assert.That(hasMergedSequenceCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void MergedObservableWillFailIfSourceFails() + [Test] + public async Task MergedObservableWillFailIfSourceFails() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -1043,7 +1034,7 @@ public void MergedObservableWillFailIfSourceFails() DisposeMarkets(); // then - receivedError.Should().Be(expectedError); + await Assert.That(receivedError).IsEqualTo(expectedError); } private IObservable> CreateChangeSet(string name, IComparer? sourceComp = null, IComparer? childCompare = null, IEqualityComparer? equalityComparer = null, bool resortOnRefresh = true) => @@ -1071,16 +1062,17 @@ private IMarket SetRating(IMarket market, double newRating) public void Dispose() { _marketCacheResults.Dispose(); - DisposeMarkets(); + _marketCache.Items.ForEach(m => (m as IDisposable)?.Dispose()); + _marketCache.Dispose(); } - private void CheckResultContents(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults, IComparer comparer) + private async Task CheckResultContents(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults, IComparer comparer) { var expectedMarkets = _marketCache.Items.ToList(); // These should be subsets of each other - expectedMarkets.Should().BeSubsetOf(marketResults.Data.Items); - marketResults.Data.Items.Count.Should().Be(expectedMarkets.Count); + await Assert.That(expectedMarkets.Except(marketResults.Data.Items).Any()).IsFalse(); + await Assert.That(marketResults.Data.Items.Count).IsEqualTo(expectedMarkets.Count); // Pair up all the Markets/Prices, Group them by ItemId, and sort each Group by the Market comparer // Then pull out the first value from each group, which should be the price from the best market for each ItemId @@ -1090,8 +1082,8 @@ private void CheckResultContents(ChangeSetAggregator marketResult .ToList(); // These should be subsets of each other - expectedPrices.Should().BeSubsetOf(priceResults.Data.Items); - priceResults.Data.Items.Count.Should().Be(expectedPrices.Count); + await Assert.That(expectedPrices.Except(priceResults.Data.Items).Any()).IsFalse(); + await Assert.That(priceResults.Data.Items.Count).IsEqualTo(expectedPrices.Count); } private void DisposeMarkets() diff --git a/src/DynamicData.Tests/Cache/MergeManyChangeSetsListFixture.cs b/src/DynamicData.Tests/Cache/MergeManyChangeSetsListFixture.cs index 49f566907..514781133 100644 --- a/src/DynamicData.Tests/Cache/MergeManyChangeSetsListFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyChangeSetsListFixture.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Threading.Tasks; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; @@ -46,13 +38,13 @@ public MergeManyChangeSetsListFixture() _animalResults = _animalOwners.Connect().MergeManyChangeSets(owner => owner.Animals.Connect()).AsAggregator(); } - [Theory] - [InlineData(5, 7)] - [InlineData(10, 50)] + [Test] + [Arguments(5, 7)] + [Arguments(10, 50)] #if !DEBUG - [InlineData(10, 1_000)] - [InlineData(200, 500)] - [InlineData(1_000, 10)] + [Arguments(10, 1_000)] + [Arguments(200, 500)] + [Arguments(1_000, 10)] #endif public async Task MultiThreadedStressTest(int ownerCount, int animalCount) { @@ -122,11 +114,11 @@ IObservable AddRemoveAnimals(AnimalOwner owner, int animalCount, int par // Verify the results against the aggregator wired into the same Publish chain // that cacheCompleted observes. - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // Arrange var emptyChangeSetObs = Observable.Empty>(); @@ -143,34 +135,34 @@ public void NullChecks() var checkParam4 = () => emptyChangeSetObs.MergeManyChangeSets(nullSelector); // Assert - emptyChangeSetObs.Should().NotBeNull(); - emptyKeySelector.Should().NotBeNull(); - emptySelector.Should().NotBeNull(); - nullChangeSetObs.Should().BeNull(); - nullKeySelector.Should().BeNull(); - nullSelector.Should().BeNull(); - - checkParam1.Should().Throw(); - checkParam2.Should().Throw(); - checkParam3.Should().Throw(); - checkParam4.Should().Throw(); + await Assert.That(emptyChangeSetObs).IsNotNull(); + await Assert.That(emptyKeySelector).IsNotNull(); + await Assert.That(emptySelector).IsNotNull(); + await Assert.That(nullChangeSetObs).IsNull(); + await Assert.That(nullKeySelector).IsNull(); + await Assert.That(nullSelector).IsNull(); + + await Assert.That(checkParam1).Throws(); + await Assert.That(checkParam2).Throws(); + await Assert.That(checkParam3).Throws(); + await Assert.That(checkParam4).Throws(); } - [Fact] - public void ResultContainsAllInitialChildren() + [Test] + public async Task ResultContainsAllInitialChildren() { // Arrange // Act // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(1); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenFromAddedParents() + [Test] + public async Task ResultContainsChildrenFromAddedParents() { // Arrange var addThis = _animalOwnerFaker.Generate(); @@ -179,14 +171,14 @@ public void ResultContainsChildrenFromAddedParents() _animalOwners.AddOrUpdate(addThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount + 1); - _animalResults.Messages.Count.Should().Be(2); - addThis.Animals.Items.ForEach(added => _animalResults.Data.Items.Should().Contain(added)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount + 1); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + foreach (var added in addThis.Animals.Items) { await Assert.That(_animalResults.Data.Items).Contains(added); } + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenFromParentsRemovedWithRemove() + [Test] + public async Task ResultDoesNotContainChildrenFromParentsRemovedWithRemove() { // Arrange var removeThis = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -195,15 +187,15 @@ public void ResultDoesNotContainChildrenFromParentsRemovedWithRemove() _animalOwners.Remove(removeThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - 1); - _animalResults.Messages.Count.Should().Be(2); - removeThis.Animals.Items.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - 1); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + foreach (var removed in removeThis.Animals.Items) { await Assert.That(_animalResults.Data.Items).DoesNotContain(removed); } + await CheckResultContents(); removeThis.Dispose(); } - [Fact] - public void ResultDoesNotContainChildrenFromParentsBatchRemoved() + [Test] + public async Task ResultDoesNotContainChildrenFromParentsBatchRemoved() { // Arrange var removeThese = _randomizer.ListItems(_animalOwners.Items.ToList(), RemoveRangeSize); @@ -212,15 +204,15 @@ public void ResultDoesNotContainChildrenFromParentsBatchRemoved() _animalOwners.Remove(removeThese); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - RemoveRangeSize); - _animalResults.Messages.Count.Should().Be(2); - removeThese.SelectMany(owner => owner.Animals.Items).ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - RemoveRangeSize); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + foreach (var removed in removeThese.SelectMany(owner => owner.Animals.Items)) { await Assert.That(_animalResults.Data.Items).DoesNotContain(removed); } + await CheckResultContents(); removeThese.ForEach(owner => owner.Dispose()); } - [Fact] - public void ResultContainsCorrectItemsAfterParentUpdate() + [Test] + public async Task ResultContainsCorrectItemsAfterParentUpdate() { // Arrange var replaceThis = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -230,16 +222,16 @@ public void ResultContainsCorrectItemsAfterParentUpdate() _animalOwners.AddOrUpdate(withThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); // Owner Count should not change - _animalResults.Messages.Count.Should().Be(2); // 2 = Initial Add and one changeset with remove old items / add new items - replaceThis.Animals.Items.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - withThis.Animals.Items.ForEach(added => _animalResults.Data.Items.Should().Contain(added)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); // Owner Count should not change + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 2 = Initial Add and one changeset with remove old items / add new items + foreach (var removed in replaceThis.Animals.Items) { await Assert.That(_animalResults.Data.Items).DoesNotContain(removed); } + foreach (var added in withThis.Animals.Items) { await Assert.That(_animalResults.Data.Items).Contains(added); } + await CheckResultContents(); replaceThis.Dispose(); } - [Fact] - public void ResultEmptyIfSourceIsCleared() + [Test] + public async Task ResultEmptyIfSourceIsCleared() { // Arrange var items = _animalOwners.Items.ToList(); @@ -248,14 +240,14 @@ public void ResultEmptyIfSourceIsCleared() _animalOwners.Clear(); // Assert - _animalOwnerResults.Data.Count.Should().Be(0); - _animalResults.Data.Count.Should().Be(0); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(0); + await Assert.That(_animalResults.Data.Count).IsEqualTo(0); + await CheckResultContents(); items.ForEach(owner => owner.Dispose()); } - [Fact] - public void ResultContainsChildrenAddedWithAddRange() + [Test] + public async Task ResultContainsChildrenAddedWithAddRange() { // Arrange var initialCount = _animalOwners.Items.Sum(owner => owner.Animals.Count); @@ -265,15 +257,15 @@ public void ResultContainsChildrenAddedWithAddRange() _animalOwners.Items.ForEach(owner => owner.Animals.AddRange(_animalFaker.Generate(AddRangeSize).With(added => totalAdded.AddRange(added)))); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(1 + InitialOwnerCount); // Initial + 1 for each Range Added - totalAdded.ForEach(animal => _animalResults.Data.Items.Should().Contain(animal)); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount + totalAdded.Count); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(1 + InitialOwnerCount); // Initial + 1 for each Range Added + foreach (var animal in totalAdded) { await Assert.That(_animalResults.Data.Items).Contains(animal); } + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount + totalAdded.Count); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenAddedWithInsert() + [Test] + public async Task ResultContainsChildrenAddedWithInsert() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -285,16 +277,16 @@ public void ResultContainsChildrenAddedWithInsert() randomOwner.Animals.Insert(insertIndex, insertThis); // Assert - randomOwner.Animals.Items.ElementAt(insertIndex).Should().Be(insertThis); - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - _animalResults.Data.Items.Should().Contain(insertThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount + 1); - CheckResultContents(); + await Assert.That(randomOwner.Animals.Items.ElementAt(insertIndex)).IsEqualTo(insertThis); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + await Assert.That(_animalResults.Data.Items).Contains(insertThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount + 1); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemove() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemove() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -305,15 +297,15 @@ public void ResultDoesNotContainChildrenRemovedWithRemove() randomOwner.Animals.Remove(removeThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - _animalResults.Data.Items.Should().NotContain(removeThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount - 1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + await Assert.That(_animalResults.Data.Items).DoesNotContain(removeThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount - 1); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemoveAt() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemoveAt() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -325,15 +317,15 @@ public void ResultDoesNotContainChildrenRemovedWithRemoveAt() randomOwner.Animals.RemoveAt(removeIndex); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - _animalResults.Data.Items.Should().NotContain(removeThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount - 1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + await Assert.That(_animalResults.Data.Items).DoesNotContain(removeThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount - 1); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemoveRange() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemoveRange() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -345,14 +337,14 @@ public void ResultDoesNotContainChildrenRemovedWithRemoveRange() randomOwner.Animals.RemoveRange(removeIndex, removeCount); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - removeThese.ForEach(removed => randomOwner.Animals.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + foreach (var removed in removeThese) { await Assert.That(randomOwner.Animals.Items).DoesNotContain(removed); } + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemoveMany() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemoveMany() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -363,14 +355,14 @@ public void ResultDoesNotContainChildrenRemovedWithRemoveMany() randomOwner.Animals.RemoveMany(removeThese); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - removeThese.ForEach(removed => randomOwner.Animals.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + foreach (var removed in removeThese) { await Assert.That(randomOwner.Animals.Items).DoesNotContain(removed); } + await CheckResultContents(); } - [Fact] - public void ResultContainsCorrectItemsAfterChildReplacement() + [Test] + public async Task ResultContainsCorrectItemsAfterChildReplacement() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -381,15 +373,15 @@ public void ResultContainsCorrectItemsAfterChildReplacement() randomOwner.Animals.Replace(replaceThis, withThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - randomOwner.Animals.Items.Should().NotContain(replaceThis); - randomOwner.Animals.Items.Should().Contain(withThis); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + await Assert.That(randomOwner.Animals.Items).DoesNotContain(replaceThis); + await Assert.That(randomOwner.Animals.Items).Contains(withThis); + await CheckResultContents(); } - [Fact] - public void ResultContainsCorrectItemsAfterChildClear() + [Test] + public async Task ResultContainsCorrectItemsAfterChildClear() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -399,19 +391,19 @@ public void ResultContainsCorrectItemsAfterChildClear() randomOwner.Animals.Clear(); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); - randomOwner.Animals.Count.Should().Be(0); - removedAnimals.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); + await Assert.That(randomOwner.Animals.Count).IsEqualTo(0); + foreach (var removed in removedAnimals) { await Assert.That(_animalResults.Data.Items).DoesNotContain(removed); } + await CheckResultContents(); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { // Arrange @@ -423,12 +415,12 @@ public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSou } // Assert - _animalOwnerResults.IsCompleted.Should().Be(completeSource); - _animalResults.IsCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(_animalOwnerResults.IsCompleted).IsEqualTo(completeSource); + await Assert.That(_animalResults.IsCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange var expectedError = new Exception("Expected"); @@ -439,7 +431,7 @@ public void ResultFailsIfSourceFails() _animalOwners.Dispose(); // Assert - results.Exception.Should().Be(expectedError); + await Assert.That(results.Exception).IsEqualTo(expectedError); } public void Dispose() @@ -458,23 +450,28 @@ private AnimalOwner CreateWithSameId(AnimalOwner original) return sameId; } - private void CheckResultContents() => CheckResultContents(_animalOwners.Items, _animalOwnerResults, _animalResults); + private Task CheckResultContents() => CheckResultContents(_animalOwners.Items, _animalOwnerResults, _animalResults); - private static void CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults) + private static async Task CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults) { var expectedOwners = owners.ToList(); + var expectedOwnerIds = new HashSet(expectedOwners.Select(owner => owner.Id)); + var actualOwnerIds = new HashSet(ownerResults.Data.Items.Select(owner => owner.Id)); - // These should be subsets of each other - expectedOwners.Should().BeSubsetOf(ownerResults.Data.Items); - ownerResults.Data.Items.Count.Should().Be(expectedOwners.Count); + await Assert.That(actualOwnerIds.SetEquals(expectedOwnerIds)).IsTrue().Because("owner result ids should match the source owner ids"); - // All owner animals should be in the results - foreach (var owner in owners) - { - owner.Animals.Items.Should().BeSubsetOf(animalResults.Data.Items); - } + var expectedAnimalCountsById = expectedOwners + .SelectMany(owner => owner.Animals.Items) + .GroupBy(animal => animal.Id) + .ToDictionary(group => group.Key, group => group.Count()); + + var actualAnimalCountsById = animalResults.Data.Items + .GroupBy(animal => animal.Id) + .ToDictionary(group => group.Key, group => group.Count()); - // Results should not have more than the total number of animals - animalResults.Data.Count.Should().Be(owners.Sum(owner => owner.Animals.Count)); + await Assert.That(actualAnimalCountsById.Count).IsEqualTo(expectedAnimalCountsById.Count).Because("animal result ids should match the source animal ids"); + await Assert.That(actualAnimalCountsById.All(pair => expectedAnimalCountsById.TryGetValue(pair.Key, out var expectedCount) && expectedCount == pair.Value)) + .IsTrue() + .Because("animal result id multiplicities should match the source animal id multiplicities"); } } diff --git a/src/DynamicData.Tests/Cache/MergeManyFixture.cs b/src/DynamicData.Tests/Cache/MergeManyFixture.cs index 553bf452e..a7c2b1ece 100644 --- a/src/DynamicData.Tests/Cache/MergeManyFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class MergeManyFixture : IDisposable @@ -16,8 +8,8 @@ public class MergeManyFixture : IDisposable public void Dispose() => _source.Dispose(); - [Fact] - public void EverythingIsUnsubscribedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsUnsubscribedWhenStreamIsDisposed() { var invoked = false; var stream = _source.Connect().MergeMany(o => o.Observable).Subscribe(o => { invoked = true; }); @@ -28,14 +20,14 @@ public void EverythingIsUnsubscribedWhenStreamIsDisposed() stream.Dispose(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); } /// /// Invocations the only when child is invoked. /// - [Fact] - public void InvocationOnlyWhenChildIsInvoked() + [Test] + public async Task InvocationOnlyWhenChildIsInvoked() { var invoked = false; @@ -44,15 +36,15 @@ public void InvocationOnlyWhenChildIsInvoked() var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); stream.Dispose(); } - [Fact] - public void RemovedItemWillNotCauseInvocation() + [Test] + public async Task RemovedItemWillNotCauseInvocation() { var invoked = false; var stream = _source.Connect().MergeMany(o => o.Observable).Subscribe(o => { invoked = true; }); @@ -60,16 +52,16 @@ public void RemovedItemWillNotCauseInvocation() var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); _source.Remove(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); stream.Dispose(); } - private class ObjectWithObservable(int id) + private class ObjectWithObservable(int id) : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly ReactiveUI.Primitives.Signals.Signal _changed = new ReactiveUI.Primitives.Signals.Signal(); private bool _value; @@ -82,5 +74,10 @@ public void InvokeObservable(bool value) _value = value; _changed.OnNext(value); } + + public void Dispose() + { + _changed.Dispose(); + } } } diff --git a/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs b/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs index e2a6be748..a4c94b56a 100644 --- a/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class MergeManyItemsFixture : IDisposable @@ -16,15 +8,16 @@ public class MergeManyItemsFixture : IDisposable public void Dispose() => _source.Dispose(); - [Fact] - public void EverythingIsUnsubscribedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsUnsubscribedWhenStreamIsDisposed() { var invoked = false; + var observedIds = new List(); var stream = _source.Connect().MergeManyItems(o => o.Observable).Subscribe( o => { invoked = true; - (o.Item.Id == 1).Should().BeTrue(); + observedIds.Add(o.Item.Id); }); var item = new ObjectWithObservable(1); @@ -33,55 +26,60 @@ public void EverythingIsUnsubscribedWhenStreamIsDisposed() stream.Dispose(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); + await Assert.That(observedIds).IsEmpty(); } - [Fact] - public void InvocationOnlyWhenChildIsInvoked() + [Test] + public async Task InvocationOnlyWhenChildIsInvoked() { var invoked = false; + var observedIds = new List(); var stream = _source.Connect().MergeManyItems(o => o.Observable).Subscribe( o => { invoked = true; - (o.Item.Id == 1).Should().BeTrue(); + observedIds.Add(o.Item.Id); }); var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); + await Assert.That(observedIds).IsEquivalentTo(new[] { 1 }); stream.Dispose(); } - [Fact] - public void RemovedItemWillNotCauseInvocation() + [Test] + public async Task RemovedItemWillNotCauseInvocation() { var invoked = false; + var observedIds = new List(); var stream = _source.Connect().MergeManyItems(o => o.Observable).Subscribe( o => { invoked = true; - (o.Item.Id == 1).Should().BeTrue(); + observedIds.Add(o.Item.Id); }); var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); _source.Remove(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); + await Assert.That(observedIds).IsEmpty(); stream.Dispose(); } - private class ObjectWithObservable(int id) + private class ObjectWithObservable(int id) : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly ReactiveUI.Primitives.Signals.Signal _changed = new ReactiveUI.Primitives.Signals.Signal(); private bool _value; @@ -94,5 +92,9 @@ public void InvokeObservable(bool value) _value = value; _changed.OnNext(value); } + public void Dispose() + { + _changed.Dispose(); + } } } diff --git a/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs b/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs index e6987e846..d6cae25fd 100644 --- a/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class MergeManyWithKeyOverloadFixture : IDisposable @@ -16,8 +8,8 @@ public class MergeManyWithKeyOverloadFixture : IDisposable public void Dispose() => _source.Dispose(); - [Fact] - public void EverythingIsUnsubscribedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsUnsubscribedWhenStreamIsDisposed() { var invoked = false; var stream = _source.Connect().MergeMany((o, key) => o.Observable).Subscribe(o => { invoked = true; }); @@ -28,11 +20,11 @@ public void EverythingIsUnsubscribedWhenStreamIsDisposed() stream.Dispose(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); } - [Fact] - public void InvocationOnlyWhenChildIsInvoked() + [Test] + public async Task InvocationOnlyWhenChildIsInvoked() { var invoked = false; @@ -41,15 +33,15 @@ public void InvocationOnlyWhenChildIsInvoked() var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); stream.Dispose(); } - [Fact] - public void RemovedItemWillNotCauseInvocation() + [Test] + public async Task RemovedItemWillNotCauseInvocation() { var invoked = false; var stream = _source.Connect().MergeMany((o, key) => o.Observable).Subscribe(o => { invoked = true; }); @@ -57,15 +49,15 @@ public void RemovedItemWillNotCauseInvocation() var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); _source.Remove(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); stream.Dispose(); } - [Fact] - public void SingleItemCompleteWillNotMergedStream() + [Test] + public async Task SingleItemCompleteWillNotMergedStream() { var completed = false; var stream = _source.Connect().MergeMany((o, key) => o.Observable).Subscribe(_ => { }, () => completed = true); @@ -78,11 +70,11 @@ public void SingleItemCompleteWillNotMergedStream() stream.Dispose(); - completed.Should().BeFalse(); + await Assert.That(completed).IsFalse(); } - [Fact] - public void SingleItemFailWillNotFailMergedStream() + [Test] + public async Task SingleItemFailWillNotFailMergedStream() { var failed = false; var stream = _source.Connect().MergeMany((o, key) => o.Observable).Subscribe(_ => { }, ex => failed = true); @@ -94,14 +86,14 @@ public void SingleItemFailWillNotFailMergedStream() stream.Dispose(); - failed.Should().BeFalse(); + await Assert.That(failed).IsFalse(); } /// /// Merged stream does not complete if a child stream is still active. /// - [Fact] - public void MergedStreamDoesNotCompleteWhileItemStreamActive() + [Test] + public async Task MergedStreamDoesNotCompleteWhileItemStreamActive() { var streamCompleted = false; var sourceCompleted = false; @@ -114,15 +106,15 @@ public void MergedStreamDoesNotCompleteWhileItemStreamActive() _source.Dispose(); - sourceCompleted.Should().BeTrue(); - streamCompleted.Should().BeFalse(); + await Assert.That(sourceCompleted).IsTrue(); + await Assert.That(streamCompleted).IsFalse(); } /// /// Stream completes only when source and all child are complete. /// - [Fact] - public void MergedStreamCompletesWhenSourceAndItemsComplete() + [Test] + public async Task MergedStreamCompletesWhenSourceAndItemsComplete() { var streamCompleted = false; var sourceCompleted = false; @@ -136,15 +128,15 @@ public void MergedStreamCompletesWhenSourceAndItemsComplete() _source.Dispose(); item.CompleteObservable(); - sourceCompleted.Should().BeTrue(); - streamCompleted.Should().BeTrue(); + await Assert.That(sourceCompleted).IsTrue(); + await Assert.That(streamCompleted).IsTrue(); } /// /// Stream completes even if one of the children fails. /// - [Fact] - public void MergedStreamCompletesIfLastItemFails() + [Test] + public async Task MergedStreamCompletesIfLastItemFails() { var receivedError = default(Exception); var streamCompleted = false; @@ -159,16 +151,16 @@ public void MergedStreamCompletesIfLastItemFails() _source.Dispose(); item.FailObservable(new Exception("Test exception")); - receivedError.Should().Be(default); - sourceCompleted.Should().BeTrue(); - streamCompleted.Should().BeTrue(); + await Assert.That(receivedError).IsNull(); + await Assert.That(sourceCompleted).IsTrue(); + await Assert.That(streamCompleted).IsTrue(); } /// /// If the source stream has an error, the merged steam should also. /// - [Fact] - public void MergedStreamFailsWhenSourceFails() + [Test] + public async Task MergedStreamFailsWhenSourceFails() { var receivedError = default(Exception); var expectedError = new Exception("Test exception"); @@ -181,12 +173,12 @@ public void MergedStreamFailsWhenSourceFails() _source.Dispose(); - receivedError.Should().Be(expectedError); + await Assert.That(receivedError).IsEqualTo(expectedError); } - private class ObjectWithObservable(int id) + private class ObjectWithObservable(int id) : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly ReactiveUI.Primitives.Signals.Signal _changed = new ReactiveUI.Primitives.Signals.Signal(); private bool _value; @@ -203,5 +195,7 @@ public void InvokeObservable(bool value) _value = value; _changed.OnNext(value); } + + public void Dispose() => _changed.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/MonitorStatusFixture.cs b/src/DynamicData.Tests/Cache/MonitorStatusFixture.cs index 6a6a33a38..a87c50ea4 100644 --- a/src/DynamicData.Tests/Cache/MonitorStatusFixture.cs +++ b/src/DynamicData.Tests/Cache/MonitorStatusFixture.cs @@ -1,39 +1,35 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; public class MonitorStatusFixture { - [Fact] - public void InitialiStatusIsLoadding() + [Test] + public async Task InitialiStatusIsLoadding() { var invoked = false; var status = ConnectionStatus.Pending; - var subscription = new Subject().MonitorStatus().Subscribe( + var subscription = new ReactiveUI.Primitives.Signals.Signal().MonitorStatus().Subscribe( s => { invoked = true; status = s; }); - invoked.Should().BeTrue(); - status.Should().Be(ConnectionStatus.Pending, "No status has been received"); + await Assert.That(invoked).IsTrue(); + await Assert.That(status).IsEqualTo(ConnectionStatus.Pending).Because("No status has been received"); subscription.Dispose(); } - [Fact] - public void MultipleInvokesDoNotCallLoadedAgain() + [Test] + public async Task MultipleInvokesDoNotCallLoadedAgain() { var invoked = false; var invocations = 0; - var subject = new Subject(); + var subject = new ReactiveUI.Primitives.Signals.Signal(); var subscription = subject.MonitorStatus().Where(status => status == ConnectionStatus.Loaded).Subscribe( s => { @@ -45,17 +41,17 @@ public void MultipleInvokesDoNotCallLoadedAgain() subject.OnNext(1); subject.OnNext(1); - invoked.Should().BeTrue(); - invocations.Should().Be(1, "Status should be ConnectionStatus.Loaded"); + await Assert.That(invoked).IsTrue(); + await Assert.That(invocations).IsEqualTo(1).Because("Status should be ConnectionStatus.Loaded"); subscription.Dispose(); } - [Fact] - public void SetToError() + [Test] + public async Task SetToError() { var invoked = false; var status = ConnectionStatus.Pending; - var subject = new Subject(); + var subject = new ReactiveUI.Primitives.Signals.Signal(); Exception exception; var subscription = subject.MonitorStatus().Subscribe( @@ -69,16 +65,16 @@ public void SetToError() subject.OnError(new Exception("Test")); subscription.Dispose(); - invoked.Should().BeTrue(); - status.Should().Be(ConnectionStatus.Errored, "Status should be ConnectionStatus.Faulted"); + await Assert.That(invoked).IsTrue(); + await Assert.That(status).IsEqualTo(ConnectionStatus.Errored).Because("Status should be ConnectionStatus.Faulted"); } - [Fact] - public void SetToLoaded() + [Test] + public async Task SetToLoaded() { var invoked = false; var status = ConnectionStatus.Pending; - var subject = new Subject(); + var subject = new ReactiveUI.Primitives.Signals.Signal(); var subscription = subject.MonitorStatus().Subscribe( s => { @@ -87,8 +83,8 @@ public void SetToLoaded() }); subject.OnNext(1); - invoked.Should().BeTrue(); - status.Should().Be(ConnectionStatus.Loaded, "Status should be ConnectionStatus.Loaded"); + await Assert.That(invoked).IsTrue(); + await Assert.That(status).IsEqualTo(ConnectionStatus.Loaded).Because("Status should be ConnectionStatus.Loaded"); subscription.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/ObservableCachePreviewFixture.cs b/src/DynamicData.Tests/Cache/ObservableCachePreviewFixture.cs index 801b03040..9a6551e2a 100644 --- a/src/DynamicData.Tests/Cache/ObservableCachePreviewFixture.cs +++ b/src/DynamicData.Tests/Cache/ObservableCachePreviewFixture.cs @@ -1,10 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using Xunit; - namespace DynamicData.Tests.Cache; public class ObservableCachePreviewFixture : IDisposable @@ -19,28 +14,33 @@ public ObservableCachePreviewFixture() _results = _source.Connect().AsAggregator(); } - [Fact] - public void ChangesAreNotYetAppliedDuringPreview() + [Test] + public async Task ChangesAreNotYetAppliedDuringPreview() { _source.Clear(); // On preview, make sure the list is empty + var countDuringPreview = -1; + var anyItemsDuringPreview = true; var d = _source.Preview().Subscribe( _ => { - Assert.True(_source.Count == 0); - Assert.True(_source.Items.Any() == false); + countDuringPreview = _source.Count; + anyItemsDuringPreview = _source.Items.Any(); }); // Trigger a change _source.AddOrUpdate(new Person("A", 1)); + await Assert.That(countDuringPreview).IsEqualTo(0); + await Assert.That(anyItemsDuringPreview).IsFalse(); + // Cleanup d.Dispose(); } - [Fact] - public void ConnectPreviewPredicateIsApplied() + [Test] + public async Task ConnectPreviewPredicateIsApplied() { _source.Clear(); @@ -52,10 +52,10 @@ public void ConnectPreviewPredicateIsApplied() _source.AddOrUpdate(new Person("B", 2)); _source.AddOrUpdate(new Person("C", 3)); - Assert.True(aggregator.Messages.Count == 1); - Assert.True(aggregator.Messages[0].Count == 1); - Assert.True(aggregator.Messages[0].First().Key == "B"); - Assert.True(aggregator.Messages[0].First().Reason == ChangeReason.Add); + await Assert.That(aggregator.Messages.Count == 1).IsTrue(); + await Assert.That(aggregator.Messages[0].Count == 1).IsTrue(); + await Assert.That(aggregator.Messages[0].First().Key == "B").IsTrue(); + await Assert.That(aggregator.Messages[0].First().Reason == ChangeReason.Add).IsTrue(); // Cleanup aggregator.Dispose(); @@ -67,21 +67,34 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void NoChangesAllowedDuringPreview() + [Test] + public async Task NoChangesAllowedDuringPreview() { // On preview, try adding an arbitrary item - var d = _source.Preview().Subscribe(_ => Assert.Throws(() => _source.AddOrUpdate(new Person("A", 1)))); + Exception? receivedException = null; + var d = _source.Preview().Subscribe(_ => + { + try + { + _source.AddOrUpdate(new Person("A", 1)); + } + catch (Exception exception) + { + receivedException = exception; + } + }); // Trigger a change _source.AddOrUpdate(new Person("B", 2)); + await Assert.That(receivedException).IsTypeOf(); + // Cleanup d.Dispose(); } - [Fact] - public void PreviewEventsAreCorrect() + [Test] + public async Task PreviewEventsAreCorrect() { var person = new Person("A", 1); @@ -95,44 +108,52 @@ public void PreviewEventsAreCorrect() l.AddOrUpdate(new[] { new Person("B", 2), new Person("C", 3) }); }); - Assert.True(preview.Messages.SequenceEqual(connect.Messages)); - Assert.True(_source.KeyValues.OrderBy(t => t.Value.Age).Select(t => t.Value.Age).SequenceEqual(new[] { 2, 3 })); + await Assert.That(preview.Messages.SequenceEqual(connect.Messages)).IsTrue(); + await Assert.That(_source.KeyValues.OrderBy(t => t.Value.Age).Select(t => t.Value.Age).SequenceEqual(new[] { 2, 3 })).IsTrue(); } - [Fact] - public void RecursiveEditsHavePostponedEvents() + [Test] + public async Task RecursiveEditsHavePostponedEvents() { var person = new Person("A", 1); var preview = _source.Preview().AsAggregator(); var connect = _source.Connect().AsAggregator(); + var previewCountDuringEdit = -1; + var connectCountDuringEdit = -1; _source.Edit( l => { _source.Edit(l2 => l2.AddOrUpdate(person)); - Assert.Equal(0, preview.Messages.Count); - Assert.Equal(0, connect.Messages.Count); + previewCountDuringEdit = preview.Messages.Count; + connectCountDuringEdit = connect.Messages.Count; }); - Assert.Equal(1, preview.Messages.Count); - Assert.Equal(1, connect.Messages.Count); + await Assert.That(previewCountDuringEdit).IsEqualTo(0); + await Assert.That(connectCountDuringEdit).IsEqualTo(0); + await Assert.That(preview.Messages.Count).IsEqualTo(1); + await Assert.That(connect.Messages.Count).IsEqualTo(1); - Assert.True(_source.Items.SequenceEqual(new[] { person })); + await Assert.That(_source.Items.SequenceEqual(new[] { person })).IsTrue(); } - [Fact] - public void RecursiveEditsWork() + [Test] + public async Task RecursiveEditsWork() { var person = new Person("A", 1); + Person[] sourceItemsDuringEdit = []; + Person[] updaterItemsDuringEdit = []; _source.Edit( l => { _source.AddOrUpdate(person); - Assert.True(_source.Items.SequenceEqual(new[] { person })); - Assert.True(l.Items.SequenceEqual(new[] { person })); + sourceItemsDuringEdit = _source.Items.ToArray(); + updaterItemsDuringEdit = l.Items.ToArray(); }); - Assert.True(_source.Items.SequenceEqual(new[] { person })); + await Assert.That(sourceItemsDuringEdit.SequenceEqual(new[] { person })).IsTrue(); + await Assert.That(updaterItemsDuringEdit.SequenceEqual(new[] { person })).IsTrue(); + await Assert.That(_source.Items.SequenceEqual(new[] { person })).IsTrue(); } } diff --git a/src/DynamicData.Tests/Cache/ObservableChangeSetFixture.cs b/src/DynamicData.Tests/Cache/ObservableChangeSetFixture.cs index 4460dad3e..99b65adc7 100644 --- a/src/DynamicData.Tests/Cache/ObservableChangeSetFixture.cs +++ b/src/DynamicData.Tests/Cache/ObservableChangeSetFixture.cs @@ -1,23 +1,11 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Threading.Tasks; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class ObservableChangeSetFixture { - // [Fact] //Disabled due to test failing when run with a test runner. Run locally in isolation and it works + // [Test] //Disabled due to test failing when run with a test runner. Run locally in isolation and it works [Description("See https://github.com/reactivemarbles/DynamicData/issues/383")] [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Acceptable for test.")] [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "Disabled due to test failing when run with a test runner")] @@ -27,7 +15,6 @@ private async Task AsyncSubscriptionCanReceiveMultipleResults() //the aim of this test is to ensure we can continuously receive subscriptions when we use the async subscribe overloads var result = new List(); - var observable = ObservableChangeSet.Create( async (changeSet, token) => { @@ -42,18 +29,16 @@ private async Task AsyncSubscriptionCanReceiveMultipleResults() * but periodically fails when all tests are run. WTAF - I have no idea why but can only speculate * that without it the context is returning to the context of the test runner and it doesn't get back to it * until after the test session ends - */ + */ await Task.Delay(5, token).ConfigureAwait(false); } }, i => i) .Select(cs => cs.Select(c => c.Current).ToList()); - var isComplete = false; Exception? error = null; - //load list of results var subscriber = observable .Subscribe(item => result.AddRange(item), ex => error = ex, () => isComplete = true); @@ -61,11 +46,11 @@ private async Task AsyncSubscriptionCanReceiveMultipleResults() //allow some results through await Task.Delay(100); - isComplete.Should().Be(false); - error.Should().BeNull(); + await Assert.That(isComplete).IsFalse(); + await Assert.That(error).IsNull(); //do not try to be clever with timings because wierd stuff happens in time - result.Take(5).Should().BeEquivalentTo(new List + await Assert.That(result.Take(5)).IsEquivalentTo(new List { 0, 1, @@ -77,9 +62,8 @@ private async Task AsyncSubscriptionCanReceiveMultipleResults() subscriber.Dispose(); } - - [Fact] - public void HandlesAsyncError() + [Test] + public async Task HandlesAsyncError() { Exception? error = null; @@ -97,12 +81,12 @@ public void HandlesAsyncError() using var dervived = observable.AsObservableCache(); using (dervived.Connect().Subscribe(_ => { }, ex => error = ex)) { - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } } - [Fact] - public void HandlesError() + [Test] + public async Task HandlesError() { Exception? error = null; @@ -120,26 +104,26 @@ public void HandlesError() using var derived = observable.AsObservableCache(); using (derived.Connect().Subscribe(_ => { }, ex => error = ex)) { - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } } - [Fact] - public void LoadsAndDisposeFromObservableCache() + [Test] + public async Task LoadsAndDisposeFromObservableCache() { var isDisposed = false; var observable = ObservableChangeSet.Create(cache => () => isDisposed = true, p => p.Name); observable.AsObservableCache().Dispose(); - isDisposed.Should().BeTrue(); + await Assert.That(isDisposed).IsTrue(); } - [Fact] - public void LoadsAndDisposeUsingAction() + [Test] + public async Task LoadsAndDisposeUsingAction() { var isDisposed = false; - SubscribeAndAssert( + await SubscribeAndAssert( ObservableChangeSet.Create( cache => { @@ -148,18 +132,18 @@ public void LoadsAndDisposeUsingAction() return () => isDisposed = true; }, p => p.Name), - checkContentAction: result => result.Count.Should().Be(100)); +checkContentAction: async result => { await Assert.That(result.Count).IsEqualTo(100); }); - isDisposed.Should().BeTrue(); + await Assert.That(isDisposed).IsTrue(); } - [Fact] - public void LoadsAndDisposeUsingActionAsync() + [Test] + public async Task LoadsAndDisposeUsingActionAsync() { static Task CreateTask() => Task.FromResult(Enumerable.Range(1, 100).Select(i => new Person($"Name.{i}", i)).ToArray()); var isDisposed = false; - SubscribeAndAssert( + await SubscribeAndAssert( ObservableChangeSet.Create( async cache => { @@ -168,16 +152,16 @@ public void LoadsAndDisposeUsingActionAsync() return () => isDisposed = true; }, p => p.Name), - checkContentAction: result => result.Count.Should().Be(100)); +checkContentAction: async result => { await Assert.That(result.Count).IsEqualTo(100); }); - isDisposed.Should().BeTrue(); + await Assert.That(isDisposed).IsTrue(); } - [Fact] - public void LoadsAndDisposeUsingDisposable() + [Test] + public async Task LoadsAndDisposeUsingDisposable() { var isDisposed = false; - SubscribeAndAssert( + await SubscribeAndAssert( ObservableChangeSet.Create( cache => { @@ -186,18 +170,18 @@ public void LoadsAndDisposeUsingDisposable() return Disposable.Create(() => isDisposed = true); }, p => p.Name), - checkContentAction: result => result.Count.Should().Be(100)); +checkContentAction: async result => { await Assert.That(result.Count).IsEqualTo(100); }); - isDisposed.Should().BeTrue(); + await Assert.That(isDisposed).IsTrue(); } - [Fact] - public void LoadsAndDisposeUsingDisposableAsync() + [Test] + public async Task LoadsAndDisposeUsingDisposableAsync() { static Task CreateTask() => Task.FromResult(Enumerable.Range(1, 100).Select(i => new Person($"Name.{i}", i)).ToArray()); var isDisposed = false; - SubscribeAndAssert( + await SubscribeAndAssert( ObservableChangeSet.Create( async cache => { @@ -206,13 +190,13 @@ public void LoadsAndDisposeUsingDisposableAsync() return Disposable.Create(() => isDisposed = true); }, p => p.Name), - checkContentAction: result => result.Count.Should().Be(100)); +checkContentAction: async result => { await Assert.That(result.Count).IsEqualTo(100); }); - isDisposed.Should().BeTrue(); + await Assert.That(isDisposed).IsTrue(); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] - private void SubscribeAndAssert(IObservable> observableChangeset, bool expectsError = false, Action>? checkContentAction = null) + private async Task SubscribeAndAssert(IObservable> observableChangeset, bool expectsError = false, Func, Task>? checkContentAction = null) where TKey : notnull where TObject : notnull { @@ -225,16 +209,16 @@ private void SubscribeAndAssert(IObservable _catPersonResults; - public OfTypeFixture(ITestOutputHelper testOutputHelper) + public OfTypeFixture() { _randomizer = new(0x3737_ddcc); _personFaker = new Faker().CustomInstantiator(faker => new Person(faker.Person.FullName)).WithSeed(_randomizer); _catPersonFaker = new Faker().CustomInstantiator(faker => new CatPerson(faker.Person.FullName, $"{faker.Hacker.Adjective()} the {faker.Hacker.Noun()}")).WithSeed(_randomizer); - _personResults = _sourceCache.Connect().TestSpy(testOutputHelper, "Cache").AsAggregator(); - _catPersonResults = _sourceCache.Connect().OfType().TestSpy(testOutputHelper, "OfType").AsAggregator(); + var testOutput = TestContext.Current?.OutputWriter; + _personResults = _sourceCache.Connect().TestSpy(testOutput, "Cache").AsAggregator(); + _catPersonResults = _sourceCache.Connect().OfType().TestSpy(testOutput, "OfType").AsAggregator(); } - [Fact] - public void AddedItemsAreInResults() + [Test] + public async Task AddedItemsAreInResults() { // Arrange var people = _personFaker.Generate(AddCount); @@ -53,15 +47,15 @@ public void AddedItemsAreInResults() _sourceCache.AddOrUpdate(people); _sourceCache.AddOrUpdate(catPeople); - _personResults.Summary.Overall.Adds.Should().Be(AddCount * 2); - _personResults.Messages.Count.Should().Be(2); - _catPersonResults.Summary.Overall.Adds.Should().Be(AddCount); - _catPersonResults.Messages.Count.Should().Be(1); - CheckResults(); + await Assert.That(_personResults.Summary.Overall.Adds).IsEqualTo(AddCount * 2); + await Assert.That(_personResults.Messages.Count).IsEqualTo(2); + await Assert.That(_catPersonResults.Summary.Overall.Adds).IsEqualTo(AddCount); + await Assert.That(_catPersonResults.Messages.Count).IsEqualTo(1); + await CheckResults(); } - [Fact] - public void RemovedItemsAreNotResults() + [Test] + public async Task RemovedItemsAreNotResults() { var people = _personFaker.Generate(AddCount); var catPeople = _catPersonFaker.Generate(AddCount); @@ -71,17 +65,17 @@ public void RemovedItemsAreNotResults() _sourceCache.Remove(_randomizer.ListItems(people, RemoveCount)); _sourceCache.Remove(_randomizer.ListItems(catPeople, RemoveCount)); - _personResults.Summary.Overall.Adds.Should().Be(AddCount * 2); - _personResults.Summary.Overall.Removes.Should().Be(RemoveCount * 2); - _personResults.Messages.Count.Should().Be(4); - _catPersonResults.Summary.Overall.Adds.Should().Be(AddCount); - _catPersonResults.Summary.Overall.Removes.Should().Be(RemoveCount); - _catPersonResults.Messages.Count.Should().Be(2); - CheckResults(); + await Assert.That(_personResults.Summary.Overall.Adds).IsEqualTo(AddCount * 2); + await Assert.That(_personResults.Summary.Overall.Removes).IsEqualTo(RemoveCount * 2); + await Assert.That(_personResults.Messages.Count).IsEqualTo(4); + await Assert.That(_catPersonResults.Summary.Overall.Adds).IsEqualTo(AddCount); + await Assert.That(_catPersonResults.Summary.Overall.Removes).IsEqualTo(RemoveCount); + await Assert.That(_catPersonResults.Messages.Count).IsEqualTo(2); + await CheckResults(); } - [Fact] - public void UpdateResultsAreCorrect() + [Test] + public async Task UpdateResultsAreCorrect() { // Arrange var people = _personFaker.Generate(AddCount); @@ -102,14 +96,14 @@ public void UpdateResultsAreCorrect() _sourceCache.AddOrUpdate(updated); // Assert - _personResults.Summary.Overall.Adds.Should().Be(AddCount * 2); - _personResults.Summary.Overall.Updates.Should().Be(UpdateCount); - _personResults.Messages.Count.Should().Be(3); - _catPersonResults.Summary.Overall.Adds.Should().Be(AddCount + nonToCatCount); - _catPersonResults.Summary.Overall.Removes.Should().Be(catToNonCount); - _catPersonResults.Summary.Overall.Updates.Should().Be(catToCatCount); - _catPersonResults.Messages.Count.Should().Be(2); - CheckResults(); + await Assert.That(_personResults.Summary.Overall.Adds).IsEqualTo(AddCount * 2); + await Assert.That(_personResults.Summary.Overall.Updates).IsEqualTo(UpdateCount); + await Assert.That(_personResults.Messages.Count).IsEqualTo(3); + await Assert.That(_catPersonResults.Summary.Overall.Adds).IsEqualTo(AddCount + nonToCatCount); + await Assert.That(_catPersonResults.Summary.Overall.Removes).IsEqualTo(catToNonCount); + await Assert.That(_catPersonResults.Summary.Overall.Updates).IsEqualTo(catToCatCount); + await Assert.That(_catPersonResults.Messages.Count).IsEqualTo(2); + await CheckResults(); } public void Dispose() @@ -131,13 +125,13 @@ private CatPerson GenerateUpdateCatPerson(string id) return new CatPerson(newCp.Name, newCp.CatName, id); } - private void CheckResults() + private async Task CheckResults() { var expectedPeople = _sourceCache.Items; var expectedCatPeople = expectedPeople.OfType(); - _personResults.Data.Items.Should().BeEquivalentTo(expectedPeople); - _catPersonResults.Data.Items.Should().BeEquivalentTo(expectedCatPeople); + await Assert.That(_personResults.Data.Items).IsEquivalentTo(expectedPeople); + await Assert.That(_catPersonResults.Data.Items).IsEquivalentTo(expectedCatPeople); } private interface ICatPerson diff --git a/src/DynamicData.Tests/Cache/OnItemFixture.cs b/src/DynamicData.Tests/Cache/OnItemFixture.cs index 97aeebc75..43207814c 100644 --- a/src/DynamicData.Tests/Cache/OnItemFixture.cs +++ b/src/DynamicData.Tests/Cache/OnItemFixture.cs @@ -1,18 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; public class OnItemFixture { - [Fact] - public void OnItemAddCalled() + [Test] + public async Task OnItemAddCalled() { var called = false; var source = new SourceCache(x => x.Age); @@ -22,11 +20,11 @@ public void OnItemAddCalled() var person = new Person("A", 1); source.AddOrUpdate(person); - Assert.True(called); + await Assert.That(called).IsTrue(); } - [Fact] - public void OnItemRefreshedCalled() + [Test] + public async Task OnItemRefreshedCalled() { var called = false; var source = new SourceCache(x => x.Age); @@ -34,15 +32,15 @@ public void OnItemRefreshedCalled() var person = new Person("A", 1); source.AddOrUpdate(person); - source.Connect().AutoRefresh(x=>x.Age).OnItemRefreshed(_ => called = true).Subscribe(); + source.Connect().AutoRefresh(x => x.Age).OnItemRefreshed(_ => called = true).Subscribe(); person.Age += 1; - Assert.True(called); + await Assert.That(called).IsTrue(); } - [Fact] - public void OnItemRemovedCalled() + [Test] + public async Task OnItemRemovedCalled() { var called = false; var source = new SourceCache(x => x.Age); @@ -52,12 +50,12 @@ public void OnItemRemovedCalled() var person = new Person("A", 1); source.AddOrUpdate(person); source.Remove(person); - Assert.True(called); + await Assert.That(called).IsTrue(); } - [Fact] + [Test] [Description("Test for https://github.com/reactivemarbles/DynamicData/issues/613")] - public void OnItemRemovedNotCalledForUpdate() + public async Task OnItemRemovedNotCalledForUpdate() { var called = false; var source = new SourceCache(x => x.Age); @@ -67,11 +65,11 @@ public void OnItemRemovedNotCalledForUpdate() source.AddOrUpdate(new Person("A", 1)); source.AddOrUpdate(new Person("A", 2)); - called.Should().Be(false); + await Assert.That(called).IsFalse(); } - [Fact] - public void OnItemUpdatedCalled() + [Test] + public async Task OnItemUpdatedCalled() { var called = false; var source = new SourceCache(x => x.Age); @@ -82,12 +80,12 @@ public void OnItemUpdatedCalled() source.AddOrUpdate(person); var update = new Person("B", 1); source.AddOrUpdate(update); - Assert.True(called); + await Assert.That(called).IsTrue(); } - [Fact] + [Test] [Description("Test for https://github.com/reactivemarbles/DynamicData/issues/268")] - public void ListAndCacheShouldHaveEquivalentBehaviour() + public async Task ListAndCacheShouldHaveEquivalentBehaviour() { var source = new ObservableCollection { @@ -109,12 +107,12 @@ public void ListAndCacheShouldHaveEquivalentBehaviour() .Bind(out var cacheOutput) .Subscribe(); - Assert.Equal(listOutput, cacheOutput, new ProxyEqualityComparer()); + await Assert.That(cacheOutput).IsEquivalentTo(listOutput, ProxyEqualityComparer.Instance); list.Dispose(); cache.Dispose(); - Assert.Equal(listOutput, cacheOutput, new ProxyEqualityComparer()); + await Assert.That(cacheOutput).IsEquivalentTo(listOutput, ProxyEqualityComparer.Instance); } public class Item @@ -128,11 +126,12 @@ public class Proxy public bool? Active { get; set; } - } public class ProxyEqualityComparer : IEqualityComparer { + public static readonly ProxyEqualityComparer Instance = new(); + public bool Equals(Proxy x, Proxy y) => x?.Item.Id == y?.Item.Id && x.Active == y.Active; public int GetHashCode(Proxy obj) => HashCode.Combine(obj?.Active, obj.Item); diff --git a/src/DynamicData.Tests/Cache/OrFixture.cs b/src/DynamicData.Tests/Cache/OrFixture.cs index 720d3f0b4..e3449f9e8 100644 --- a/src/DynamicData.Tests/Cache/OrFixture.cs +++ b/src/DynamicData.Tests/Cache/OrFixture.cs @@ -1,20 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; +[InheritsTests] public class OrFixture : OrFixtureBase { protected override IObservable> CreateObservable() => _source1.Connect().Or(_source2.Connect()); } +[InheritsTests] public sealed class OrCollectionFixture : OrFixtureBase { protected override IObservable> CreateObservable() @@ -47,31 +41,31 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemovingFromOneDoesNotFromResult() + [Test] + public async Task RemovingFromOneDoesNotFromResult() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(1, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); } - [Fact] - public void UpdatingBothProducesResultsAndDoesNotDuplicateTheMessage() + [Test] + public async Task UpdatingBothProducesResultsAndDoesNotDuplicateTheMessage() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should have no updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should have no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void UpdatingOneProducesOnlyOneUpdate() + [Test] + public async Task UpdatingOneProducesOnlyOneUpdate() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); @@ -79,19 +73,19 @@ public void UpdatingOneProducesOnlyOneUpdate() var personUpdated = new Person("Adult1", 51); _source2.AddOrUpdate(personUpdated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); - _results.Data.Items[0].Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(personUpdated).Because("Should be updated person"); } - [Fact] - public void UpdatingOneSourceOnlyProducesResult() + [Test] + public async Task UpdatingOneSourceOnlyProducesResult() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/Cache/PageFixture.cs b/src/DynamicData.Tests/Cache/PageFixture.cs index 8c31979d5..761c19eac 100644 --- a/src/DynamicData.Tests/Cache/PageFixture.cs +++ b/src/DynamicData.Tests/Cache/PageFixture.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class PageFixture : IDisposable @@ -20,9 +15,9 @@ public class PageFixture : IDisposable private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _pager; + private readonly ReactiveUI.Primitives.Signals.ISignal _pager; - private readonly ISubject> _sort; + private readonly ReactiveUI.Primitives.Signals.ISignal> _sort; private readonly ISourceCache _source; @@ -30,14 +25,14 @@ public PageFixture() { _source = new SourceCache(p => p.Name); _comparer = SortExpressionComparer.Ascending(p => p.Name).ThenByAscending(p => p.Age); - _sort = new BehaviorSubject>(_comparer); - _pager = new BehaviorSubject(new PageRequest(1, 25)); + _sort = new ReactiveUI.Primitives.Signals.StateSignal>(_comparer); + _pager = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 25)); _aggregators = _source.Connect().Sort(_sort, resetThreshold: 200).Page(_pager).AsAggregator(); } - [Fact] - public void ChangePage() + [Test] + public async Task ChangePage() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -46,64 +41,66 @@ public void ChangePage() var expectedResult = people.OrderBy(p => p, _comparer).Skip(25).Take(25).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _aggregators.Messages[1].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void ChangePageSize() + [Test] + public async Task ChangePageSize() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); _pager.OnNext(new PageRequest(1, 50)); - _aggregators.Messages[1].Response.Page.Should().Be(1, "Should be page 1"); + await Assert.That(_aggregators.Messages[1].Response.Page).IsEqualTo(1).Because("Should be page 1"); var expectedResult = people.OrderBy(p => p, _comparer).Take(50).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _aggregators.Messages[1].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } public void Dispose() { _source.Dispose(); _aggregators.Dispose(); + _pager.Dispose(); + _sort.Dispose(); } - [Fact] - public void PageGreaterThanNumberOfPagesAvailable() + [Test] + public async Task PageGreaterThanNumberOfPagesAvailable() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); _pager.OnNext(new PageRequest(10, 25)); - _aggregators.Messages[1].Response.Page.Should().Be(4, "Page should move to the last page"); + await Assert.That(_aggregators.Messages[1].Response.Page).IsEqualTo(4).Because("Page should move to the last page"); var expectedResult = people.OrderBy(p => p, _comparer).Skip(75).Take(25).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _aggregators.Messages[1].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void PageInitialBatch() + [Test] + public async Task PageInitialBatch() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); - _aggregators.Data.Count.Should().Be(25, "Should be 25 people in the cache"); - _aggregators.Messages[0].Response.PageSize.Should().Be(25, "Page size should be 25"); - _aggregators.Messages[0].Response.Page.Should().Be(1, "Should be page 1"); - _aggregators.Messages[0].Response.Pages.Should().Be(4, "Should be page 4 pages"); + await Assert.That(_aggregators.Data.Count).IsEqualTo(25).Because("Should be 25 people in the cache"); + await Assert.That(_aggregators.Messages[0].Response.PageSize).IsEqualTo(25).Because("Page size should be 25"); + await Assert.That(_aggregators.Messages[0].Response.Page).IsEqualTo(1).Because("Should be page 1"); + await Assert.That(_aggregators.Messages[0].Response.Pages).IsEqualTo(4).Because("Should be page 4 pages"); var expectedResult = people.OrderBy(p => p, _comparer).Take(25).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _aggregators.Messages[0].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void ReorderBelowThreshold() + [Test] + public async Task ReorderBelowThreshold() { var people = _generator.Take(50).ToArray(); _source.AddOrUpdate(people); @@ -113,12 +110,12 @@ public void ReorderBelowThreshold() var expectedResult = people.OrderBy(p => p, changed).Take(25).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _aggregators.Messages.Last().SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void ThrowsForNegativePage() => Assert.Throws(() => _pager.OnNext(new PageRequest(-1, 1))); + [Test] + public async Task ThrowsForNegativePage() => await Assert.That(() => _pager.OnNext(new PageRequest(-1, 1))).Throws(); - [Fact] - public void ThrowsForNegativeSizeParameters() => Assert.Throws(() => _pager.OnNext(new PageRequest(1, -1))); + [Test] + public async Task ThrowsForNegativeSizeParameters() => await Assert.That(() => _pager.OnNext(new PageRequest(1, -1))).Throws(); } diff --git a/src/DynamicData.Tests/Cache/QueryWhenChangedFixture.cs b/src/DynamicData.Tests/Cache/QueryWhenChangedFixture.cs index 67f626b86..6ea3a7ffc 100644 --- a/src/DynamicData.Tests/Cache/QueryWhenChangedFixture.cs +++ b/src/DynamicData.Tests/Cache/QueryWhenChangedFixture.cs @@ -1,11 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class QueryWhenChangedFixture : IDisposable @@ -20,53 +14,53 @@ public QueryWhenChangedFixture() _results = new ChangeSetAggregator(_source.Connect(p => p.Age > 20)); } - [Fact] - public void ChangeInvokedOnNext() + [Test] + public async Task ChangeInvokedOnNext() { var invoked = false; var subscription = _source.Connect().QueryWhenChanged().Subscribe(x => invoked = true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); _source.AddOrUpdate(new Person("A", 1)); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnNext_WithSelector() + [Test] + public async Task ChangeInvokedOnNext_WithSelector() { var invoked = false; var subscription = _source.Connect().QueryWhenChanged(query => query.Count).Subscribe(x => invoked = true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); _source.AddOrUpdate(new Person("A", 1)); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnSubscriptionIfItHasData() + [Test] + public async Task ChangeInvokedOnSubscriptionIfItHasData() { var invoked = false; _source.AddOrUpdate(new Person("A", 1)); var subscription = _source.Connect().QueryWhenChanged().Subscribe(x => invoked = true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnSubscriptionIfItHasData_WithSelector() + [Test] + public async Task ChangeInvokedOnSubscriptionIfItHasData_WithSelector() { var invoked = false; _source.AddOrUpdate(new Person("A", 1)); var subscription = _source.Connect().QueryWhenChanged(query => query.Count).Subscribe(x => invoked = true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } diff --git a/src/DynamicData.Tests/Cache/RefCountFixture.cs b/src/DynamicData.Tests/Cache/RefCountFixture.cs index 14be2f16b..2ff69f03c 100644 --- a/src/DynamicData.Tests/Cache/RefCountFixture.cs +++ b/src/DynamicData.Tests/Cache/RefCountFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Threading.Tasks; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class RefCountFixture : IDisposable @@ -17,8 +8,8 @@ public class RefCountFixture : IDisposable public RefCountFixture() => _source = new SourceCache(p => p.Key); - [Fact] - public void CanResubscribe() + [Test] + public async Task CanResubscribe() { var created = 0; var disposals = 0; @@ -35,12 +26,12 @@ public void CanResubscribe() subscriber = longChain.Subscribe(); subscriber.Dispose(); - created.Should().Be(2); - disposals.Should().Be(2); + await Assert.That(created).IsEqualTo(2); + await Assert.That(disposals).IsEqualTo(2); } - [Fact] - public void ChainIsInvokedOnceForMultipleSubscribers() + [Test] + public async Task ChainIsInvokedOnceForMultipleSubscribers() { var created = 0; var disposals = 0; @@ -57,8 +48,8 @@ public void ChainIsInvokedOnceForMultipleSubscribers() subscriber2.Dispose(); subscriber3.Dispose(); - created.Should().Be(1); - disposals.Should().Be(1); + await Assert.That(created).IsEqualTo(1); + await Assert.That(disposals).IsEqualTo(1); } public void Dispose() => _source.Dispose(); @@ -66,7 +57,7 @@ public void ChainIsInvokedOnceForMultipleSubscribers() // This test is probabilistic, it could be cool to be able to prove RefCount's thread-safety // more accurately but I don't think that there is an easy way to do this. // At least this test can catch some bugs in the old implementation. - // [Fact] + // [Test] private async Task IsHopefullyThreadSafe() { var refCount = _source.Connect().RefCount(); diff --git a/src/DynamicData.Tests/Cache/RemoveKeyFixture.cs b/src/DynamicData.Tests/Cache/RemoveKeyFixture.cs index 04d27f619..c0018f6f2 100644 --- a/src/DynamicData.Tests/Cache/RemoveKeyFixture.cs +++ b/src/DynamicData.Tests/Cache/RemoveKeyFixture.cs @@ -4,14 +4,15 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; #endregion @@ -21,7 +22,6 @@ public class RemoveKeyFixture : IDisposable { private readonly RandomPersonGenerator _generator = new(); - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Handled with CompositeDisposable")] private readonly ISourceCache _source; private readonly CompositeDisposable _cleanup = new(); @@ -29,13 +29,16 @@ public class RemoveKeyFixture : IDisposable public RemoveKeyFixture() { _source = new SourceCache(p => p.Key); - _cleanup.Add(_source); } - public void Dispose() => _cleanup.Dispose(); + public void Dispose() + { + _cleanup.Dispose(); + _source.Dispose(); + } - [Fact] - public void CacheRemoveKey_Add_KeyIsRemoved() + [Test] + public async Task CacheRemoveKey_Add_KeyIsRemoved() { ReadOnlyObservableCollection collection; _cleanup.Add( @@ -47,11 +50,11 @@ public void CacheRemoveKey_Add_KeyIsRemoved() var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); - Assert.Equivalent(people, collection); + await Assert.That(collection).IsEquivalentTo(people); } - [Fact] - public void CacheRemoveKey_Filter_ItemsFilterKeyIsRemoved() + [Test] + public async Task CacheRemoveKey_Filter_ItemsFilterKeyIsRemoved() { var people = _generator.Take(100).ToArray(); var average = people.Average(x => x.Age); @@ -66,11 +69,11 @@ public void CacheRemoveKey_Filter_ItemsFilterKeyIsRemoved() ); _source.AddOrUpdate(people); - Assert.Equivalent(people.Where(x => x.Age < average), collection); + await Assert.That(collection).IsEquivalentTo(people.Where(x => x.Age < average)); } - [Fact] - public void CacheRemoveKey_AutoRefreshUpdateITems_CollectionUpdated() + [Test] + public async Task CacheRemoveKey_AutoRefreshUpdateITems_CollectionUpdated() { ReadOnlyObservableCollection collection; _cleanup.Add( @@ -83,13 +86,13 @@ public void CacheRemoveKey_AutoRefreshUpdateITems_CollectionUpdated() var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); - Assert.Equivalent(people, collection); + await Assert.That(collection).IsEquivalentTo(people); foreach (var person in people) { person.Age = person.Age + 1; } - Assert.Equivalent(people, collection); + await Assert.That(collection).IsEquivalentTo(people); } } diff --git a/src/DynamicData.Tests/Cache/RightJoinFixture.cs b/src/DynamicData.Tests/Cache/RightJoinFixture.cs index 62aa30190..2f03956b2 100644 --- a/src/DynamicData.Tests/Cache/RightJoinFixture.cs +++ b/src/DynamicData.Tests/Cache/RightJoinFixture.cs @@ -1,12 +1,8 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; @@ -26,8 +22,8 @@ public RightJoinFixture() _result = _left.Connect().RightJoin(_right.Connect(), meta => meta.Name, (key, device, meta) => new DeviceWithMetadata(key, device, meta)).AsAggregator(); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { _left.Edit( innerCache => @@ -37,11 +33,11 @@ public void AddLeftOnly() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(0); + await Assert.That(_result.Data.Count).IsEqualTo(0); } - [Fact] - public void AddLeftThenRight() + [Test] + public async Task AddLeftThenRight() { _left.Edit( innerCache => @@ -54,44 +50,44 @@ public void AddLeftThenRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.Device != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddRightOnly() + [Test] + public async Task AddRightOnly() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(3); - _result.Data.Lookup(1).HasValue.Should().BeTrue(); - _result.Data.Lookup(2).HasValue.Should().BeTrue(); - _result.Data.Lookup(3).HasValue.Should().BeTrue(); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Lookup(1).HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup(2).HasValue).IsTrue(); + await Assert.That(_result.Data.Lookup(3).HasValue).IsTrue(); - _result.Data.Items.All(dwm => dwm.Device == Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device == ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void AddRightThenLeft() + [Test] + public async Task AddRightThenLeft() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _left.Edit( @@ -102,9 +98,9 @@ public void AddRightThenLeft() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.Device != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device != ReactiveUI.Primitives.Optional.None)).IsTrue(); } public void Dispose() @@ -114,8 +110,8 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RefreshRightKey() + [Test] + public async Task RefreshRightKey() { _left.Edit( innerCache => @@ -128,51 +124,47 @@ public void RefreshRightKey() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); var refreshItem = _right.Lookup(2).Value; - // Change pairing refreshItem.Name = "Device3"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain(("Device2", 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain(("Device3", 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain(("Device2", 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains(("Device3", 2)); // Remove pairing refreshItem.Name = "Device4"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain(("Device3", 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain((null, 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain(("Device3", 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains((null, 2)); // Restore pairing refreshItem.Name = "Device2"; _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain((null, 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain(("Device2", 2)); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain((null, 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains(("Device2", 2)); // No change _right.Refresh(refreshItem); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain((null, 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain(("Device2", 2)); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain((null, 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains(("Device2", 2)); } - [Fact] - public void RemoveVarious() + [Test] + public async Task RemoveVarious() { _left.Edit( innerCache => @@ -185,30 +177,30 @@ public void RemoveVarious() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _right.Remove(3); - _result.Data.Count.Should().Be(2); - _result.Data.Items.Count(dwm => dwm.Device != Optional.None).Should().Be(2); + await Assert.That(_result.Data.Count).IsEqualTo(2); + await Assert.That(_result.Data.Items.Count(dwm => dwm.Device != ReactiveUI.Primitives.Optional.None)).IsEqualTo(2); _left.Remove("Device1"); - _result.Data.Lookup(1).HasValue.Should().BeTrue(); - _result.Data.Items.Count(dwm => dwm.Device == Optional.None).Should().Be(1); + await Assert.That(_result.Data.Lookup(1).HasValue).IsTrue(); + await Assert.That(_result.Data.Items.Count(dwm => dwm.Device == ReactiveUI.Primitives.Optional.None)).IsEqualTo(1); } - [Fact] - public void UpdateRight() + [Test] + public async Task UpdateRight() { _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); _left.Edit( @@ -219,13 +211,13 @@ public void UpdateRight() innerCache.AddOrUpdate(new Device("Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.Device != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void UpdateRightKey() + [Test] + public async Task UpdateRightKey() { _left.Edit( innerCache => @@ -238,46 +230,42 @@ public void UpdateRightKey() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - // Change pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device3")); - - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain(("Device2", 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain(("Device3", 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device3")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain(("Device2", 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains(("Device3", 2)); // Remove pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device4")); - - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain(("Device3", 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain((null, 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device4")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain(("Device3", 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains((null, 2)); // Restore pairing - _right.AddOrUpdate(new DeviceMetaData(2,"Device2")); - - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain((null, 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain(("Device2", 2)); + _right.AddOrUpdate(new DeviceMetaData(2, "Device2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain((null, 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains(("Device2", 2)); // No change - _right.AddOrUpdate(new DeviceMetaData(2,"Device2")); + _right.AddOrUpdate(new DeviceMetaData(2, "Device2")); - _result.Data.Count.Should().Be(3); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().NotContain((null, 2)); - _result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key)).Should().Contain(("Device2", 2)); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).DoesNotContain((null, 2)); + await Assert.That(_result.Data.Items.Select(pair => (pair.Device.ValueOrDefault()?.Name, pair.MetaData.Key))).Contains(("Device2", 2)); } - [Fact] - public void MultipleRight() + [Test] + public async Task MultipleRight() { _left.Edit( innerCache => @@ -290,18 +278,18 @@ public void MultipleRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device3")); // deliberate! - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device3")); // deliberate! + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); }); - _result.Data.Count.Should().Be(3); + await Assert.That(_result.Data.Count).IsEqualTo(3); - _result.Data.Items.All(dwm => dwm.Device != Optional.None).Should().BeTrue(); + await Assert.That(_result.Data.Items.All(dwm => dwm.Device != ReactiveUI.Primitives.Optional.None)).IsTrue(); } - [Fact] - public void MoreRight() + [Test] + public async Task MoreRight() { _left.Edit( innerCache => @@ -314,40 +302,40 @@ public void MoreRight() _right.Edit( innerCache => { - innerCache.AddOrUpdate(new DeviceMetaData(1,"Device1")); - innerCache.AddOrUpdate(new DeviceMetaData(2,"Device2")); - innerCache.AddOrUpdate(new DeviceMetaData(3,"Device3")); - innerCache.AddOrUpdate(new DeviceMetaData(4,"Device4")); + innerCache.AddOrUpdate(new DeviceMetaData(1, "Device1")); + innerCache.AddOrUpdate(new DeviceMetaData(2, "Device2")); + innerCache.AddOrUpdate(new DeviceMetaData(3, "Device3")); + innerCache.AddOrUpdate(new DeviceMetaData(4, "Device4")); }); - _result.Data.Count.Should().Be(4); + await Assert.That(_result.Data.Count).IsEqualTo(4); - _result.Data.Lookup(4).HasValue.Should().BeTrue(); - _result.Data.Items.Count(dwm => dwm.Device == Optional.None).Should().Be(1); + await Assert.That(_result.Data.Lookup(4).HasValue).IsTrue(); + await Assert.That(_result.Data.Items.Count(dwm => dwm.Device == ReactiveUI.Primitives.Optional.None)).IsEqualTo(1); } - [Fact] - public void InitializationWaitsForBothSources() + [Test] + public async Task InitializationWaitsForBothSources() { var left = new[] { 1, 2, 3 }; var right = new[] { 4, 6, 2 }; ObservableCacheEx .RightJoin( - left: left.AsObservableChangeSet(static left => 2 * left), - right: right.AsObservableChangeSet(static right => right), - rightKeySelector: static right => right, - resultSelector: static (left, right) => (left: left.HasValue ? left.Value : default(int?), right)) + left: left.AsObservableChangeSet(static left => 2 * left), + right: right.AsObservableChangeSet(static right => right), + rightKeySelector: static right => right, + resultSelector: static (left, right) => (left: left.HasValue ? left.Value : default(int?), right)) .ValidateSynchronization() .ValidateChangeSets(static pair => pair.right) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); - results.RecordedChangeSets.Count.Should().Be(1, "Initialization should only emit one changeset."); - results.RecordedChangeSets[0].Should().OnlyContain(change => change.Reason == ChangeReason.Add, "Initialization should only emit Add changes."); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("Initialization should only emit one changeset."); + await Assert.That(results.RecordedChangeSets[0]).ContainsOnly(change => change.Reason == ChangeReason.Add).Because("Initialization should only emit Add changes."); - results.RecordedItemsByKey.Values.Should().OnlyContain(pair => (2 * pair.left) == pair.right, "Source items should have been joined correctly"); + await Assert.That(results.RecordedItemsByKey.Values).ContainsOnly(pair => (2 * pair.left) == pair.right).Because("Source items should have been joined correctly"); } public class Device(string name) : IEquatable @@ -418,15 +406,15 @@ public override bool Equals(object? obj) if (obj is null) return false; if (ReferenceEquals(this, obj)) return true; if (obj.GetType() != this.GetType()) return false; - return Equals((DeviceMetaData) obj); + return Equals((DeviceMetaData)obj); } public override int GetHashCode() => HashCode.Combine(IsAutoConnect, Key, Name); } - public class DeviceWithMetadata(int key, Optional device, DeviceMetaData metaData) : IEquatable + public class DeviceWithMetadata(int key, ReactiveUI.Primitives.Optional device, DeviceMetaData metaData) : IEquatable { - public Optional Device { get; } = device; + public ReactiveUI.Primitives.Optional Device { get; } = device; public int Key { get; } = key; diff --git a/src/DynamicData.Tests/Cache/RightJoinManyFixture.cs b/src/DynamicData.Tests/Cache/RightJoinManyFixture.cs index 24f013c3a..85f5fd09f 100644 --- a/src/DynamicData.Tests/Cache/RightJoinManyFixture.cs +++ b/src/DynamicData.Tests/Cache/RightJoinManyFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class RightJoinManyFixture : IDisposable @@ -23,8 +20,8 @@ public RightJoinManyFixture() _result = _people.Connect().RightJoinMany(_people.Connect(), pac => pac.ParentName, (personid, person, grouping) => new ParentAndChildren(personid, person, grouping.Items.Select(p => p).ToArray())).AsAggregator(); } - [Fact] - public void AddChild() + [Test] + public async Task AddChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -40,22 +37,22 @@ public void AddChild() var updatedPeople = people.Union(new[] { person11 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void AddLeftOnly() + [Test] + public async Task AddLeftOnly() { var people = Enumerable.Range(1, 10).Select(i => new Person("Person" + i, i)).ToArray(); _people.AddOrUpdate(people); - _result.Data.Count.Should().Be(1); - _result.Data.Items[0].Parent.Should().BeNull(); + await Assert.That(_result.Data.Count).IsEqualTo(1); + await Assert.That(_result.Data.Items[0].Parent).IsNull(); } - [Fact] - public void AddPeopleWithParents() + [Test] + public async Task AddPeopleWithParents() { var people = Enumerable.Range(1, 10).Select( i => @@ -66,7 +63,7 @@ public void AddPeopleWithParents() _people.AddOrUpdate(people); - AssertDataIsCorrectlyFormed(people); + await AssertDataIsCorrectlyFormed(people); } public void Dispose() @@ -75,57 +72,53 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void RefreshRightKey() + [Test] + public async Task RefreshRightKey() { _people.Edit( innerCache => { - innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" } ); + innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty }); + innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); + innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" }); }); var refreshPerson = _people.Lookup("Person #2").Value; - // Change pairing refreshPerson.ParentName = "Person #3"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain(("Person #1", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain(("Person #3", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains(("Person #3", "Person #2")); // Remove pairing refreshPerson.ParentName = "Person #4"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain(("Person #3", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain((null, "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain(("Person #3", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains((null, "Person #2")); // Restore pairing refreshPerson.ParentName = "Person #1"; _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain((null, "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain((null, "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains(("Person #1", "Person #2")); // No change _people.Refresh(refreshPerson); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain((null, "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain((null, "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains(("Person #1", "Person #2")); } - [Fact] - public void RemoveChild() + [Test] + public async Task RemoveChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -141,11 +134,11 @@ public void RemoveChild() var updatedPeople = people.Where(p => p.Name != last.Name).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople, last.Name); + await AssertDataIsCorrectlyFormed(updatedPeople, last.Name); } - [Fact] - public void UpdateChild() + [Test] + public async Task UpdateChild() { var people = Enumerable.Range(1, 10).Select( i => @@ -162,11 +155,11 @@ public void UpdateChild() var updatedPeople = people.Where(p => p.Name != "Person6").Union(new[] { person6 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateParent() + [Test] + public async Task UpdateParent() { var people = Enumerable.Range(1, 10).Select( i => @@ -183,72 +176,67 @@ public void UpdateParent() var updatedPeople = people.Take(9).Union(new[] { person10 }).ToArray(); - AssertDataIsCorrectlyFormed(updatedPeople); + await AssertDataIsCorrectlyFormed(updatedPeople); } - [Fact] - public void UpdateRightKey() + [Test] + public async Task UpdateRightKey() { _people.Edit( innerCache => { - innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" } ); - innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" } ); + innerCache.AddOrUpdate(new Person() { Name = "Person #1", ParentName = string.Empty }); + innerCache.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); + innerCache.AddOrUpdate(new Person() { Name = "Person #3", ParentName = "Person #2" }); }); - // Change pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #3" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain(("Person #1", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain(("Person #3", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains(("Person #3", "Person #2")); // Remove pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #4" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain(("Person #3", "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain((null, "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain(("Person #3", "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains((null, "Person #2")); // Restore pairing _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain((null, "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); - + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain((null, "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains(("Person #1", "Person #2")); // No change _people.AddOrUpdate(new Person() { Name = "Person #2", ParentName = "Person #1" }); - _result.Data.Count.Should().Be(3); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().NotContain((null, "Person #2")); - _result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name))).Should().Contain(("Person #1", "Person #2")); + await Assert.That(_result.Data.Count).IsEqualTo(3); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).DoesNotContain((null, "Person #2")); + await Assert.That(_result.Data.Items.SelectMany(family => family.Children.Select(child => (family.Parent?.Name, child.Name)))).Contains(("Person #1", "Person #2")); } - private void AssertDataIsCorrectlyFormed(Person[] allPeople, params string[] missingParents) + private async Task AssertDataIsCorrectlyFormed(Person[] allPeople, params string[] missingParents) { var grouped = allPeople.GroupBy(p => p.ParentName).Where(p => p.Any() && !missingParents.Contains(p.Key)).AsArray(); - _result.Data.Count.Should().Be(grouped.Length); + await Assert.That(_result.Data.Count).IsEqualTo(grouped.Length); - grouped.ForEach( - grouping => + foreach (var grouping in grouped) + { + if (missingParents.Length > 0 && missingParents.Contains(grouping.Key)) { - if (missingParents.Length > 0 && missingParents.Contains(grouping.Key)) - { - return; - } + continue; + } - var result = _result.Data.Lookup(grouping.Key).ValueOrThrow(() => new Exception("Missing result for " + grouping.Key)); + var result = _result.Data.Lookup(grouping.Key).ValueOrThrow(() => new Exception("Missing result for " + grouping.Key)); - var children = result.Children; - children.Should().BeEquivalentTo(grouping); - }); + var children = result.Children; + await Assert.That(children).IsEquivalentTo(grouping); + } } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] diff --git a/src/DynamicData.Tests/Cache/SizeLimitFixture.cs b/src/DynamicData.Tests/Cache/SizeLimitFixture.cs index 378b7fa6d..c173fab02 100644 --- a/src/DynamicData.Tests/Cache/SizeLimitFixture.cs +++ b/src/DynamicData.Tests/Cache/SizeLimitFixture.cs @@ -1,15 +1,5 @@ -using System; -using System.Linq; -using System.Reactive.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; public class SizeLimitFixture : IDisposable @@ -32,45 +22,45 @@ public SizeLimitFixture() _results = _source.Connect().AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = _generator.Take(1).First(); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddLessThanLimit() + [Test] + public async Task AddLessThanLimit() { var person = _generator.Take(1).First(); _source.AddOrUpdate(person); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(150).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddMoreThanLimit() + [Test] + public async Task AddMoreThanLimit() { var people = _generator.Take(100).OrderBy(p => p.Name).ToArray(); _source.AddOrUpdate(people); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(50).Ticks); _source.Dispose(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should be 100 adds in the first update"); - _results.Messages[1].Removes.Should().Be(90, "Should be 90 removes in the second update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should be 100 adds in the first update"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(90).Because("Should be 90 removes in the second update"); } - [Fact] - public void AddMoreThanLimitInBatched() + [Test] + public async Task AddMoreThanLimitInBatched() { // _generator.Take(N) draws random Person rows from a finite name pool; a second // Take(10) call can produce keys that collide with the first batch, turning an @@ -82,10 +72,10 @@ public void AddMoreThanLimitInBatched() _scheduler.Start(); - _results.Messages.Count.Should().Be(3, "Should be 3 updates"); - _results.Messages[0].Adds.Should().Be(10, "Should be 10 adds in the first update"); - _results.Messages[1].Adds.Should().Be(10, "Should be 10 adds in the second update"); - _results.Messages[2].Removes.Should().Be(10, "Should be 10 removes in the third update"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(10).Because("Should be 10 adds in the first update"); + await Assert.That(_results.Messages[1].Adds).IsEqualTo(10).Because("Should be 10 adds in the second update"); + await Assert.That(_results.Messages[2].Removes).IsEqualTo(10).Because("Should be 10 removes in the third update"); } public void Dispose() @@ -95,8 +85,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void InvokeLimitSizeToWhenOverLimit() + [Test] + public async Task InvokeLimitSizeToWhenOverLimit() { var removesTriggered = false; var subscriber = _source.LimitSizeTo(10, _scheduler).Subscribe(removes => { removesTriggered = true; }); @@ -109,36 +99,70 @@ public void InvokeLimitSizeToWhenOverLimit() _source.AddOrUpdate(people.Take(10).ToArray()); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(150).Ticks); - removesTriggered.Should().BeFalse(); + await Assert.That(removesTriggered).IsFalse(); _source.AddOrUpdate(people.Skip(10).Take(10).ToArray()); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(150).Ticks); - removesTriggered.Should().BeTrue(); + await Assert.That(removesTriggered).IsTrue(); - _results.Messages.Count.Should().Be(3, "Should be 3 updates"); - _results.Messages[0].Adds.Should().Be(10, "Should be 10 adds in the first update"); - _results.Messages[1].Adds.Should().Be(10, "Should be 10 adds in the second update"); - _results.Messages[2].Removes.Should().Be(10, "Should be 10 removes in the third update"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(10).Because("Should be 10 adds in the first update"); + await Assert.That(_results.Messages[1].Adds).IsEqualTo(10).Because("Should be 10 adds in the second update"); + await Assert.That(_results.Messages[2].Removes).IsEqualTo(10).Because("Should be 10 removes in the third update"); subscriber.Dispose(); } - [Fact(Skip = "Need to re-examine and fix failure")] - public void OnCompleteIsInvokedWhenSourceIsDisposed() + [Test] + public async Task OnCompleteIsInvokedWhenSourceIsDisposed() { - var completed = false; + var completions = 0; + using var subscriber = _source.LimitSizeTo(10, _scheduler) + .Subscribe(_ => { }, () => completions++); + + _source.Dispose(); + await Assert.That(completions).IsEqualTo(0); + + _scheduler.Start(); + await Assert.That(completions).IsEqualTo(1); + } - var subscriber = _source.LimitSizeTo(10).Finally(() => completed = true).Subscribe(updates => { Console.WriteLine(); }); + [Test] + public async Task DisposingSubscriptionDoesNotCompleteObserver() + { + var completions = 0; + var subscriber = _source.LimitSizeTo(10, _scheduler) + .Subscribe(_ => { }, () => completions++); + subscriber.Dispose(); _source.Dispose(); + _scheduler.Start(); - completed.Should().BeTrue(); + await Assert.That(completions).IsEqualTo(0); } - [Fact] - public void ThrowsIfSizeLimitIsZero() => + [Test] + public async Task SourceErrorIsForwardedOnTheSchedulerWithoutCompletion() + { + using var source = new TestSourceCache(value => value); + var scheduler = new TestScheduler(); + var expected = new InvalidOperationException("Source failed"); + Exception? observed = null; + var completions = 0; + using var subscription = source.LimitSizeTo(1, scheduler) + .Subscribe(_ => { }, error => observed = error, () => completions++); + + source.SetError(expected); + await Assert.That(observed).IsNull(); + scheduler.Start(); + + await Assert.That(observed).IsSameReferenceAs(expected); + await Assert.That(completions).IsEqualTo(0); + } + [Test] + public async Task ThrowsIfSizeLimitIsZero() => // Initialise(); - Assert.Throws(() => new SourceCache(p => p.Key).LimitSizeTo(0)); + await Assert.That(() => new SourceCache(p => p.Key).LimitSizeTo(0)).Throws(); } diff --git a/src/DynamicData.Tests/Cache/SortAndBindFixture.cs b/src/DynamicData.Tests/Cache/SortAndBindFixture.cs index f4a68b701..1b1323c5a 100644 --- a/src/DynamicData.Tests/Cache/SortAndBindFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndBindFixture.cs @@ -1,19 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Disposables; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; // Bind to a list +[InheritsTests] public sealed class SortByAndBindToList : SortAndBindFixture { @@ -26,14 +21,14 @@ protected override (ChangeSetAggregator Aggregrator, IList Aggregrator, IList List) SetUpTests() { - var list = new List(100); + var list = new List(100); var aggregator = _source.Connect().SortAndBind(list, _comparer).AsAggregator(); return (aggregator, list); @@ -41,6 +36,7 @@ protected override (ChangeSetAggregator Aggregrator, IList Aggregrator, IList Aggregrator, IList Aggregrator, IList Aggregrator, IList List) SetUpTests() { @@ -91,17 +88,19 @@ protected override (ChangeSetAggregator Aggregrator, IList Aggregrator, IList List) SetUpTests() { - var options = new SortAndBindOptions { UseBinarySearch = true, UseReplaceForUpdates = false}; + var options = new SortAndBindOptions { UseBinarySearch = true, UseReplaceForUpdates = false }; var aggregator = _source.Connect().SortAndBind(out var list, _comparer, options).AsAggregator(); return (aggregator, list); } } +[InheritsTests] public sealed class SortAndBindWithBinarySearch2 : SortAndBindFixture { protected override (ChangeSetAggregator Aggregrator, IList List) SetUpTests() @@ -113,19 +112,19 @@ protected override (ChangeSetAggregator Aggregrator, IList _target = new(); - private readonly SourceCache _strings = new(i=> i); + private readonly SourceCache _strings = new(i => i); - [Theory] - [InlineData(false)] - [InlineData(true)] - public void UpdateAnyWhereShouldNotBreak(bool useReplaceForUpdates) + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task UpdateAnyWhereShouldNotBreak(bool useReplaceForUpdates) { var options = new SortAndBindOptions { UseBinarySearch = true, UseReplaceForUpdates = useReplaceForUpdates }; - using var subscription = _strings.Connect().SortAndBind(_target, SortExpressionComparer.Ascending(i=>i), options).Subscribe(); + using var subscription = _strings.Connect().SortAndBind(_target, SortExpressionComparer.Ascending(i => i), options).Subscribe(); var items = Enumerable.Range(1, 10).ToList(); @@ -134,15 +133,14 @@ public void UpdateAnyWhereShouldNotBreak(bool useReplaceForUpdates) _strings.AddOrUpdate(5); _strings.AddOrUpdate(10); - _target.SequenceEqual(items).Should().BeTrue(); + await Assert.That(_target.SequenceEqual(items)).IsTrue(); } public void Dispose() => _strings.Dispose(); } - - // Bind to a readonly observable collection - using default comparer +[InheritsTests] public sealed class SortAndBindToReadOnlyObservableCollectionDefaultComparer : SortAndBindFixture { protected override (ChangeSetAggregator Aggregrator, IList List) SetUpTests() @@ -153,7 +151,7 @@ protected override (ChangeSetAggregator Aggregrator, IList _comparer = SortExpressionComparer.Ascending(p => p.Age).ThenByAscending(p => p.Name); @@ -161,43 +159,41 @@ public sealed class SortAndBindWithResetOptions: IDisposable private readonly List _collectionChangedEventArgs = new(); - [Fact] + [Test] [Description("Check reset is fired when below threshold only. Historically first time load always fired reset for first time load.")] - public void FiresResetWhenThresholdIsMet() + public async Task FiresResetWhenThresholdIsMet() { var options = new SortAndBindOptions { ResetThreshold = 10 }; - + using var sorted = _source.Connect().SortAndBind(out var list, _comparer, options).Subscribe(); using var collectionChangedEvents = list.ObserveCollectionChanges().Select(e => e.EventArgs).Subscribe(_collectionChangedEventArgs.Add); // fire 5 changes, should always reset because it's below the threshold _source.AddOrUpdate(Enumerable.Range(0, 5).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(5); - _collectionChangedEventArgs.All(a=>a.Action == NotifyCollectionChangedAction.Add).Should().BeTrue(); + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(5); + await Assert.That(_collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add)).IsTrue(); - _collectionChangedEventArgs.Clear(); // fire 15 changes, we should get a refresh event _source.AddOrUpdate(Enumerable.Range(10, 15).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(1); - _collectionChangedEventArgs[0].Action.Should().Be(NotifyCollectionChangedAction.Reset); + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(1); + await Assert.That(_collectionChangedEventArgs[0].Action).IsEqualTo(NotifyCollectionChangedAction.Reset); _collectionChangedEventArgs.Clear(); // fires further 5 changes, should result individual notifications _source.AddOrUpdate(Enumerable.Range(-10, 5).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(5); - _collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add).Should().BeTrue(); + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(5); + await Assert.That(_collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add)).IsTrue(); - list.Count.Should().Be(25); + await Assert.That(list.Count).IsEqualTo(25); } - - [Fact] + [Test] [Description("Check reset is not fired")] - public void NeverFireReset() + public async Task NeverFireReset() { var options = new SortAndBindOptions { ResetThreshold = int.MaxValue }; @@ -206,60 +202,55 @@ public void NeverFireReset() // fire 5 changes, should not reset because it's below the threshold _source.AddOrUpdate(Enumerable.Range(0, 5).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(5); - _collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add).Should().BeTrue(); - + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(5); + await Assert.That(_collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add)).IsTrue(); _collectionChangedEventArgs.Clear(); // fire 15 changes, we should get a refresh event _source.AddOrUpdate(Enumerable.Range(10, 15).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(15); - _collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add).Should().BeTrue(); - - list.Count.Should().Be(20); + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(15); + await Assert.That(_collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add)).IsTrue(); + + await Assert.That(list.Count).IsEqualTo(20); } - [Fact] + [Test] [Description("Check reset is fired on first time load. This checks historic first time load opt-in.")] - public void FireResetOnFirstTimeLoad() + public async Task FireResetOnFirstTimeLoad() { - var options = new SortAndBindOptions { ResetThreshold = 10, ResetOnFirstTimeLoad = true}; + var options = new SortAndBindOptions { ResetThreshold = 10, ResetOnFirstTimeLoad = true }; using var sorted = _source.Connect().SortAndBind(out var list, _comparer, options).Subscribe(); using var collectionChangedEvents = list.ObserveCollectionChanges().Select(e => e.EventArgs).Subscribe(_collectionChangedEventArgs.Add); // fire 5 changes, should always reset even though it's below the threshold _source.AddOrUpdate(Enumerable.Range(0, 5).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(1); - _collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Reset).Should().BeTrue(); - + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(1); + await Assert.That(_collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Reset)).IsTrue(); _collectionChangedEventArgs.Clear(); // fire 15 changes, we should get a refresh event _source.AddOrUpdate(Enumerable.Range(10, 15).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(1); - _collectionChangedEventArgs[0].Action.Should().Be(NotifyCollectionChangedAction.Reset); + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(1); + await Assert.That(_collectionChangedEventArgs[0].Action).IsEqualTo(NotifyCollectionChangedAction.Reset); _collectionChangedEventArgs.Clear(); // fires further 5 changes, should result individual notifications _source.AddOrUpdate(Enumerable.Range(-10, 5).Select(i => new Person($"P{i}", i))); - _collectionChangedEventArgs.Count.Should().Be(5); - _collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add).Should().BeTrue(); + await Assert.That(_collectionChangedEventArgs.Count).IsEqualTo(5); + await Assert.That(_collectionChangedEventArgs.All(a => a.Action == NotifyCollectionChangedAction.Add)).IsTrue(); - list.Count.Should().Be(25); + await Assert.That(list.Count).IsEqualTo(25); } - - public void Dispose() => _source.Dispose(); } - public abstract class SortAndBindFixture : IDisposable { @@ -270,7 +261,6 @@ public abstract class SortAndBindFixture : IDisposable protected readonly IComparer _comparer = Person.DefaultComparer; protected readonly ISourceCache _source = new SourceCache(p => p.Key); - public SortAndBindFixture() { // It's ok in this case to call VirtualMemberCallInConstructor @@ -287,36 +277,34 @@ public SortAndBindFixture() } - protected abstract (ChangeSetAggregator Aggregrator, IList List) SetUpTests(); - - [Fact] - public void InsertAtBeginning() + [Test] + public async Task InsertAtBeginning() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); // check initial data set is sorted - _boundList.Count.Should().Be(100); - _boundList.SequenceEqual(people.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.Count).IsEqualTo(100); + await Assert.That(_boundList.SequenceEqual(people.OrderBy(p => p, _comparer))).IsTrue(); //create age 0 to ensure it is inserted first var insert = new Person("_Aaron", 0); _source.AddOrUpdate(insert); - _boundList.Count.Should().Be(101); + await Assert.That(_boundList.Count).IsEqualTo(101); var firstItem = _boundList[0]; - insert.Should().Be(firstItem); + await Assert.That(insert).IsEqualTo(firstItem); - _boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer))).IsTrue(); } - [Fact] - public void InsertAtEnd() + [Test] + public async Task InsertAtEnd() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -325,65 +313,61 @@ public void InsertAtEnd() _source.AddOrUpdate(toInsert); - _boundList.Count.Should().Be(101); - + await Assert.That(_boundList.Count).IsEqualTo(101); + var last = _boundList[^1]; - last.Should().Be(toInsert); + await Assert.That(last).IsEqualTo(toInsert); - _boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer))).IsTrue(); } - - [Fact] - public void InsertInMiddle() + [Test] + public async Task InsertInMiddle() { - _source.AddOrUpdate(Enumerable.Range(0,100).Select(i=> new Person($"P{i}",i))); + _source.AddOrUpdate(Enumerable.Range(0, 100).Select(i => new Person($"P{i}", i))); //create age 0 to ensure it is inserted first var insert = new Person("Marvin", 50); _source.AddOrUpdate(insert); - _boundList.Count.Should().Be(101); + await Assert.That(_boundList.Count).IsEqualTo(101); var index = _boundList.IndexOf(insert); - index.Should().Be(50); + await Assert.That(index).IsEqualTo(50); - _boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer))).IsTrue(); } - - [Fact] - public void InsertSameLocation() + [Test] + public async Task InsertSameLocation() { _source.AddOrUpdate(Enumerable.Range(1, 10).Select(i => new Person($"P{i}", i * 10))); // each of these changes should result in index 1 - UpdateAndAssetPosition(new Person("P2", 15), 1); - UpdateAndAssetPosition(new Person("P2", 20), 1); - UpdateAndAssetPosition(new Person("P2", 25), 1); + await UpdateAndAssetPosition(new Person("P2", 15), 1); + await UpdateAndAssetPosition(new Person("P2", 20), 1); + await UpdateAndAssetPosition(new Person("P2", 25), 1); - void UpdateAndAssetPosition(Person person, int expectedIndex) + async Task UpdateAndAssetPosition(Person person, int expectedIndex) { _source.AddOrUpdate(person); // check the item has been replaced - _boundList.Count(p => p.Key == person.Key).Should().Be(1); + await Assert.That(_boundList.Count(p => p.Key == person.Key)).IsEqualTo(1); - _boundList[expectedIndex].Should().Be(person); + await Assert.That(_boundList[expectedIndex]).IsEqualTo(person); } - _boundList.Count.Should().Be(10); + await Assert.That(_boundList.Count).IsEqualTo(10); - - _boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer))).IsTrue(); } - - [Fact] - public void Refresh() + [Test] + public async Task Refresh() { _source.AddOrUpdate(Enumerable.Range(1, 10).Select(i => new Person($"P{i}", i * 10))); @@ -392,35 +376,32 @@ public void Refresh() var toRefresh = _boundList[1]; // there will all result in the same position - RefreshAtAndAssetPosition(toRefresh, p=>p.Age =15, 1); - RefreshAtAndAssetPosition(toRefresh, p => p.Age = 20, 1); - RefreshAtAndAssetPosition(toRefresh, p => p.Age = 25, 1); - + await RefreshAtAndAssetPosition(toRefresh, p => p.Age = 15, 1); + await RefreshAtAndAssetPosition(toRefresh, p => p.Age = 20, 1); + await RefreshAtAndAssetPosition(toRefresh, p => p.Age = 25, 1); // move after - RefreshAtAndAssetPosition(toRefresh, p => p.Age = 45, 3); + await RefreshAtAndAssetPosition(toRefresh, p => p.Age = 45, 3); - void RefreshAtAndAssetPosition(Person person, Action action,int expectedIndex) + async Task RefreshAtAndAssetPosition(Person person, Action action, int expectedIndex) { action(person); - _source.Edit(innerCache=> innerCache.Refresh(person.Key)); + _source.Edit(innerCache => innerCache.Refresh(person.Key)); // check the item has been replaced - _boundList.Count(p => p.Key == person.Key).Should().Be(1); + await Assert.That(_boundList.Count(p => p.Key == person.Key)).IsEqualTo(1); - _boundList[expectedIndex].Should().Be(person); + await Assert.That(_boundList[expectedIndex]).IsEqualTo(person); } - _boundList.Count.Should().Be(10); + await Assert.That(_boundList.Count).IsEqualTo(10); - - _boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer))).IsTrue(); } - - [Fact] - public void BatchOfVariousChanges() + [Test] + public async Task BatchOfVariousChanges() { var people = Enumerable.Range(0, 100).Select(i => new Person($"P{i}", i)).ToArray(); _source.AddOrUpdate(people); @@ -449,12 +430,11 @@ public void BatchOfVariousChanges() var expectedInOrder = expected.OrderBy(p => p, _comparer).ToList(); - expectedInOrder.SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(expectedInOrder.SequenceEqual(_boundList)).IsTrue(); } - - [Fact] - public void BatchOfVariousEndingInClear() + [Test] + public async Task BatchOfVariousEndingInClear() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -466,26 +446,23 @@ public void BatchOfVariousEndingInClear() updater.Clear(); }); - _boundList.Count.Should().Be(0); + await Assert.That(_boundList.Count).IsEqualTo(0); } - - [Fact] - public void LargeBatchChange() + [Test] + public async Task LargeBatchChange() { // this should produce what are effectively 2 resets for the bound collection _source.AddOrUpdate(Enumerable.Range(0, 100).Select(i => new Person($"P{i}", i))); _source.AddOrUpdate(Enumerable.Range(100, 100).Select(i => new Person($"P{i}", i))); - - _boundList.Count.Should().Be(200); - _boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer)).Should().BeTrue(); + await Assert.That(_boundList.Count).IsEqualTo(200); + await Assert.That(_boundList.SequenceEqual(_source.Items.OrderBy(p => p, _comparer))).IsTrue(); } - - [Fact] - public void BatchUpdateShiftingIndicies() + [Test] + public async Task BatchUpdateShiftingIndicies() { var testData = new[] { @@ -516,76 +493,70 @@ public void BatchUpdateShiftingIndicies() new Person("G", 14) }; - _boundList.SequenceEqual(expected).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(expected)).IsTrue(); } - - - [Fact] - public void RemoveFirst() + [Test] + public async Task RemoveFirst() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _boundList.Count.Should().Be(100); + await Assert.That(_boundList.Count).IsEqualTo(100); _source.Remove(people[0].Key); - _boundList.Count.Should().Be(99); + await Assert.That(_boundList.Count).IsEqualTo(99); people.RemoveAt(0); - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } - [Fact] - public void RemoveFromEnd() + [Test] + public async Task RemoveFromEnd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _boundList.Count.Should().Be(100); + await Assert.That(_boundList.Count).IsEqualTo(100); _source.Remove(people[99].Key); - _boundList.Count.Should().Be(99); - + await Assert.That(_boundList.Count).IsEqualTo(99); people.RemoveAt(99); - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } - [Fact] - public void RemoveFromMiddle() + [Test] + public async Task RemoveFromMiddle() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _boundList.Count.Should().Be(100); + await Assert.That(_boundList.Count).IsEqualTo(100); _source.Remove(people[50].Key); - _boundList.Count.Should().Be(99); - + await Assert.That(_boundList.Count).IsEqualTo(99); people.RemoveAt(IndexFromKey(people[50].Key)); int IndexFromKey(string key) => people.FindIndex(p => p.Key == key); - - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } - - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); - - _boundList.Count.Should().Be(100); - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + + await Assert.That(_boundList.Count).IsEqualTo(100); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } - [Fact] - public void UpdateFirst() + [Test] + public async Task UpdateFirst() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); @@ -594,19 +565,17 @@ public void UpdateFirst() var update = new Person(toUpdate.Name, toUpdate.Age + 5); - _source.AddOrUpdate(new Person(toUpdate.Name, toUpdate.Age + 5)); people[IndexFromKey(update.Key)] = new Person(toUpdate.Name, toUpdate.Age + 5); - - int IndexFromKey(string key) => people.FindIndex(p => p.Key == key); + int IndexFromKey(string key) => people.FindIndex(p => p.Key == key); - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } - [Fact] - public void UpdateLast() + [Test] + public async Task UpdateLast() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); @@ -619,12 +588,11 @@ public void UpdateLast() int IndexFromKey(string key) => people.FindIndex(p => p.Key == key); - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } - - [Fact] - public void UpdateMiddle() + [Test] + public async Task UpdateMiddle() { //TODO: fixed Text @@ -639,7 +607,7 @@ public void UpdateMiddle() int IndexFromKey(string key) => people.FindIndex(p => p.Key == key); - people.OrderBy(p => p, _comparer).SequenceEqual(_boundList).Should().BeTrue(); + await Assert.That(people.OrderBy(p => p, _comparer).SequenceEqual(_boundList)).IsTrue(); } @@ -649,4 +617,3 @@ public void Dispose() _results.Dispose(); } } - diff --git a/src/DynamicData.Tests/Cache/SortAndBindObservableFixture.cs b/src/DynamicData.Tests/Cache/SortAndBindObservableFixture.cs index 9698c86e3..81ce30813 100644 --- a/src/DynamicData.Tests/Cache/SortAndBindObservableFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndBindObservableFixture.cs @@ -1,16 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; - // Bind to a readonly observable collection +[InheritsTests] public sealed class SortAndBindObservableToReadOnlyObservableCollection : SortAndBindObservableFixture { protected override (ChangeSetAggregator Aggregrator, IList List) SetUpTests() @@ -22,6 +20,7 @@ protected override (ChangeSetAggregator Aggregrator, IList Aggregrator, IList List) SetUpTests() @@ -35,8 +34,7 @@ protected override (ChangeSetAggregator Aggregrator, IList Cache = new SourceCache(p => p.Name); - + protected readonly ISourceCache Cache = new SourceCache(p => p.Name); private readonly RandomPersonGenerator _generator = new(); @@ -45,14 +43,11 @@ public abstract class SortAndBindObservableFixture : IDisposable private readonly SortExpressionComparer _oldestComparer = SortExpressionComparer.Descending(p => p.Age).ThenByAscending(p => p.Name); private readonly SortExpressionComparer _defaultComparer = SortExpressionComparer.Ascending(p => p.Name).ThenByAscending(p => p.Age); - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "By Design.")] - protected readonly BehaviorSubject> ComparerObservable; - + private protected readonly ReactiveUI.Primitives.Signals.StateSignal> ComparerObservable; protected SortAndBindObservableFixture() { - ComparerObservable = new BehaviorSubject>(_defaultComparer); + ComparerObservable = new ReactiveUI.Primitives.Signals.StateSignal>(_defaultComparer); // It's ok in this case to call VirtualMemberCallInConstructor @@ -69,43 +64,41 @@ protected SortAndBindObservableFixture() protected abstract (ChangeSetAggregator Aggregrator, IList List) SetUpTests(); - - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); Cache.AddOrUpdate(people); var defaultOrder = people.OrderBy(p => p, _defaultComparer).ToList(); - _boundList.SequenceEqual(defaultOrder).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(defaultOrder)).IsTrue(); } - - [Fact] - public void ChangeSort() + [Test] + public async Task ChangeSort() { var people = _generator.Take(100).ToArray(); Cache.AddOrUpdate(people); // change to oldest first sort ComparerObservable.OnNext(_oldestComparer); - + var oldestFirst = people.OrderBy(p => p, _oldestComparer).ToList(); - _boundList.SequenceEqual(oldestFirst).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(oldestFirst)).IsTrue(); // and back again ComparerObservable.OnNext(_defaultComparer); var defaultOrder = people.OrderBy(p => p, _defaultComparer).ToList(); - _boundList.SequenceEqual(defaultOrder).Should().BeTrue(); + await Assert.That(_boundList.SequenceEqual(defaultOrder)).IsTrue(); } - public void Dispose() { Cache.Dispose(); _results.Dispose(); ComparerObservable.OnCompleted(); + ComparerObservable.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs b/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs index 3b3466c85..5d446e9d2 100644 --- a/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs @@ -1,16 +1,13 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; - +[InheritsTests] public sealed class SortAndPageAndBindWithImplicitOptionsFixtureReadOnlyCollection : SortAndPageAndBindFixtureBase { protected override (ChangeSetAggregator aggregator, IList list) SetUpTests() @@ -26,6 +23,7 @@ protected override (ChangeSetAggregator aggregator, IList aggregator, IList list) SetUpTests() @@ -40,6 +38,7 @@ protected override (ChangeSetAggregator aggregator, IList aggregator, IList list) SetUpTests() @@ -56,6 +55,7 @@ protected override (ChangeSetAggregator aggregator, IList aggregator, IList list) SetUpTests() @@ -76,7 +76,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)); + private protected readonly ReactiveUI.Primitives.Signals.ISignal PageRequests = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(0, 25)); protected readonly ChangeSetAggregator Aggregator; protected readonly IList List; @@ -94,12 +94,13 @@ protected SortAndPageAndBindFixtureBase() List = args.list; } - protected abstract (ChangeSetAggregator aggregator, IList list) SetUpTests(); + private static async Task AssertPeopleAreEquivalent(IEnumerable actual, IEnumerable expected) => + await Assert.That(actual).IsEquivalentTo(expected, Person.NameAgeGenderComparer, TUnit.Assertions.Enums.CollectionOrdering.Matching); - [Fact] - public void PageGreaterThanNumberOfPagesAvailable() + [Test] + public async Task PageGreaterThanNumberOfPagesAvailable() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -109,12 +110,11 @@ public void PageGreaterThanNumberOfPagesAvailable() var expectedResult = people.OrderBy(p => p, Comparer).Skip(75).Take(25).ToList(); - List.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(List, expectedResult); } - - [Fact] - public void OverlappingShift() + [Test] + public async Task OverlappingShift() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -123,11 +123,11 @@ public void OverlappingShift() // for first batch, it should use the results of the _PageRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Skip(20).Take(10).ToList(); - List.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(List, expectedResult); } - [Fact] - public void AddFirstInRange() + [Test] + public async Task AddFirstInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -136,29 +136,28 @@ public void AddFirstInRange() var person = new Person("_FirstPerson", 1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P025", 25)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P025", 25))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(person); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(secondChange.Current).IsEqualTo(person); // check for correctness of resulting collection people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void AddOutsideOfRange() + [Test] + public async Task AddOutsideOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -168,47 +167,46 @@ public void AddOutsideOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); - + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateMoveOutOfRange() + [Test] + public async Task UpdateMoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); + var oldPerson = people.Single(p => p.Name == "P012"); // Change an item so it moves from in range to out of range var person = new Person("P012", 50); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); - + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(ReferenceEquals(firstChange.Current, oldPerson)).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); people[11] = person; var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateStayRange() + [Test] + public async Task UpdateStayRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -217,28 +215,26 @@ public void UpdateStayRange() var person = new Person("P012", -1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Update); - firstChange.Current.Should().Be(new Person("P012", -1)); - firstChange.Previous.Value.Should().Be(new Person("P012", 12)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Update); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", -1))).IsTrue(); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Previous.Value, new Person("P012", 12))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); people[11] = person; var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - - [Fact] - public void UpdateOutOfRange() + [Test] + public async Task UpdateOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -248,16 +244,15 @@ public void UpdateOutOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -266,29 +261,29 @@ public void RemoveRange() var person = new Person("P012", 12); Source.Remove(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(person); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(firstChange.Current).IsEqualTo(person); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people.Remove(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RemoveOutOfRange() + [Test] + public async Task RemoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -298,16 +293,15 @@ public void RemoveOutOfRange() Source.Remove(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RefreshInRange() + [Test] + public async Task RefreshInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -315,17 +309,17 @@ public void RefreshInRange() var person = people.Single(p => p.Name == "P012"); Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); } - [Fact] - public void RefreshWithInlineChangeInRange() + [Test] + public async Task RefreshWithInlineChangeInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -336,21 +330,21 @@ public void RefreshWithInlineChangeInRange() person.Age = 5; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RefreshWithInlineChangeOutsideRange() + [Test] + public async Task RefreshWithInlineChangeOutsideRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -361,30 +355,29 @@ public void RefreshWithInlineChangeOutsideRange() person.Age = 50; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", 50))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); - + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - 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 19f177cd4..0ffe006c6 100644 --- a/src/DynamicData.Tests/Cache/SortAndPageFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndPageFixture.cs @@ -1,33 +1,30 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; -using System.Text; -using System.Threading.Tasks; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; +[InheritsTests] public sealed class SortAndPageWithComparerChangesFixture : SortAndPageFixtureBase { - private BehaviorSubject> _comparerSubject; + private ReactiveUI.Primitives.Signals.StateSignal> _comparerSubject; private readonly IComparer _descComparer = SortExpressionComparer.Descending(p => p.Age).ThenByAscending(p => p.Name); protected override ChangeSetAggregator> SetUpTests() { - _comparerSubject = new BehaviorSubject>(Comparer); + _comparerSubject = new ReactiveUI.Primitives.Signals.StateSignal>(Comparer); return Source.Connect() .SortAndPage(_comparerSubject, PageRequests) .AsAggregator(); } - [Fact] - public void ChangeComparer() + [Test] + public async Task ChangeComparer() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -35,41 +32,42 @@ public void ChangeComparer() // for first batch, it should use the results of the _PageRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); - // change the comparer + // change the comparer _comparerSubject.OnNext(_descComparer); - Aggregator.Messages.Cast>>().LastOrDefault().Context.Comparer.Should().Be(_descComparer); + await Assert.That(Aggregator.Messages.Cast>>().LastOrDefault().Context.Comparer).IsEqualTo(_descComparer); expectedResult = people.OrderBy(p => p, _descComparer).Take(25).ToList(); actualResult = Aggregator.Data.Items.OrderBy(p => p, _descComparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - [Fact] - public void ChangeComparerWithOnlyOnePage() + [Test] + public async Task ChangeComparerWithOnlyOnePage() { PageRequests.OnNext(new PageRequest(page: 1, size: 200)); - + var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); // for first batch, it should use the results of the _PageRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); var changesetCount = Aggregator.Messages.Count; - // change the comparer + // change the comparer _comparerSubject.OnNext(_descComparer); - Aggregator.Messages.Cast>>().LastOrDefault().Context.Comparer.Should().Be(_descComparer); + await Assert.That(Aggregator.Messages.Cast>>().LastOrDefault().Context.Comparer).IsEqualTo(_descComparer); expectedResult = people.OrderBy(p => p, _descComparer).ToList(); actualResult = Aggregator.Data.Items.OrderBy(p => p, _descComparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } } +[InheritsTests] public sealed class SortAndPageFixture : SortAndPageFixtureBase { protected override ChangeSetAggregator> SetUpTests() => @@ -83,11 +81,10 @@ 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)); + private protected readonly ReactiveUI.Primitives.Signals.ISignal PageRequests = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 25)); protected readonly ChangeSetAggregator> Aggregator; - protected SortAndPageFixtureBase() { // It's ok in this case to call VirtualMemberCallInConstructor @@ -98,12 +95,13 @@ protected SortAndPageFixtureBase() #pragma warning restore CA2214 } - protected abstract ChangeSetAggregator> SetUpTests(); + protected static async Task AssertPeopleAreEquivalent(IEnumerable actual, IEnumerable expected) => + await Assert.That(actual).IsEquivalentTo(expected, Person.NameAgeGenderComparer, TUnit.Assertions.Enums.CollectionOrdering.Matching); - [Fact] - public void InitialBatches() + [Test] + public async Task InitialBatches() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -111,26 +109,23 @@ public void InitialBatches() // for first batch, it should use the results of the _PageRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); - + await AssertPeopleAreEquivalent(actualResult, expectedResult); PageRequests.OnNext(new PageRequest(3, 25)); expectedResult = people.OrderBy(p => p, Comparer).Skip(50).Take(25).ToList(); actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - [Fact] - public void ThrowsForNegativePage() => Assert.Throws(() => PageRequests.OnNext(new PageRequest(-1, 1))); + [Test] + public async Task ThrowsForNegativePage() => await Assert.That(() => PageRequests.OnNext(new PageRequest(-1, 1))).Throws(); - [Fact] - public void ThrowsForNegativeSizeParameters() => Assert.Throws(() => PageRequests.OnNext(new PageRequest(1, -1))); + [Test] + public async Task ThrowsForNegativeSizeParameters() => await Assert.That(() => PageRequests.OnNext(new PageRequest(1, -1))).Throws(); - - - [Fact] - public void PageGreaterThanNumberOfPagesAvailable() + [Test] + public async Task PageGreaterThanNumberOfPagesAvailable() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -140,12 +135,11 @@ public void PageGreaterThanNumberOfPagesAvailable() var expectedResult = people.OrderBy(p => p, Comparer).Skip(75).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - - [Fact] - public void OverlappingShift() + [Test] + public async Task OverlappingShift() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -155,11 +149,11 @@ public void OverlappingShift() // for first batch, it should use the results of the _PageRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Skip(20).Take(10).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - [Fact] - public void AddFirstInRange() + [Test] + public async Task AddFirstInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -168,30 +162,29 @@ public void AddFirstInRange() var person = new Person("_FirstPerson", 1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P025", 25)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P025", 25))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(person); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(secondChange.Current).IsEqualTo(person); // check for correctness of resulting collection people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void AddOutsideOfRange() + [Test] + public async Task AddOutsideOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -201,38 +194,37 @@ public void AddOutsideOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); - + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateMoveOutOfRange() + [Test] + public async Task UpdateMoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); + var oldPerson = people.Single(p => p.Name == "P012"); // Change an item so it moves from in range to out of range var person = new Person("P012", 50); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); - + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(ReferenceEquals(firstChange.Current, oldPerson)).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); @@ -240,10 +232,10 @@ public void UpdateMoveOutOfRange() var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateStayRange() + [Test] + public async Task UpdateStayRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -252,15 +244,15 @@ public void UpdateStayRange() var person = new Person("P012", -1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Update); - firstChange.Current.Should().Be(new Person("P012", -1)); - firstChange.Previous.Value.Should().Be(new Person("P012", 12)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Update); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", -1))).IsTrue(); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Previous.Value, new Person("P012", 12))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); @@ -268,13 +260,11 @@ public void UpdateStayRange() var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - - [Fact] - public void UpdateOutOfRange() + [Test] + public async Task UpdateOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -284,16 +274,15 @@ public void UpdateOutOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -302,29 +291,29 @@ public void RemoveRange() var person = new Person("P012", 12); Source.Remove(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(person); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(firstChange.Current).IsEqualTo(person); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people.Remove(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RemoveOutOfRange() + [Test] + public async Task RemoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -334,16 +323,15 @@ public void RemoveOutOfRange() Source.Remove(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RefreshInRange() + [Test] + public async Task RefreshInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -351,17 +339,17 @@ public void RefreshInRange() var person = people.Single(p => p.Name == "P012"); Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); } - [Fact] - public void RefreshWithInlineChangeInRange() + [Test] + public async Task RefreshWithInlineChangeInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -372,21 +360,21 @@ public void RefreshWithInlineChangeInRange() person.Age = 5; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RefreshWithInlineChangeOutsideRange() + [Test] + public async Task RefreshWithInlineChangeOutsideRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -397,23 +385,22 @@ public void RefreshWithInlineChangeOutsideRange() person.Age = 50; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", 50))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); - + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } public void Dispose() @@ -421,5 +408,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 bb8896aac..5e7f2bd91 100644 --- a/src/DynamicData.Tests/Cache/SortAndVirtualizeAndBindFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndVirtualizeAndBindFixture.cs @@ -1,15 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; - +[InheritsTests] public sealed class SortAndVirtualizeAndBindWithImplicitOptionsFixtureReadOnlyCollection : SortAndVirtualizeAndBindFixtureBase { protected override (ChangeSetAggregator aggregator, IList list) SetUpTests() @@ -25,6 +23,7 @@ protected override (ChangeSetAggregator aggregator, IList aggregator, IList list) SetUpTests() @@ -39,6 +38,7 @@ protected override (ChangeSetAggregator aggregator, IList aggregator, IList list) SetUpTests() @@ -55,6 +55,7 @@ protected override (ChangeSetAggregator aggregator, IList aggregator, IList list) SetUpTests() @@ -75,7 +76,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)); + private protected readonly ReactiveUI.Primitives.Signals.ISignal VirtualRequests = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 25)); protected readonly ChangeSetAggregator Aggregator; protected readonly IList List; @@ -93,38 +94,32 @@ protected SortAndVirtualizeAndBindFixtureBase() List = args.list; } - protected abstract (ChangeSetAggregator aggregator, IList list) SetUpTests(); + private static async Task AssertPeopleAreEquivalent(IEnumerable actual, IEnumerable expected) => + await Assert.That(actual).IsEquivalentTo(expected, Person.NameAgeGenderComparer, TUnit.Assertions.Enums.CollectionOrdering.Matching); - [Fact] - public void InitialBatches() + [Test] + public async Task InitialBatches() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); // for first batch, it should use the results of the _virtualRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.Should().BeEquivalentTo(expectedResult); - + await AssertPeopleAreEquivalent(List, expectedResult); VirtualRequests.OnNext(new VirtualRequest(25, 50)); expectedResult = people.OrderBy(p => p, Comparer).Skip(25).Take(50).ToList(); - List.Should().BeEquivalentTo(expectedResult); - + await AssertPeopleAreEquivalent(List, expectedResult); VirtualRequests.OnNext(new VirtualRequest(40, 50)); expectedResult = people.OrderBy(p => p, Comparer).Skip(40).Take(50).ToList(); - List.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(List, expectedResult); } - - - - - - [Fact] - public void OverlappingShift() + [Test] + public async Task OverlappingShift() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -133,11 +128,11 @@ public void OverlappingShift() // for first batch, it should use the results of the _virtualRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Skip(10).Take(30).ToList(); - List.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(List, expectedResult); } - [Fact] - public void AddFirstInRange() + [Test] + public async Task AddFirstInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -146,80 +141,77 @@ public void AddFirstInRange() var person = new Person("_FirstPerson", 1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P025", 25)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P025", 25))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(person); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(secondChange.Current).IsEqualTo(person); // check for correctness of resulting collection people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void AddOutsideOfRange() + [Test] + public async Task AddOutsideOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); - // insert right at end var person = new Person("X_Last", 100); Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); - + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateMoveOutOfRange() + [Test] + public async Task UpdateMoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); + var oldPerson = people.Single(p => p.Name == "P012"); // Change an item so it moves from in range to out of range var person = new Person("P012", 50); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); - + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(ReferenceEquals(firstChange.Current, oldPerson)).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); people[11] = person; var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateStayRange() + [Test] + public async Task UpdateStayRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -228,28 +220,26 @@ public void UpdateStayRange() var person = new Person("P012", -1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Update); - firstChange.Current.Should().Be(new Person("P012", -1)); - firstChange.Previous.Value.Should().Be(new Person("P012", 12)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Update); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", -1))).IsTrue(); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Previous.Value, new Person("P012", 12))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); people[11] = person; var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - - [Fact] - public void UpdateOutOfRange() + [Test] + public async Task UpdateOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -259,15 +249,14 @@ public void UpdateOutOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -276,28 +265,28 @@ public void RemoveRange() var person = new Person("P012", 12); Source.Remove(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(person); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(firstChange.Current).IsEqualTo(person); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people.Remove(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RemoveOutOfRange() + [Test] + public async Task RemoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -307,15 +296,14 @@ public void RemoveOutOfRange() Source.Remove(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RefreshInRange() + [Test] + public async Task RefreshInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -323,17 +311,17 @@ public void RefreshInRange() var person = people.Single(p => p.Name == "P012"); Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); } - [Fact] - public void RefreshWithInlineChangeInRange() + [Test] + public async Task RefreshWithInlineChangeInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -344,20 +332,20 @@ public void RefreshWithInlineChangeInRange() person.Age = 5; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RefreshWithInlineChangeOutsideRange() + [Test] + public async Task RefreshWithInlineChangeOutsideRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -368,22 +356,21 @@ public void RefreshWithInlineChangeOutsideRange() person.Age = 50; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", 50))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); - + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); - List.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(List.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } public void Dispose() @@ -391,5 +378,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 f5d865369..6aa0f720e 100644 --- a/src/DynamicData.Tests/Cache/SortAndVirtualizeFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndVirtualizeFixture.cs @@ -1,36 +1,30 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; - - - - +[InheritsTests] public sealed class SortAndVirtualizeWithComparerChangesFixture : SortAndVirtualizeFixtureBase { - private BehaviorSubject> _comparerSubject ; + private ReactiveUI.Primitives.Signals.StateSignal> _comparerSubject; private readonly IComparer _descComparer = SortExpressionComparer.Descending(p => p.Age).ThenByAscending(p => p.Name); protected override ChangeSetAggregator> SetUpTests() { - _comparerSubject = new BehaviorSubject>(Comparer); + _comparerSubject = new ReactiveUI.Primitives.Signals.StateSignal>(Comparer); return Source.Connect() .SortAndVirtualize(_comparerSubject, VirtualRequests) .AsAggregator(); } - [Fact] - public void ChangeComparer() + [Test] + public async Task ChangeComparer() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -38,18 +32,18 @@ public void ChangeComparer() // for first batch, it should use the results of the _virtualRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); - // change the comparer + // change the comparer _comparerSubject.OnNext(_descComparer); expectedResult = people.OrderBy(p => p, _descComparer).Take(25).ToList(); - actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + actualResult = Aggregator.Data.Items.OrderBy(p => p, _descComparer); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - [Fact] - public void ChangeComparerDataSetSmallerThanVirtualSize() + [Test] + public async Task ChangeComparerDataSetSmallerThanVirtualSize() { var people = Enumerable.Range(1, 10).Select(i => new Person($"P{i:00}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -57,21 +51,22 @@ public void ChangeComparerDataSetSmallerThanVirtualSize() // for first batch, it should use the results of the _virtualRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Take(10).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); - Aggregator.Messages[0].All(c => c.Reason == ChangeReason.Add).Should().BeTrue(); + await Assert.That(Aggregator.Messages[0].All(c => c.Reason == ChangeReason.Add)).IsTrue(); - // change the comparer + // change the comparer _comparerSubject.OnNext(_descComparer); expectedResult = people.OrderBy(p => p, _descComparer).Take(10).ToList(); - actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + actualResult = Aggregator.Data.Items.OrderBy(p => p, _descComparer); + await AssertPeopleAreEquivalent(actualResult, expectedResult); - Aggregator.Messages[1].All(c => c.Reason == ChangeReason.Refresh).Should().BeTrue(); + await Assert.That(Aggregator.Messages[1].All(c => c.Reason == ChangeReason.Refresh)).IsTrue(); } } +[InheritsTests] public sealed class SortAndVirtualizeFixture : SortAndVirtualizeFixtureBase { protected override ChangeSetAggregator> SetUpTests() => @@ -85,11 +80,10 @@ 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)); + private protected readonly ReactiveUI.Primitives.Signals.ISignal VirtualRequests = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 25)); protected readonly ChangeSetAggregator> Aggregator; - protected SortAndVirtualizeFixtureBase() { // It's ok in this case to call VirtualMemberCallInConstructor @@ -100,33 +94,31 @@ protected SortAndVirtualizeFixtureBase() #pragma warning restore CA2214 } - protected abstract ChangeSetAggregator> SetUpTests(); + protected static async Task AssertPeopleAreEquivalent(IEnumerable actual, IEnumerable expected) => + await Assert.That(actual).IsEquivalentTo(expected, Person.NameAgeGenderComparer, TUnit.Assertions.Enums.CollectionOrdering.Matching); - [Fact] - public void InitialBatches() + [Test] + public async Task InitialBatches() { - var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p=>Guid.NewGuid()); + var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); // for first batch, it should use the results of the _virtualRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); - + await AssertPeopleAreEquivalent(actualResult, expectedResult); - VirtualRequests.OnNext(new VirtualRequest(25,50)); + VirtualRequests.OnNext(new VirtualRequest(25, 50)); expectedResult = people.OrderBy(p => p, Comparer).Skip(25).Take(50).ToList(); - actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - - - [Fact] - public void OverlappingShift() + [Test] + public async Task OverlappingShift() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()); Source.AddOrUpdate(people); @@ -136,11 +128,11 @@ public void OverlappingShift() // for first batch, it should use the results of the _virtualRequests subject (if a behaviour subject is used). var expectedResult = people.OrderBy(p => p, Comparer).Skip(10).Take(30).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.Should().BeEquivalentTo(expectedResult); + await AssertPeopleAreEquivalent(actualResult, expectedResult); } - [Fact] - public void AddFirstInRange() + [Test] + public async Task AddFirstInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -149,30 +141,29 @@ public void AddFirstInRange() var person = new Person("_FirstPerson", 1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P025",25)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P025", 25))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(person); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(secondChange.Current).IsEqualTo(person); // check for correctness of resulting collection people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void AddOutsideOfRange() + [Test] + public async Task AddOutsideOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -182,49 +173,48 @@ public void AddOutsideOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); - + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); people.Add(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateMoveOutOfRange() + [Test] + public async Task UpdateMoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); + var oldPerson = people.Single(p => p.Name == "P012"); // Change an item so it moves from in range to out of range var person = new Person("P012", 50); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); - + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(ReferenceEquals(firstChange.Current, oldPerson)).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); - people[11] =person; + people[11] = person; var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void UpdateStayRange() + [Test] + public async Task UpdateStayRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -233,15 +223,15 @@ public void UpdateStayRange() var person = new Person("P012", -1); Source.AddOrUpdate(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Update); - firstChange.Current.Should().Be(new Person("P012", -1)); - firstChange.Previous.Value.Should().Be(new Person("P012", 12)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Update); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", -1))).IsTrue(); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Previous.Value, new Person("P012", 12))).IsTrue(); // check for correctness of resulting collection people = people.OrderBy(p => p, Comparer).ToList(); @@ -249,13 +239,11 @@ public void UpdateStayRange() var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - - [Fact] - public void UpdateOutOfRange() + [Test] + public async Task UpdateOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -265,16 +253,15 @@ public void UpdateOutOfRange() Source.AddOrUpdate(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -283,29 +270,29 @@ public void RemoveRange() var person = new Person("P012", 12); Source.Remove(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(person); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(firstChange.Current).IsEqualTo(person); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); // check for correctness of resulting collection people.Remove(person); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RemoveOutOfRange() + [Test] + public async Task RemoveOutOfRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -315,34 +302,33 @@ public void RemoveOutOfRange() Source.Remove(person); // only the initials message should have been received - Aggregator.Messages.Count.Should().Be(1); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(1); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - - [Fact] - public void RefreshInRange() + [Test] + public async Task RefreshInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); - var person = people.Single(p=>p.Name == "P012"); + var person = people.Single(p => p.Name == "P012"); Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); } - [Fact] - public void RefreshWithInlineChangeInRange() + [Test] + public async Task RefreshWithInlineChangeInRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -353,21 +339,21 @@ public void RefreshWithInlineChangeInRange() person.Age = 5; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Refresh); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Refresh); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } - [Fact] - public void RefreshWithInlineChangeOutsideRange() + [Test] + public async Task RefreshWithInlineChangeOutsideRange() { var people = Enumerable.Range(1, 100).Select(i => new Person($"P{i:000}", i)).OrderBy(p => Guid.NewGuid()).ToList(); Source.AddOrUpdate(people); @@ -378,23 +364,22 @@ public void RefreshWithInlineChangeOutsideRange() person.Age = 50; Source.Refresh(person); - Aggregator.Messages.Count.Should().Be(2); + await Assert.That(Aggregator.Messages.Count).IsEqualTo(2); var changes = Aggregator.Messages[1]; - changes.Count.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(2); var firstChange = changes.First(); - firstChange.Reason.Should().Be(ChangeReason.Remove); - firstChange.Current.Should().Be(new Person("P012", 50)); + await Assert.That(firstChange.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(Person.NameAgeGenderComparer.Equals(firstChange.Current, new Person("P012", 50))).IsTrue(); var secondChange = changes.Skip(1).First(); - secondChange.Reason.Should().Be(ChangeReason.Add); - secondChange.Current.Should().Be(new Person("P026", 26)); - + await Assert.That(secondChange.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(Person.NameAgeGenderComparer.Equals(secondChange.Current, new Person("P026", 26))).IsTrue(); var expectedResult = people.OrderBy(p => p, Comparer).Take(25).ToList(); var actualResult = Aggregator.Data.Items.OrderBy(p => p, Comparer); - actualResult.SequenceEqual(expectedResult).Should().Be(true); + await Assert.That(actualResult.SequenceEqual(expectedResult, Person.NameAgeGenderComparer)).IsTrue(); } public void Dispose() @@ -402,5 +387,6 @@ public void Dispose() Source.Dispose(); Aggregator.Dispose(); VirtualRequests.OnCompleted(); + VirtualRequests.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/SortFixture.cs b/src/DynamicData.Tests/Cache/SortFixture.cs index 0f228b173..9dd1e3193 100644 --- a/src/DynamicData.Tests/Cache/SortFixture.cs +++ b/src/DynamicData.Tests/Cache/SortFixture.cs @@ -1,21 +1,15 @@ -#region - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - -#endregion - namespace DynamicData.Tests.Cache; public class SortFixtureWithReorder : IDisposable @@ -36,8 +30,8 @@ public SortFixtureWithReorder() _results = new SortedChangeSetAggregator(_source.Connect().Sort(_comparer)); } - [Fact] - public void AppendAtBeginning() + [Test] + public async Task AppendAtBeginning() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -47,15 +41,15 @@ public void AppendAtBeginning() _source.AddOrUpdate(insert); - _results.Data.Count.Should().Be(101, "Should be 101 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 101 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup("_Aaron"); - indexedItem.HasValue.Should().BeTrue(); - indexedItem.Value.Index.Should().Be(0, "Inserted item should have index of zero"); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(indexedItem.Value.Index).IsEqualTo(0).Because("Inserted item should have index of zero"); } - [Fact] - public void AppendAtEnd() + [Test] + public async Task AppendAtEnd() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -65,18 +59,18 @@ public void AppendAtEnd() _source.AddOrUpdate(insert); - _results.Data.Count.Should().Be(101, "Should be 101 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 101 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup("zzzzz"); - indexedItem.HasValue.Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void AppendInMiddle() + [Test] + public async Task AppendInMiddle() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -86,18 +80,18 @@ public void AppendInMiddle() _source.AddOrUpdate(insert); - _results.Data.Count.Should().Be(101, "Should be 101 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 101 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup("Marvin"); - indexedItem.HasValue.Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void BatchUpdate1() + [Test] + public async Task BatchUpdate1() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -119,11 +113,11 @@ public void BatchUpdate1() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate2() + [Test] + public async Task BatchUpdate2() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -144,11 +138,11 @@ public void BatchUpdate2() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate3() + [Test] + public async Task BatchUpdate3() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -170,11 +164,11 @@ public void BatchUpdate3() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate4() + [Test] + public async Task BatchUpdate4() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -197,11 +191,11 @@ public void BatchUpdate4() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate6() + [Test] + public async Task BatchUpdate6() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -221,11 +215,11 @@ public void BatchUpdate6() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdateWhereUpdateMovesTheIndexDown() + [Test] + public async Task BatchUpdateWhereUpdateMovesTheIndexDown() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -250,7 +244,7 @@ public void BatchUpdateWhereUpdateMovesTheIndexDown() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } public void Dispose() @@ -259,27 +253,27 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void DoesNotThrow1() + [Test] + public async Task DoesNotThrow1() { var cache = new SourceCache(d => d.Id); - var sortPump = new Subject(); + var sortPump = new ReactiveUI.Primitives.Signals.Signal(); var disposable = cache.Connect().Sort(SortExpressionComparer.Ascending(d => d.Id), sortPump).Subscribe(); disposable.Dispose(); } - [Fact] - public void DoesNotThrow2() + [Test] + public async Task DoesNotThrow2() { var cache = new SourceCache(d => d.Id); - var disposable = cache.Connect().Sort(new BehaviorSubject>(SortExpressionComparer.Ascending(d => d.Id))).Subscribe(); + var disposable = cache.Connect().Sort(new ReactiveUI.Primitives.Signals.StateSignal>(SortExpressionComparer.Ascending(d => d.Id))).Subscribe(); disposable.Dispose(); } - [Fact] - public void InlineUpdateProducesAReplace() + [Test] + public async Task InlineUpdateProducesAReplace() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -292,11 +286,11 @@ public void InlineUpdateProducesAReplace() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void RemoveFirst() + [Test] + public async Task RemoveFirst() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -306,18 +300,18 @@ public void RemoveFirst() _source.Remove(remove.Key); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); //TODO: fixed Text var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(remove.Key); - indexedItem.HasValue.Should().BeFalse(); + await Assert.That(indexedItem.HasValue).IsFalse(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void RemoveFromEnd() + [Test] + public async Task RemoveFromEnd() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -327,18 +321,18 @@ public void RemoveFromEnd() _source.Remove(remove.Key); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(remove.Key); - indexedItem.HasValue.Should().BeFalse(); + await Assert.That(indexedItem.HasValue).IsFalse(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void RemoveFromMiddle() + [Test] + public async Task RemoveFromMiddle() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -348,23 +342,23 @@ public void RemoveFromMiddle() _source.Remove(remove.Key); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); //TODO: fixed Text var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(remove.Key); - indexedItem.HasValue.Should().BeFalse(); + await Assert.That(indexedItem.HasValue).IsFalse(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void SortAfterFilter() + [Test] + public async Task SortAfterFilter() { var source = new SourceCache(p => p.Key); - var filterSubject = new BehaviorSubject>(p => true); + var filterSubject = new ReactiveUI.Primitives.Signals.StateSignal>(p => true); var agg = new SortedChangeSetAggregator(source.Connect().Filter(filterSubject).Group(x => (TestString)x.Key).Transform(x => new ViewModel(x.Key)).Sort(new ViewModel.Comparer())); @@ -380,12 +374,12 @@ public void SortAfterFilter() filterSubject.OnNext(p => p.Name.Equals("a", StringComparison.OrdinalIgnoreCase)); } - [Fact] - public void SortAfterFilterList() + [Test] + public async Task SortAfterFilterList() { var source = new SourceList(); - var filterSubject = new BehaviorSubject>(p => true); + var filterSubject = new ReactiveUI.Primitives.Signals.StateSignal>(p => true); var agg = source.Connect().Filter(filterSubject).Transform(x => new ViewModel(x.Name)).Sort(new ViewModel.Comparer()).AsAggregator(); @@ -401,22 +395,22 @@ public void SortAfterFilterList() filterSubject.OnNext(p => p.Name.Equals("a", StringComparison.OrdinalIgnoreCase)); } - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var expectedResult = people.OrderBy(p => p, _comparer).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _results.Messages[0].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void UpdateFirst() + [Test] + public async Task UpdateFirst() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -426,18 +420,18 @@ public void UpdateFirst() _source.AddOrUpdate(update); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); //TODO: fixed Text var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(update.Key); - indexedItem.HasValue.Should().BeTrue(); - ReferenceEquals(update, indexedItem.Value.Value).Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(update, indexedItem.Value.Value)).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void UpdateLast() + [Test] + public async Task UpdateLast() { //TODO: fixed Text @@ -449,18 +443,18 @@ public void UpdateLast() _source.AddOrUpdate(update); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(update.Key); - indexedItem.HasValue.Should().BeTrue(); - ReferenceEquals(update, indexedItem.Value.Value).Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(update, indexedItem.Value.Value)).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void UpdateMiddle() + [Test] + public async Task UpdateMiddle() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -470,15 +464,15 @@ public void UpdateMiddle() _source.AddOrUpdate(update); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(update.Key); - indexedItem.HasValue.Should().BeTrue(); - ReferenceEquals(update, indexedItem.Value.Value).Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(update, indexedItem.Value.Value)).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } public class Data(int id, string value) @@ -532,8 +526,8 @@ public SortFixture() _results = new SortedChangeSetAggregator(_source.Connect().Sort(_comparer)); } - [Fact] - public void AppendAtBeginning() + [Test] + public async Task AppendAtBeginning() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -543,15 +537,15 @@ public void AppendAtBeginning() _source.AddOrUpdate(insert); - _results.Data.Count.Should().Be(101, "Should be 101 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 101 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup("_Aaron"); - indexedItem.HasValue.Should().BeTrue(); - indexedItem.Value.Index.Should().Be(0, "Inserted item should have index of zero"); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(indexedItem.Value.Index).IsEqualTo(0).Because("Inserted item should have index of zero"); } - [Fact] - public void AppendAtEnd() + [Test] + public async Task AppendAtEnd() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -561,18 +555,18 @@ public void AppendAtEnd() _source.AddOrUpdate(insert); - _results.Data.Count.Should().Be(101, "Should be 101 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 101 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup("zzzzz"); - indexedItem.HasValue.Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void AppendInMiddle() + [Test] + public async Task AppendInMiddle() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -582,18 +576,18 @@ public void AppendInMiddle() _source.AddOrUpdate(insert); - _results.Data.Count.Should().Be(101, "Should be 101 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 101 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup("Marvin"); - indexedItem.HasValue.Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void BatchUpdate1() + [Test] + public async Task BatchUpdate1() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -615,11 +609,11 @@ public void BatchUpdate1() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate2() + [Test] + public async Task BatchUpdate2() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -640,11 +634,11 @@ public void BatchUpdate2() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate3() + [Test] + public async Task BatchUpdate3() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -665,11 +659,11 @@ public void BatchUpdate3() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate4() + [Test] + public async Task BatchUpdate4() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -692,11 +686,11 @@ public void BatchUpdate4() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdate6() + [Test] + public async Task BatchUpdate6() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -716,11 +710,11 @@ public void BatchUpdate6() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdateShiftingIndicies() + [Test] + public async Task BatchUpdateShiftingIndicies() { var testData = new[] { @@ -749,11 +743,11 @@ public void BatchUpdateShiftingIndicies() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void BatchUpdateWhereUpdateMovesTheIndexDown() + [Test] + public async Task BatchUpdateWhereUpdateMovesTheIndexDown() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -776,7 +770,7 @@ public void BatchUpdateWhereUpdateMovesTheIndexDown() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } public void Dispose() @@ -785,27 +779,27 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void DoesNotThrow1() + [Test] + public async Task DoesNotThrow1() { var cache = new SourceCache(d => d.Id); - var sortPump = new Subject(); + var sortPump = new ReactiveUI.Primitives.Signals.Signal(); var disposable = cache.Connect().Sort(SortExpressionComparer.Ascending(d => d.Id), sortPump).Subscribe(); disposable.Dispose(); } - [Fact] - public void DoesNotThrow2() + [Test] + public async Task DoesNotThrow2() { var cache = new SourceCache(d => d.Id); - var disposable = cache.Connect().Sort(new BehaviorSubject>(SortExpressionComparer.Ascending(d => d.Id))).Subscribe(); + var disposable = cache.Connect().Sort(new ReactiveUI.Primitives.Signals.StateSignal>(SortExpressionComparer.Ascending(d => d.Id))).Subscribe(); disposable.Dispose(); } - [Fact] - public void InlineUpdateProducesAReplace() + [Test] + public async Task InlineUpdateProducesAReplace() { var people = _generator.Take(10).ToArray(); _source.AddOrUpdate(people); @@ -818,11 +812,11 @@ public void InlineUpdateProducesAReplace() adaptor.Adapt(_results.Messages.Last(), list); var shouldbe = _results.Messages.Last().SortedItems.Select(p => p.Value).ToList(); - list.Should().BeEquivalentTo(shouldbe); + await Assert.That(list).IsEquivalentTo(shouldbe); } - [Fact] - public void RemoveFirst() + [Test] + public async Task RemoveFirst() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -832,18 +826,18 @@ public void RemoveFirst() _source.Remove(remove.Key); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); //TODO: fixed Text var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(remove.Key); - indexedItem.HasValue.Should().BeFalse(); + await Assert.That(indexedItem.HasValue).IsFalse(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void RemoveFromEnd() + [Test] + public async Task RemoveFromEnd() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -853,18 +847,18 @@ public void RemoveFromEnd() _source.Remove(remove.Key); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(remove.Key); - indexedItem.HasValue.Should().BeFalse(); + await Assert.That(indexedItem.HasValue).IsFalse(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void RemoveFromMiddle() + [Test] + public async Task RemoveFromMiddle() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -874,23 +868,23 @@ public void RemoveFromMiddle() _source.Remove(remove.Key); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); //TODO: fixed Text var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(remove.Key); - indexedItem.HasValue.Should().BeFalse(); + await Assert.That(indexedItem.HasValue).IsFalse(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void SortAfterFilter() + [Test] + public async Task SortAfterFilter() { var source = new SourceCache(p => p.Key); - var filterSubject = new BehaviorSubject>(p => true); + var filterSubject = new ReactiveUI.Primitives.Signals.StateSignal>(p => true); var agg = new SortedChangeSetAggregator(source.Connect().Filter(filterSubject).Group(x => (TestString)x.Key).Transform(x => new ViewModel(x.Key)).Sort(new ViewModel.Comparer())); @@ -906,12 +900,12 @@ public void SortAfterFilter() filterSubject.OnNext(p => p.Name.Equals("a", StringComparison.OrdinalIgnoreCase)); } - [Fact] - public void SortAfterFilterList() + [Test] + public async Task SortAfterFilterList() { var source = new SourceList(); - var filterSubject = new BehaviorSubject>(p => true); + var filterSubject = new ReactiveUI.Primitives.Signals.StateSignal>(p => true); var agg = source.Connect().Filter(filterSubject).Transform(x => new ViewModel(x.Name)).Sort(new ViewModel.Comparer()).AsAggregator(); @@ -927,22 +921,22 @@ public void SortAfterFilterList() filterSubject.OnNext(p => p.Name.Equals("a", StringComparison.OrdinalIgnoreCase)); } - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var expectedResult = people.OrderBy(p => p, _comparer).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _results.Messages[0].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void UpdateFirst() + [Test] + public async Task UpdateFirst() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -952,18 +946,18 @@ public void UpdateFirst() _source.AddOrUpdate(update); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); //TODO: fixed Text var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(update.Key); - indexedItem.HasValue.Should().BeTrue(); - ReferenceEquals(update, indexedItem.Value.Value).Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(update, indexedItem.Value.Value)).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void UpdateLast() + [Test] + public async Task UpdateLast() { //TODO: fixed Text @@ -975,18 +969,18 @@ public void UpdateLast() _source.AddOrUpdate(update); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(update.Key); - indexedItem.HasValue.Should().BeTrue(); - ReferenceEquals(update, indexedItem.Value.Value).Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(update, indexedItem.Value.Value)).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } - [Fact] - public void UpdateMiddle() + [Test] + public async Task UpdateMiddle() { var people = _generator.Take(100).ToArray(); _source.AddOrUpdate(people); @@ -996,15 +990,15 @@ public void UpdateMiddle() _source.AddOrUpdate(update); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var indexedItem = _results.Messages[1].SortedItems.Indexed().Lookup(update.Key); - indexedItem.HasValue.Should().BeTrue(); - ReferenceEquals(update, indexedItem.Value.Value).Should().BeTrue(); + await Assert.That(indexedItem.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(update, indexedItem.Value.Value)).IsTrue(); var list = _results.Messages[1].SortedItems.ToList(); var sortedResult = list.OrderBy(p => _comparer).ToList(); - list.Should().BeEquivalentTo(sortedResult); + await Assert.That(list).IsEquivalentTo(sortedResult); } public class Data(int id, string value) diff --git a/src/DynamicData.Tests/Cache/SortObservableFixtureFixture.cs b/src/DynamicData.Tests/Cache/SortObservableFixtureFixture.cs index 6175a0f5c..2018dc204 100644 --- a/src/DynamicData.Tests/Cache/SortObservableFixtureFixture.cs +++ b/src/DynamicData.Tests/Cache/SortObservableFixtureFixture.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class SortObservableFixture : IDisposable @@ -18,8 +13,7 @@ public class SortObservableFixture : IDisposable private readonly SortExpressionComparer _comparer; - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "By Design.")] - private readonly BehaviorSubject> _comparerObservable; + private readonly ReactiveUI.Primitives.Signals.StateSignal> _comparerObservable; private readonly RandomPersonGenerator _generator = new(); @@ -30,15 +24,15 @@ public class SortObservableFixture : IDisposable public SortObservableFixture() { _comparer = SortExpressionComparer.Ascending(p => p.Name).ThenByAscending(p => p.Age); - _comparerObservable = new BehaviorSubject>(_comparer); + _comparerObservable = new ReactiveUI.Primitives.Signals.StateSignal>(_comparer); _cache = new SourceCache(p => p.Name); // _sortController = new SortController(_comparer); _results = new SortedChangeSetAggregator(_cache.Connect().Sort(_comparerObservable, resetThreshold: 25)); } - [Fact] - public void ChangeSort() + [Test] + public async Task ChangeSort() { var people = _generator.Take(100).ToArray(); _cache.AddOrUpdate(people); @@ -50,11 +44,11 @@ public void ChangeSort() var actualResult = _results.Messages[0].SortedItems.ToList(); var movesCount = _results.Messages[0].Moves; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void ChangeSortAboveThreshold() + [Test] + public async Task ChangeSortAboveThreshold() { var people = _generator.Take(30).ToArray(); _cache.AddOrUpdate(people); @@ -66,12 +60,12 @@ public void ChangeSortAboveThreshold() var items = _results.Messages.Last().SortedItems; var actualResult = items.ToList(); var sortReason = items.SortReason; - actualResult.Should().BeEquivalentTo(expectedResult); - sortReason.Should().Be(SortReason.Reset); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); + await Assert.That(sortReason).IsEqualTo(SortReason.Reset); } - [Fact] - public void ChangeSortWithinThreshold() + [Test] + public async Task ChangeSortWithinThreshold() { var people = _generator.Take(20).ToArray(); _cache.AddOrUpdate(people); @@ -83,8 +77,8 @@ public void ChangeSortWithinThreshold() var items = _results.Messages.Last().SortedItems; var actualResult = items.ToList(); var sortReason = items.SortReason; - actualResult.Should().BeEquivalentTo(expectedResult); - sortReason.Should().Be(SortReason.Reorder); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); + await Assert.That(sortReason).IsEqualTo(SortReason.Reorder); } public void Dispose() @@ -92,10 +86,11 @@ public void Dispose() _cache.Dispose(); _results.Dispose(); _comparerObservable.OnCompleted(); + _comparerObservable.Dispose(); } - [Fact] - public void InlineChanges() + [Test] + public async Task InlineChanges() { var people = _generator.Take(10000).ToArray(); _cache.AddOrUpdate(people); @@ -110,7 +105,7 @@ public void InlineChanges() var expected = people.OrderBy(t => t, _comparer).ToList(); var actual = _results.Messages.Last().SortedItems.Select(kv => kv.Value).ToList(); - actual.Should().BeEquivalentTo(expected); + await Assert.That(actual).IsEquivalentTo(expected); var list = new ObservableCollectionExtended(); var adaptor = new SortedObservableCollectionAdaptor(); @@ -119,11 +114,11 @@ public void InlineChanges() adaptor.Adapt(message, list); } - list.Should().BeEquivalentTo(expected); + await Assert.That(list).IsEquivalentTo(expected); } - [Fact] - public void Reset() + [Test] + public async Task Reset() { var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).OrderBy(x => Guid.NewGuid()).ToArray(); _cache.AddOrUpdate(people); @@ -132,20 +127,20 @@ public void Reset() var expectedResult = people.OrderBy(p => p, _comparer).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _results.Messages[2].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); _cache.AddOrUpdate(people); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var expectedResult = people.OrderBy(p => p, _comparer).Select(p => new KeyValuePair(p.Name, p)).ToList(); var actualResult = _results.Messages[0].SortedItems.ToList(); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } } diff --git a/src/DynamicData.Tests/Cache/SortingAndParallelBoundaryCoverageFixture.cs b/src/DynamicData.Tests/Cache/SortingAndParallelBoundaryCoverageFixture.cs new file mode 100644 index 000000000..f527653d6 --- /dev/null +++ b/src/DynamicData.Tests/Cache/SortingAndParallelBoundaryCoverageFixture.cs @@ -0,0 +1,297 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +using DynamicData.Tests.Domain; + +#if P_LINQ +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +using DynamicData.Reactive.PLinq; +#else +using DynamicData.Kernel; +using DynamicData.PLinq; +#endif +#endif + +namespace DynamicData.Tests.Cache; + +public sealed class SortingAndParallelBoundaryCoverageFixture +{ + private static readonly IComparer AgeAscendingComparer = + SortExpressionComparer.Ascending(person => person.Age).ThenByAscending(person => person.Name); + + private static readonly IComparer AgeDescendingComparer = + SortExpressionComparer.Descending(person => person.Age).ThenByAscending(person => person.Name); + + [Test] + public async Task ObsoleteSortEmitsInitialLoadThenResetsWhenComparerChangesAboveThreshold() + { + using var source = new SourceCache(person => person.Name); + using var comparerChanged = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = source.Connect().Sort(comparerChanged, resetThreshold: 3).AsAggregator(); + + var people = new[] + { + new Person("Charlie", 30), + new Person("Alice", 10), + new Person("Bob", 20), + }; + + source.AddOrUpdate(people); + + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Messages[0].SortedItems.SortReason).IsEqualTo(SortReason.InitialLoad); + + comparerChanged.OnNext(AgeAscendingComparer); + + await AssertNames(results.Messages.Last().SortedItems.Select(item => item.Value), "Alice", "Bob", "Charlie"); + + comparerChanged.OnNext(AgeDescendingComparer); + + await AssertNames(results.Messages.Last().SortedItems.Select(item => item.Value), "Charlie", "Bob", "Alice"); + await Assert.That(results.Messages.Last().SortedItems.SortReason).IsEqualTo(SortReason.Reset); + } + + [Test] + public async Task ObsoleteSortResorterRepositionsMutatedItemWithoutWaiting() + { + using var source = new SourceCache(person => person.Name); + using var resort = new ReactiveUI.Primitives.Signals.Signal(); + using var results = source.Connect().Sort(AgeAscendingComparer, resort).AsAggregator(); + + var people = new[] + { + new Person("Alice", 10), + new Person("Bob", 20), + new Person("Charlie", 30), + }; + + source.AddOrUpdate(people); + people[2].Age = 5; + resort.OnNext(Unit.Default); + + await AssertNames(results.Messages.Last().SortedItems.Select(item => item.Value), "Charlie", "Alice", "Bob"); + await Assert.That(results.Messages.Last().SortedItems.SortReason).IsEqualTo(SortReason.Reorder); + } + + [Test] + public async Task ObsoleteSortIgnoreEvaluatesUsesRefreshToMaintainOrderedSnapshot() + { + using var source = new SourceCache(person => person.Name); + using var results = source.Connect() + .AutoRefresh(person => person.Age) + .Sort(AgeAscendingComparer, SortOptimisations.IgnoreEvaluates) + .AsAggregator(); + + var alice = new Person("Alice", 10); + var bob = new Person("Bob", 20); + + source.AddOrUpdate(new[] { alice, bob }); + bob.Age = 5; + + await AssertNames(results.Messages.Last().SortedItems.Select(item => item.Value), "Bob", "Alice"); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + } + + [Test] + public async Task SortAndVirtualizeKeepsOrderedBoundariesAcrossUpdateRefreshAndRangeShift() + { + using var source = new SourceCache(person => person.Name); + using var requests = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(1, 3)); + var list = new List(); + using var results = source.Connect() + .SortAndVirtualize(AgeAscendingComparer, requests) + .Bind(list) + .AsAggregator(); + + var people = new[] + { + new Person("P1", 10), + new Person("P2", 20), + new Person("P3", 30), + new Person("P4", 40), + new Person("P5", 50), + }; + + source.AddOrUpdate(people); + + await AssertNames(list, "P2", "P3", "P4"); + + source.AddOrUpdate(new Person("P3", 35)); + + await AssertNames(list, "P2", "P3", "P4"); + await Assert.That(results.Messages.Last().Updates).IsEqualTo(1); + + source.AddOrUpdate(new Person("P0", 5)); + + await AssertNames(list, "P1", "P2", "P3"); + await Assert.That(results.Messages.Last().Adds).IsEqualTo(1); + await Assert.That(results.Messages.Last().Removes).IsEqualTo(1); + + requests.OnNext(new VirtualRequest(2, 2)); + + await AssertNames(list, "P2", "P3"); + } + + [Test] + public async Task SortAndPageMovesOverflowRequestToLastPageAndKeepsOrderedList() + { + using var source = new SourceCache(person => person.Name); + using var requests = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 2)); + var list = new List(); + var paged = source.Connect().SortAndPage(AgeAscendingComparer, requests); + using var contextResults = paged.AsAggregator(); + using var boundResults = paged.Bind(list).AsAggregator(); + + var people = new[] + { + new Person("P1", 10), + new Person("P2", 20), + new Person("P3", 30), + new Person("P4", 40), + new Person("P5", 50), + }; + + source.AddOrUpdate(people); + + await AssertNames(list, "P1", "P2"); + + requests.OnNext(new PageRequest(10, 2)); + + await AssertNames(list, "P5"); + await Assert.That(boundResults.Messages.Last().Removes).IsEqualTo(2); + await Assert.That(contextResults.Messages.Last().Context.Response.Page).IsEqualTo(3); + } + + [Test] + public async Task ObsoletePageVirtualiseAndTopPreserveSortedWindows() + { + using var source = new SourceCache(person => person.Name); + using var pageRequests = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(2, 2)); + using var virtualRequests = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(1, 3)); + + var sorted = source.Connect().Sort(AgeAscendingComparer, resetThreshold: 10); + using var paged = sorted.Page(pageRequests).AsAggregator(); + using var virtualised = sorted.Virtualise(virtualRequests).AsAggregator(); + using var top = sorted.Top(2).AsAggregator(); + + var people = new[] + { + new Person("P4", 40), + new Person("P1", 10), + new Person("P3", 30), + new Person("P2", 20), + }; + + source.AddOrUpdate(people); + + await AssertNames(paged.Messages.Last().SortedItems.Select(item => item.Value), "P3", "P4"); + await AssertNames(virtualised.Messages.Last().SortedItems.Select(item => item.Value), "P2", "P3", "P4"); + await AssertNames(top.Messages.Last().SortedItems.Select(item => item.Value), "P1", "P2"); + } + + [Test] + public async Task TopRejectsNonPositiveSize() + { + using var source = new SourceCache(person => person.Name); + var sorted = source.Connect().Sort(AgeAscendingComparer, resetThreshold: 10); + + await Assert.That(() => source.Connect().Top(AgeAscendingComparer, 0)).Throws(); + await Assert.That(() => sorted.Top(0)).Throws(); + } + +#if P_LINQ + [Test] + public async Task ParallelFilterCoversSequentialAndParallelThresholdBranchesWithOrderedResults() + { + using var source = new SourceCache(person => person.Name); + using var results = source.Connect() + .Filter(person => person.Age >= 30, new ParallelisationOptions(ParallelType.Ordered, threshold: 3)) + .AsAggregator(); + + source.AddOrUpdate(new[] + { + new Person("P1", 10), + new Person("P2", 40), + }); + + await AssertNames(results.Data.Items.OrderBy(person => person.Age), "P2"); + + source.AddOrUpdate(new[] + { + new Person("P3", 30), + new Person("P4", 50), + new Person("P5", 20), + }); + + await AssertNames(results.Data.Items.OrderBy(person => person.Age), "P3", "P2", "P4"); + } + + [Test] + public async Task ParallelTransformSafeReportsErrorsAndRetainsSuccessfulUpdates() + { + using var source = new SourceCache(person => person.Name); + var errors = new List>(); + using var results = source.Connect() + .TransformSafe( + static person => + { + if (person.Age == 20) + { + throw new InvalidOperationException("Age 20 is intentionally rejected."); + } + + return $"{person.Name}:{person.Age}"; + }, + errors.Add, + new ParallelisationOptions(ParallelType.Parallelise, threshold: 2)) + .AsAggregator(); + + source.AddOrUpdate(new[] + { + new Person("P1", 10), + new Person("P2", 20), + new Person("P3", 30), + }); + + await Assert.That(errors.Count).IsEqualTo(1); + await Assert.That(errors[0].Key).IsEqualTo("P2"); + await Assert.That(results.Data.Items.OrderBy(value => value).ToArray()) + .IsEquivalentTo(new[] { "P1:10", "P3:30" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task ParallelSubscribeManyDisposesUpdatedRemovedAndClearedSubscriptions() + { + using var source = new SourceCache(person => person.Name); + var disposed = new List(); + using var results = source.Connect() + .SubscribeMany( + (person, key) => Disposable.Create(() => disposed.Add($"{key}:{person.Age}")), + new ParallelisationOptions(ParallelType.Ordered, threshold: 2)) + .AsAggregator(); + + source.AddOrUpdate(new[] + { + new Person("P1", 10), + new Person("P2", 20), + }); + + source.AddOrUpdate(new Person("P1", 15)); + source.Remove("P2"); + source.Clear(); + + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(disposed.OrderBy(value => value).ToArray()) + .IsEquivalentTo(new[] { "P1:10", "P1:15", "P2:20" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } +#endif + + private static async Task AssertNames(IEnumerable actual, params string[] expected) + { + var actualNames = actual.Select(person => person.Name).ToArray(); + await Assert.That(actualNames).IsEquivalentTo(expected, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } +} diff --git a/src/DynamicData.Tests/Cache/SourceCacheFixture.cs b/src/DynamicData.Tests/Cache/SourceCacheFixture.cs index 38fc02e73..735aa4f02 100644 --- a/src/DynamicData.Tests/Cache/SourceCacheFixture.cs +++ b/src/DynamicData.Tests/Cache/SourceCacheFixture.cs @@ -1,426 +1,322 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Threading; -using System.Threading.Tasks; - -using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; - -using Xunit; - -namespace DynamicData.Tests.Cache; - -public class SourceCacheFixture : IDisposable -{ - private readonly ChangeSetAggregator _results; - - private readonly ISourceCache _source; - - public SourceCacheFixture() - { - _source = new SourceCache(p => p.Key); - _results = _source.Connect().AsAggregator(); - } - - [Fact] - public void CanHandleABatchOfUpdates() - { - _source.Edit( - updater => - { - var torequery = new Person("Adult1", 44); - - updater.AddOrUpdate(new Person("Adult1", 40)); - updater.AddOrUpdate(new Person("Adult1", 41)); - updater.AddOrUpdate(new Person("Adult1", 42)); - updater.AddOrUpdate(new Person("Adult1", 43)); - updater.Refresh(torequery); - updater.Remove(torequery); - updater.Refresh(torequery); - }); - - _results.Summary.Overall.Count.Should().Be(6, "Should be 6 up`dates"); - _results.Messages.Count.Should().Be(1, "Should be 1 message"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 update"); - _results.Messages[0].Updates.Should().Be(3, "Should be 3 updates"); - _results.Messages[0].Removes.Should().Be(1, "Should be 1 remove"); - _results.Messages[0].Refreshes.Should().Be(1, "Should be 1 evaluate"); - - _results.Data.Count.Should().Be(0, "Should be 1 item in` the cache"); - } - - [Fact] - public void CountChanged() - { - var count = 0; - var invoked = 0; - using (_source.CountChanged.Subscribe( - c => - { - count = c; - invoked++; - })) - { - invoked.Should().Be(1); - count.Should().Be(0); - - _source.AddOrUpdate(new RandomPersonGenerator().Take(100)); - invoked.Should().Be(2); - count.Should().Be(100); - - _source.Clear(); - invoked.Should().Be(3); - count.Should().Be(0); - } - } - - [Fact] - public void CountChangedShouldAlwaysInvokeUponeSubscription() - { - int? result = null; - var subscription = _source.CountChanged.Subscribe(count => result = count); - - result.HasValue.Should().BeTrue(); - - if (result is null) - { - throw new InvalidOperationException(nameof(result)); - } - - result.Value.Should().Be(0, "Count should be zero"); - - subscription.Dispose(); - } - - [Fact] - public void CountChangedShouldReflectContentsOfCacheInvokeUponSubscription() - { - var generator = new RandomPersonGenerator(); - int? result = null; - var subscription = _source.CountChanged.Subscribe(count => result = count); - - _source.AddOrUpdate(generator.Take(100)); - - if (result is null) - { - throw new InvalidOperationException(nameof(result)); - } - - result.HasValue.Should().BeTrue(); - result.Value.Should().Be(100, "Count should be 100"); - subscription.Dispose(); - } - - public void Dispose() - { - _source.Dispose(); - _results.Dispose(); - } - - [Fact] - public void SubscribesDisposesCorrectly() - { - var called = false; - var errored = false; - var completed = false; - var subscription = _source.Connect().Finally(() => completed = true).Subscribe(updates => { called = true; }, ex => errored = true, () => completed = true); - _source.AddOrUpdate(new Person("Adult1", 40)); - - subscription.Dispose(); - _source.Dispose(); - - errored.Should().BeFalse(); - called.Should().BeTrue(); - completed.Should().BeTrue(); - } - - [Fact] - public void EmptyChanges() - { - IChangeSet? change = null; - - using var subscription = _source.Connect(suppressEmptyChangeSets: false) - .Subscribe(c=> change = c); - - change.Should().NotBeNull(); - change!.Count.Should().Be(0); - - } - - [Fact] - public void EmptyChangesWithFilter() - { - IChangeSet? change = null; - - using var subscription = _source.Connect(p=>p.Age == 20, suppressEmptyChangeSets: false) - .Subscribe(c => change = c); - - change.Should().NotBeNull(); - change!.Count.Should().Be(0); - } - - [Fact] - public void StaticFilterRemove() - { - var cache = new SourceCache(x => x.Id); - - var above5 = cache.Connect(x => x.Value > 5).AsObservableCache(); - var below5 = cache.Connect(x => x.Value <= 5).AsObservableCache(); - - cache.AddOrUpdate(Enumerable.Range(1,10).Select(i=> new SomeObject(i,i))); - - - above5.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5).Select(i => new SomeObject(i, i))); - below5.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5).Select(i => new SomeObject(i, i))); - - //should move from above 5 to below 5 - cache.AddOrUpdate(new SomeObject(6,-1)); - - above5.Count.Should().Be(4); - below5.Count.Should().Be(6); - - - above5.Items.Should().BeEquivalentTo(Enumerable.Range(7, 4).Select(i => new SomeObject(i, i))); - below5.Items.Should().BeEquivalentTo(Enumerable.Range(1, 6).Select(i => new SomeObject(i, i == 6 ? -1 : i))); - } - - public record class SomeObject(int Id, int Value); - - [Fact] - public async Task MultiCacheFanInDoesNotDeadlock() - { - const int itemCount = 100; - - using var cacheA = new SourceCache(static x => x.Key); - using var cacheB = new SourceCache(static x => x.Key); - using var destination = new SourceCache(static x => x.Key); - using var subA = cacheA.Connect().PopulateInto(destination); - using var subB = cacheB.Connect().PopulateInto(destination); - using var results = destination.Connect().AsAggregator(); - - var taskA = Task.Run(() => - { - for (var i = 0; i < itemCount; i++) - { - cacheA.AddOrUpdate(new TestItem($"a-{i}", $"ValueA-{i}")); - } - }); - - var taskB = Task.Run(() => - { - for (var i = 0; i < itemCount; i++) - { - cacheB.AddOrUpdate(new TestItem($"b-{i}", $"ValueB-{i}")); - } - }); - - var completed = Task.WhenAll(taskA, taskB); - var finished = await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(10))); - - finished.Should().BeSameAs(completed, "concurrent edits with cross-cache subscribers should not deadlock"); - results.Error.Should().BeNull(); - results.Data.Count.Should().Be(itemCount * 2, "all items from both caches should arrive in the destination"); - results.Data.Items.Should().BeEquivalentTo([.. cacheA.Items, .. cacheB.Items], "all items should be in the destination"); - } - - [Fact] - public async Task DirectCrossWriteDoesNotDeadlock() - { - const int iterations = 50; - - for (var iter = 0; iter < iterations; iter++) - { - using var cacheA = new SourceCache(static x => x.Key); - using var cacheB = new SourceCache(static x => x.Key); - - // Bidirectional: A items flow into B, B items flow into A. - // Filter by prefix prevents infinite feedback. - using var aToB = cacheA.Connect() - .Filter(static x => x.Key.StartsWith('a')) - .Transform(static (item, _) => new TestItem("from-a-" + item.Key, item.Value)) - .PopulateInto(cacheB); - - using var bToA = cacheB.Connect() - .Filter(static x => x.Key.StartsWith('b')) - .Transform(static (item, _) => new TestItem("from-b-" + item.Key, item.Value)) - .PopulateInto(cacheA); - - using var barrier = new Barrier(2); - - var taskA = Task.Run(() => - { - barrier.SignalAndWait(); - for (var i = 0; i < 1000; i++) - { - cacheA.AddOrUpdate(new TestItem("a" + i, "V" + i)); - } - }); - - var taskB = Task.Run(() => - { - barrier.SignalAndWait(); - for (var i = 0; i < 1000; i++) - { - cacheB.AddOrUpdate(new TestItem("b" + i, "V" + i)); - } - }); - - var completed = Task.WhenAll(taskA, taskB); - var finished = await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(60))); - - finished.Should().BeSameAs(completed, $"iteration {iter}: bidirectional cross-cache writes should not deadlock"); - } - } - - [Fact] - public void ConnectDuringDeliveryDoesNotDuplicate() - { - // Exploits the dequeue-to-OnNext window. Thread A writes two items in - // separate batches. The first delivery is held by a slow subscriber. - // While item1 delivery is blocked, item2 is committed to ReaderWriter - // and sitting in the queue. Thread B calls Connect(), takes a snapshot - // (sees both items), subscribes to _changes, then item2 is delivered - // via OnNext — producing a duplicate if not guarded by a generation counter. - using var cache = new SourceCache(static x => x.Key); - - using var delivering = new ManualResetEventSlim(false); - using var item2Written = new ManualResetEventSlim(false); - using var connectDone = new ManualResetEventSlim(false); - - var firstDelivery = true; - - // First subscriber: blocks on the first delivery to create the window - using var slowSub = cache.Connect().Subscribe(_ => - { - if (firstDelivery) - { - firstDelivery = false; - delivering.Set(); - - // Wait until item2 has been written and the Connect has subscribed - connectDone.Wait(TimeSpan.FromSeconds(5)); - } - }); - - // Write item1 on a background thread — delivery starts, slow subscriber blocks - var writeTask = Task.Run(() => - { - cache.AddOrUpdate(new TestItem("k1", "v1")); - }); - - // Wait for delivery of item1 to be in progress (slow sub is blocking) - delivering.Wait(TimeSpan.FromSeconds(5)).Should().BeTrue("delivery should have started"); - - // Now write item2 on another thread. It will acquire the lock, commit to - // ReaderWriter, enqueue a notification, and return. The notification sits - // in the queue because the deliverer (Thread A) is blocked by the slow sub. - var writeTask2 = Task.Run(() => - { - cache.AddOrUpdate(new TestItem("k2", "v2")); - item2Written.Set(); - }); - item2Written.Wait(TimeSpan.FromSeconds(5)).Should().BeTrue("item2 should have been written"); - - // Now Connect on the main thread. The snapshot from ReaderWriter includes - // BOTH k1 and k2. The subscription to _changes is added. When the slow - // subscriber unblocks, item2's notification will be delivered via OnNext - // and the new subscriber will see k2 again — a duplicate Add. - var addCounts = new Dictionary(); - using var newSub = cache.Connect().Subscribe(changes => - { - foreach (var c in changes) - { - if (c.Reason == ChangeReason.Add) - { - var key = c.Current.Key; - addCounts[key] = addCounts.GetValueOrDefault(key) + 1; - } - } - }); - - // Unblock the slow subscriber — delivery resumes, item2 delivered - connectDone.Set(); - writeTask.Wait(TimeSpan.FromSeconds(5)).Should().BeTrue("writeTask should complete"); - writeTask2.Wait(TimeSpan.FromSeconds(5)).Should().BeTrue("writeTask2 should complete"); - - // Each key should appear exactly once in the new subscriber's view - addCounts.GetValueOrDefault("k1").Should().Be(1, "k1 should appear once (snapshot only)"); - addCounts.GetValueOrDefault("k2").Should().Be(1, "k2 should appear once, not duplicated from snapshot + queued delivery"); - } - - // Covers https://github.com/reactivemarbles/DynamicData/issues/1129 - [Fact] - public void ConnectDuringEditsDoesNotDuplicate() - { - using var items = new SourceCache(static item => item); - - using var subscriptions = new CompositeDisposable(); - - // An initial subscription is required to initiate internal buffering of changes, during the upcoming .Edit(). - // That is, we want there to be changes buffered, internally, when the mid-edit subscription comes in, to - // ensure that they don't get duplicated. This is the scenario that came in up #1129. - subscriptions.Add(items - .Connect() - .Subscribe()); - - CacheItemRecordingObserver? results = null; - - items.Edit(inner => - { - inner.AddOrUpdate(1); - - subscriptions.Add(items - .Connect() - .ValidateChangeSets(static item => item) - .RecordCacheItems(out results)); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().BeEmpty("no changes should be published in the middle of an edit"); - - inner.AddOrUpdate(2); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().BeEmpty("no changes should be published in the middle of an edit"); - - // Explicitly doing a nested edit, as that system is closely intertwined with the edit-tracking system that - // .Connect() uses. - items.Remove(item: 1); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().BeEmpty("no changes should be published in the middle of an edit"); - }); - - results.Should().NotBeNull("the edit delegate should have been invoked"); - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().ContainSingle("subscribers should only receive a single initial changeset"); - results.RecordedItemsByKey.Should().BeEquivalentTo( - new Dictionary() { [2] = 2 }, - options => options.WithoutStrictOrdering(), - "all items in the source should have propagated downstream"); - - results.HasCompleted.Should().BeFalse("the source has not yet completed"); - } - - [Fact] - public void ConnectContinuesToWorkNormallyAfterAFailedEdit() - { - using var source = new SourceCache(static item => item); - - source.AddOrUpdate(1); - - source.Invoking(source => source.Edit(_ => throw new Exception("Test"))) - .Should().Throw() - .WithMessage("Test"); - - using var subscription = source.Connect().RecordCacheItems(out var results); - - results.Error.Should().BeNull("new subscribers should not receive previous errors"); - results.RecordedChangeSets.Should().ContainSingle("an initial changeset should have been published."); - } - - private sealed record TestItem(string Key, string Value); -} +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.Cache; + +public class SourceCacheFixture : IDisposable +{ + private readonly ChangeSetAggregator _results; + + private readonly ISourceCache _source; + + public SourceCacheFixture() + { + _source = new SourceCache(p => p.Key); + _results = _source.Connect().AsAggregator(); + } + + [Test] + public async Task CanHandleABatchOfUpdates() + { + _source.Edit( + updater => + { + var torequery = new Person("Adult1", 44); + + updater.AddOrUpdate(new Person("Adult1", 40)); + updater.AddOrUpdate(new Person("Adult1", 41)); + updater.AddOrUpdate(new Person("Adult1", 42)); + updater.AddOrUpdate(new Person("Adult1", 43)); + updater.Refresh(torequery); + updater.Remove(torequery); + updater.Refresh(torequery); + }); + + await Assert.That(_results.Summary.Overall.Count).IsEqualTo(6).Because("Should be 6 up`dates"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 message"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 update"); + await Assert.That(_results.Messages[0].Updates).IsEqualTo(3).Because("Should be 3 updates"); + await Assert.That(_results.Messages[0].Removes).IsEqualTo(1).Because("Should be 1 remove"); + await Assert.That(_results.Messages[0].Refreshes).IsEqualTo(1).Because("Should be 1 evaluate"); + + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 1 item in` the cache"); + } + + [Test] + public async Task CountChanged() + { + var count = 0; + var invoked = 0; + using (_source.CountChanged.Subscribe( + c => + { + count = c; + invoked++; + })) + { + await Assert.That(invoked).IsEqualTo(1); + await Assert.That(count).IsEqualTo(0); + + _source.AddOrUpdate(new RandomPersonGenerator().Take(100)); + await Assert.That(invoked).IsEqualTo(2); + await Assert.That(count).IsEqualTo(100); + + _source.Clear(); + await Assert.That(invoked).IsEqualTo(3); + await Assert.That(count).IsEqualTo(0); + } + } + + [Test] + public async Task CountChangedShouldAlwaysInvokeUponeSubscription() + { + int? result = null; + var subscription = _source.CountChanged.Subscribe(count => result = count); + + await Assert.That(result.HasValue).IsTrue(); + + if (result is null) + { + throw new InvalidOperationException(nameof(result)); + } + + await Assert.That(result.Value).IsEqualTo(0).Because("Count should be zero"); + + subscription.Dispose(); + } + + [Test] + public async Task CountChangedShouldReflectContentsOfCacheInvokeUponSubscription() + { + var generator = new RandomPersonGenerator(); + int? result = null; + var subscription = _source.CountChanged.Subscribe(count => result = count); + + _source.AddOrUpdate(generator.Take(100)); + + if (result is null) + { + throw new InvalidOperationException(nameof(result)); + } + + await Assert.That(result.HasValue).IsTrue(); + await Assert.That(result.Value).IsEqualTo(100).Because("Count should be 100"); + subscription.Dispose(); + } + + public void Dispose() + { + _source.Dispose(); + _results.Dispose(); + } + + [Test] + public async Task SubscribesDisposesCorrectly() + { + var called = false; + var errored = false; + var completed = false; + var subscription = _source.Connect().Finally(() => completed = true).Subscribe(updates => { called = true; }, ex => errored = true, () => completed = true); + _source.AddOrUpdate(new Person("Adult1", 40)); + + subscription.Dispose(); + _source.Dispose(); + + await Assert.That(errored).IsFalse(); + await Assert.That(called).IsTrue(); + await Assert.That(completed).IsTrue(); + } + + [Test] + public async Task EmptyChanges() + { + IChangeSet? change = null; + + using var subscription = _source.Connect(suppressEmptyChangeSets: false) + .Subscribe(c => change = c); + + await Assert.That(change).IsNotNull(); + await Assert.That(change!.Count).IsEqualTo(0); + + } + + [Test] + public async Task EmptyChangesWithFilter() + { + IChangeSet? change = null; + + using var subscription = _source.Connect(p => p.Age == 20, suppressEmptyChangeSets: false) + .Subscribe(c => change = c); + + await Assert.That(change).IsNotNull(); + await Assert.That(change!.Count).IsEqualTo(0); + } + + [Test] + public async Task StaticFilterRemove() + { + var cache = new SourceCache(x => x.Id); + + var above5 = cache.Connect(x => x.Value > 5).AsObservableCache(); + var below5 = cache.Connect(x => x.Value <= 5).AsObservableCache(); + + cache.AddOrUpdate(Enumerable.Range(1, 10).Select(i => new SomeObject(i, i))); + + await Assert.That(above5.Items).IsEquivalentTo(Enumerable.Range(6, 5).Select(i => new SomeObject(i, i))); + await Assert.That(below5.Items).IsEquivalentTo(Enumerable.Range(1, 5).Select(i => new SomeObject(i, i))); + + //should move from above 5 to below 5 + cache.AddOrUpdate(new SomeObject(6, -1)); + + await Assert.That(above5.Count).IsEqualTo(4); + await Assert.That(below5.Count).IsEqualTo(6); + + await Assert.That(above5.Items).IsEquivalentTo(Enumerable.Range(7, 4).Select(i => new SomeObject(i, i))); + await Assert.That(below5.Items).IsEquivalentTo(Enumerable.Range(1, 6).Select(i => new SomeObject(i, i == 6 ? -1 : i))); + } + + public record class SomeObject(int Id, int Value); + + [Test] + public async Task MultiCacheFanInDoesNotDeadlock() + { + const int itemCount = 100; + + using var cacheA = new SourceCache(static x => x.Key); + using var cacheB = new SourceCache(static x => x.Key); + using var destination = new SourceCache(static x => x.Key); + using var subA = cacheA.Connect().PopulateInto(destination); + using var subB = cacheB.Connect().PopulateInto(destination); + using var results = destination.Connect().AsAggregator(); + + var taskA = Task.Run(() => + { + for (var i = 0; i < itemCount; i++) + { + cacheA.AddOrUpdate(new TestItem($"a-{i}", $"ValueA-{i}")); + } + }); + + var taskB = Task.Run(() => + { + for (var i = 0; i < itemCount; i++) + { + cacheB.AddOrUpdate(new TestItem($"b-{i}", $"ValueB-{i}")); + } + }); + + var completed = Task.WhenAll(taskA, taskB); + var finished = await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(10))); + + await Assert.That(finished).IsSameReferenceAs(completed).Because("concurrent edits with cross-cache subscribers should not deadlock"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Data.Count).IsEqualTo(itemCount * 2).Because("all items from both caches should arrive in the destination"); + await Assert.That(results.Data.Items).IsEquivalentTo([.. cacheA.Items, .. cacheB.Items]).Because("all items should be in the destination"); + } + + [Test] + [NotInParallel] + public async Task DirectCrossWriteDoesNotDeadlock() + { + const int iterations = 50; + + for (var iter = 0; iter < iterations; iter++) + { + using var cacheA = new SourceCache(static x => x.Key); + using var cacheB = new SourceCache(static x => x.Key); + + // Bidirectional: A items flow into B, B items flow into A. + // Filter by prefix prevents infinite feedback. + using var aToB = cacheA.Connect() + .Filter(static x => x.Key.StartsWith('a')) + .Transform(static (item, _) => new TestItem("from-a-" + item.Key, item.Value)) + .PopulateInto(cacheB); + + using var bToA = cacheB.Connect() + .Filter(static x => x.Key.StartsWith('b')) + .Transform(static (item, _) => new TestItem("from-b-" + item.Key, item.Value)) + .PopulateInto(cacheA); + + using var barrier = new Barrier(2); + + var taskA = Task.Run(() => + { + barrier.SignalAndWait(); + for (var i = 0; i < 1000; i++) + { + cacheA.AddOrUpdate(new TestItem("a" + i, "V" + i)); + } + }); + + var taskB = Task.Run(() => + { + barrier.SignalAndWait(); + for (var i = 0; i < 1000; i++) + { + cacheB.AddOrUpdate(new TestItem("b" + i, "V" + i)); + } + }); + + var completed = Task.WhenAll(taskA, taskB); + var finished = await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(60))); + + await Assert.That(finished).IsSameReferenceAs(completed).Because($"iteration {iter}: bidirectional cross-cache writes should not deadlock"); + } + } + + [Test] + public async Task ConnectDuringDeliveryDoesNotDuplicate() + { + using var cache = new SourceCache(static item => item.Key); + var delivering = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + using var connectDone = new ManualResetEventSlim(false); + var firstDelivery = true; + using var slowSubscription = cache.Connect().Subscribe(_ => + { + if (!firstDelivery) + return; + + firstDelivery = false; + delivering.TrySetResult(); + if (!connectDone.Wait(TimeSpan.FromSeconds(30))) + throw new TimeoutException("The second subscriber did not connect during delivery."); + }); + + // This writer intentionally blocks inside OnNext. Give it its own thread + // so it cannot starve the pool that runs the test's async continuations. + var firstWrite = Task.Factory.StartNew( + () => cache.AddOrUpdate(new TestItem("k1", "v1")), + CancellationToken.None, + TaskCreationOptions.LongRunning, + TaskScheduler.Default); + try + { + await delivering.Task.WaitAsync(TimeSpan.FromSeconds(15)); + await Task.Run(() => cache.AddOrUpdate(new TestItem("k2", "v2"))) + .WaitAsync(TimeSpan.FromSeconds(15)); + + // Both writes are committed, but the second delivery is still queued. + var addCounts = new Dictionary(); + using var newSubscription = cache.Connect().Subscribe(changes => + { + foreach (var change in changes) + { + if (change.Reason == ChangeReason.Add) + addCounts[change.Key] = addCounts.GetValueOrDefault(change.Key) + 1; + } + }); + + connectDone.Set(); + await firstWrite.WaitAsync(TimeSpan.FromSeconds(15)); + await Assert.That(addCounts.GetValueOrDefault("k1")).IsEqualTo(1); + await Assert.That(addCounts.GetValueOrDefault("k2")).IsEqualTo(1) + .Because("the queued update must not duplicate the subscription snapshot"); + } + finally + { + connectDone.Set(); + await firstWrite.WaitAsync(TimeSpan.FromSeconds(15)); + } + } + + private sealed record TestItem(string Key, string Value); +} diff --git a/src/DynamicData.Tests/Cache/StaleChildErrorRegressionFixture.cs b/src/DynamicData.Tests/Cache/StaleChildErrorRegressionFixture.cs new file mode 100644 index 000000000..5fc819bd2 --- /dev/null +++ b/src/DynamicData.Tests/Cache/StaleChildErrorRegressionFixture.cs @@ -0,0 +1,110 @@ +namespace DynamicData.Tests.Cache; + +public sealed class StaleChildErrorRegressionFixture +{ + [Test] + public async Task StaleChildOnErrorDuringSameKeyReplacementDoesNotTerminateCurrentSubscription() + { + var staleError = new InvalidOperationException("stale child disposal error"); + using var source = new SourceCache(static item => item.Id); + var oldItem = new Item(1, "old"); + var newItem = new Item(1, "new"); + var oldChild = new ErrorOnDisposeObservable(oldItem.Name, staleError); + var newChild = new ErrorOnDisposeObservable(newItem.Name, staleError); + Exception? observedError = null; + var messages = new List>(); + + source.AddOrUpdate(oldItem); + + using var subscription = source.Connect() + .TransformOnObservable((item, _) => ReferenceEquals(item, oldItem) ? oldChild : newChild) + .Subscribe( + onNext: messages.Add, + onError: error => observedError = error); + + source.AddOrUpdate(newItem); + + await Assert.That(oldChild.DisposeCount).IsEqualTo(1); + await Assert.That(observedError).IsNull(); + await Assert.That(messages.SelectMany(static changes => changes).Last().Current).IsEqualTo(newItem.Name); + } + + [Test] + public async Task StaleChildOnErrorAfterSameKeyReplacementDoesNotTerminateCurrentSubscription() + { + var staleError = new InvalidOperationException("stale child late error"); + using var source = new SourceCache(static item => item.Id); + var oldItem = new Item(1, "old"); + var newItem = new Item(1, "new"); + var oldChild = new ManualErrorObservable(oldItem.Name); + var newChild = new ManualErrorObservable(newItem.Name); + Exception? observedError = null; + var messages = new List>(); + + source.AddOrUpdate(oldItem); + + using var subscription = source.Connect() + .TransformOnObservable((item, _) => ReferenceEquals(item, oldItem) ? oldChild : newChild) + .Subscribe( + onNext: messages.Add, + onError: error => observedError = error); + + source.AddOrUpdate(newItem); + oldChild.OnError(staleError); + + await Assert.That(oldChild.DisposeCount).IsEqualTo(1); + await Assert.That(observedError).IsNull(); + await Assert.That(messages.SelectMany(static changes => changes).Last().Current).IsEqualTo(newItem.Name); + } + + private sealed record Item(int Id, string Name); + + private sealed class ErrorOnDisposeObservable(T value, Exception disposeError) : IObservable + { + private readonly Exception _disposeError = disposeError; + private int _disposeCount; + + public int DisposeCount => Volatile.Read(ref _disposeCount); + + public IDisposable Subscribe(IObserver observer) + { + observer.OnNext(value); + return new Subscription(this, observer); + } + + private sealed class Subscription(ErrorOnDisposeObservable owner, IObserver observer) : IDisposable + { + public void Dispose() + { + if (Interlocked.Increment(ref owner._disposeCount) == 1) + { + observer.OnError(owner._disposeError); + } + } + } + } + + private sealed class ManualErrorObservable(T value) : IObservable + { + private IObserver? _observer; + private int _disposeCount; + + public int DisposeCount => Volatile.Read(ref _disposeCount); + + public IDisposable Subscribe(IObserver observer) + { + _observer = observer; + observer.OnNext(value); + return new Subscription(this); + } + + public void OnError(Exception error) + => _observer?.OnError(error); + + private sealed class Subscription(ManualErrorObservable owner) : IDisposable + { + public void Dispose() + => Interlocked.Increment(ref owner._disposeCount); + } + } +} diff --git a/src/DynamicData.Tests/Cache/SubscribeManyFixture.cs b/src/DynamicData.Tests/Cache/SubscribeManyFixture.cs index 5d6d26729..005062fd1 100644 --- a/src/DynamicData.Tests/Cache/SubscribeManyFixture.cs +++ b/src/DynamicData.Tests/Cache/SubscribeManyFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class SubscribeManyFixture : IDisposable @@ -26,14 +18,14 @@ public SubscribeManyFixture() })); } - [Fact] - public void AddedItemWillbeSubscribed() + [Test] + public async Task AddedItemWillbeSubscribed() { _source.AddOrUpdate(new SubscribeableObject(1)); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].IsSubscribed.Should().Be(true, "Should be subscribed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0].IsSubscribed).IsTrue().Because("Should be subscribed"); } public void Dispose() @@ -42,37 +34,37 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void EverythingIsUnsubscribedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsUnsubscribedWhenStreamIsDisposed() { _source.AddOrUpdate(Enumerable.Range(1, 10).Select(i => new SubscribeableObject(i))); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[1].All(d => !d.Current.IsSubscribed).Should().BeTrue(); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[1].All(d => !d.Current.IsSubscribed)).IsTrue(); } - [Fact] - public void RemoveIsUnsubscribed() + [Test] + public async Task RemoveIsUnsubscribed() { _source.AddOrUpdate(new SubscribeableObject(1)); _source.Remove(1); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Should be 0 items in the cache"); - _results.Messages[1].First().Current.IsSubscribed.Should().Be(false, "Should be be unsubscribed"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 items in the cache"); + await Assert.That(_results.Messages[1].First().Current.IsSubscribed).IsFalse().Because("Should be be unsubscribed"); } - [Fact] - public void UpdateUnsubscribesPrevious() + [Test] + public async Task UpdateUnsubscribesPrevious() { _source.AddOrUpdate(new SubscribeableObject(1)); _source.AddOrUpdate(new SubscribeableObject(1)); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 items in the cache"); - _results.Messages[1].First().Current.IsSubscribed.Should().Be(true, "Current should be subscribed"); - _results.Messages[1].First().Previous.Value.IsSubscribed.Should().Be(false, "Previous should not be subscribed"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 items in the cache"); + await Assert.That(_results.Messages[1].First().Current.IsSubscribed).IsTrue().Because("Current should be subscribed"); + await Assert.That(_results.Messages[1].First().Previous.Value.IsSubscribed).IsFalse().Because("Previous should not be subscribed"); } private class SubscribeableObject(int id) diff --git a/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.IntegrationTests.cs b/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.IntegrationTests.cs index 3ba800ee3..0a5b8b4b7 100644 --- a/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.IntegrationTests.cs @@ -1,12 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; @@ -15,8 +12,8 @@ public static partial class SuspendNotificationsFixture public sealed class IntegrationTests : IntegrationTestFixtureBase { - [Fact] - public void ResumeDeliversPendingChangesWithoutHoldingTheLock() + [Test] + public async Task ResumeDeliversPendingChangesWithoutHoldingTheLock() { // On resume, the changes accumulated while suspended must be delivered to // subscribers WITHOUT the cache lock held. A subscriber that blocks mid-delivery @@ -50,7 +47,7 @@ public void ResumeDeliversPendingChangesWithoutHoldingTheLock() // slow subscriber, which blocks partway through. var resumeThread = new Thread(suspend.Dispose) { IsBackground = true }; resumeThread.Start(); - deliveryStarted.Wait(TimeSpan.FromSeconds(10)).Should().BeTrue("delivery of pending changes should have started"); + await Assert.That(deliveryStarted.Wait(TimeSpan.FromSeconds(10))).IsTrue().Because("delivery of pending changes should have started"); // While delivery is blocked, a concurrent lock-requiring operation must complete // promptly. It cannot if the delivery is happening under the cache lock. The @@ -60,21 +57,22 @@ public void ResumeDeliversPendingChangesWithoutHoldingTheLock() { cache.SuspendNotifications().Dispose(); concurrentOpDone.Set(); - }) { IsBackground = true }; + }) + { IsBackground = true }; concurrentThread.Start(); var completedWhileBlocked = concurrentOpDone.Wait(TimeSpan.FromSeconds(10)); releaseDelivery.Set(); - resumeThread.Join(TimeSpan.FromSeconds(30)).Should().BeTrue("resume should complete"); - concurrentThread.Join(TimeSpan.FromSeconds(30)).Should().BeTrue("concurrent operation should complete"); + await Assert.That(resumeThread.Join(TimeSpan.FromSeconds(30))).IsTrue().Because("resume should complete"); + await Assert.That(concurrentThread.Join(TimeSpan.FromSeconds(30))).IsTrue().Because("concurrent operation should complete"); - completedWhileBlocked.Should().BeTrue("a concurrent operation must not block while pending changes are delivered; the lock must not be held during delivery"); - cache.Count.Should().Be(10, "all items should be present after resume"); + await Assert.That(completedWhileBlocked).IsTrue().Because("a concurrent operation must not block while pending changes are delivered; the lock must not be held during delivery"); + await Assert.That(cache.Count).IsEqualTo(10).Because("all items should be present after resume"); } - [Fact] - public void StaleResumeSignalIsSuppressedByConcurrentReSuspend() + [Test] + public async Task StaleResumeSignalIsSuppressedByConcurrentReSuspend() { // Deterministic reproduction of the suspend/resume state-divergence race (#1131). // Resume decrements the suspend count in one step and emits its resume signal in a @@ -110,7 +108,7 @@ public void StaleResumeSignalIsSuppressedByConcurrentReSuspend() // the accumulated changes to the blocking subscriber, parks BEFORE the resume signal. var resumeThread = new Thread(suspend1.Dispose) { IsBackground = true }; resumeThread.Start(); - deliveryStarted.Wait(TimeSpan.FromSeconds(10)).Should().BeTrue("delivery should have started"); + await Assert.That(deliveryStarted.Wait(TimeSpan.FromSeconds(10))).IsTrue().Because("delivery should have started"); // The resume thread is parked after decrementing the count but before signalling // resume. Re-suspend and connect a new subscriber while the count is transiently zero. @@ -119,104 +117,101 @@ public void StaleResumeSignalIsSuppressedByConcurrentReSuspend() // Let the resume thread proceed to its now-stale resume signal. releaseDelivery.Set(); - resumeThread.Join(TimeSpan.FromSeconds(30)).Should().BeTrue("resume should complete"); + await Assert.That(resumeThread.Join(TimeSpan.FromSeconds(30))).IsTrue().Because("resume should complete"); // The late subscriber connected while re-suspended: it must NOT have activated, // because notifications ARE suspended (suspend2 is active). The stale resume signal // must be suppressed by re-checking the suspend count. - lateResults.Messages.Count.Should().Be(0, "a connection made during re-suspension must not activate on a stale resume signal"); - lateResults.Data.Count.Should().Be(0, "no data should be delivered while suspended"); + await Assert.That(lateResults.Messages.Count).IsEqualTo(0).Because("a connection made during re-suspension must not activate on a stale resume signal"); + await Assert.That(lateResults.Data.Count).IsEqualTo(0).Because("no data should be delivered while suspended"); // Releasing the real suspension delivers the data normally. suspend2.Dispose(); - lateResults.Data.Count.Should().Be(dataSet.Count, "all data should arrive once truly resumed"); - lateResults.Messages.Count.Should().Be(1, "a single changeset on the real resume"); + await Assert.That(lateResults.Data.Count).IsEqualTo(dataSet.Count).Because("all data should arrive once truly resumed"); + await Assert.That(lateResults.Messages.Count).IsEqualTo(1).Because("a single changeset on the real resume"); } - [Fact] - public async Task ResumeSignalUnderLockPreventsStaleSnapshotFromReSuspend() - { - // Verifies that a deferred Connect subscriber never sees data written during - // a re-suspension. The resume signal fires under the lock (reentrant), so the - // deferred subscriber activates and takes its snapshot before any other thread - // can re-suspend or write new data. - // - // A slow first subscriber blocks delivery of accumulated changes, creating a - // window where the main thread re-suspends and writes a second batch. The - // deferred subscriber's snapshot must contain only the first batch. - using var cache = new SourceCache(static x => x); - var dataSet1 = Enumerable.Range(0, 100).ToList(); - var dataSet2 = Enumerable.Range(1000, 100).ToList(); - var allData = dataSet1.Concat(dataSet2).ToList(); + [Test] + public async Task ResumeSignalUnderLockPreventsStaleSnapshotFromReSuspend() + { + // Verifies that a deferred Connect subscriber never sees data written during + // a re-suspension. The resume signal fires under the lock (reentrant), so the + // deferred subscriber activates and takes its snapshot before any other thread + // can re-suspend or write new data. + // + // A slow first subscriber blocks delivery of accumulated changes, creating a + // window where the main thread re-suspends and writes a second batch. The + // deferred subscriber's snapshot must contain only the first batch. + using var cache = new SourceCache(static x => x); + var dataSet1 = Enumerable.Range(0, 100).ToList(); + var dataSet2 = Enumerable.Range(1000, 100).ToList(); + var allData = dataSet1.Concat(dataSet2).ToList(); - using var delivering = new SemaphoreSlim(0, 1); - using var proceedWithResuspend = new SemaphoreSlim(0, 1); + using var delivering = new SemaphoreSlim(0, 1); + using var proceedWithResuspend = new SemaphoreSlim(0, 1); - var suspend1 = cache.SuspendNotifications(); - cache.AddOrUpdate(dataSet1); + var suspend1 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet1); - // First subscriber blocks on delivery to hold the delivery thread - var firstDelivery = true; - using var slowSub = cache.Connect().Subscribe(_ => + // First subscriber blocks on delivery to hold the delivery thread + var firstDelivery = true; + using var slowSub = cache.Connect().Subscribe(_ => + { + if (firstDelivery) { - if (firstDelivery) - { - firstDelivery = false; - delivering.Release(); - proceedWithResuspend.Wait(TimeSpan.FromSeconds(5)); - } - }); + firstDelivery = false; + delivering.Release(); + proceedWithResuspend.Wait(TimeSpan.FromSeconds(5)); + } + }); - // Deferred subscriber — will activate when resume signal fires - using var results = cache.Connect().AsAggregator(); - results.Messages.Count.Should().Be(0, "no messages during suspension"); + // Deferred subscriber — will activate when resume signal fires + using var results = cache.Connect().AsAggregator(); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages during suspension"); - // Resume on background thread — delivery blocks on slow subscriber - var resumeTask = Task.Run(() => suspend1.Dispose()); - (await delivering.WaitAsync(TimeSpan.FromSeconds(5))).Should().BeTrue("delivery should have started"); + // Resume on background thread — delivery blocks on slow subscriber + var resumeTask = Task.Run(() => suspend1.Dispose()); + await Assert.That((await delivering.WaitAsync(TimeSpan.FromSeconds(5)))).IsTrue().Because("delivery should have started"); - // Re-suspend and write second batch while delivery is blocked - var suspend2 = cache.SuspendNotifications(); - cache.AddOrUpdate(dataSet2); + // Re-suspend and write second batch while delivery is blocked + var suspend2 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet2); - // dataSet2 must not appear in any message received so far - foreach (var msg in results.Messages) + // dataSet2 must not appear in any message received so far + foreach (var msg in results.Messages) + { + foreach (var change in msg) { - foreach (var change in msg) - { - change.Key.Should().BeInRange(0, 99, - "deferred subscriber should only have first-batch keys before second resume"); - } + await Assert.That(change.Key is >= 0 and <= 99) + .IsTrue().Because("deferred subscriber should only have first-batch keys before second resume"); } + } - // Unblock delivery - proceedWithResuspend.Release(); - await resumeTask; + // Unblock delivery + proceedWithResuspend.Release(); + await resumeTask; - // Only dataSet1 should have been delivered — dataSet2 is held by second suspension - results.Summary.Overall.Adds.Should().Be(dataSet1.Count, - $"exactly {dataSet1.Count} adds before second resume — dataSet2 must be held by suspension"); - results.Messages.Should().HaveCount(1, "exactly one message (snapshot of dataSet1)"); - results.Messages[0].Adds.Should().Be(dataSet1.Count); - results.Messages[0].Select(c => c.Key).Should().Equal(dataSet1, - "snapshot should contain exactly first-batch keys in order"); + // Only dataSet1 should have been delivered — dataSet2 is held by second suspension + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(dataSet1.Count).Because($"exactly {dataSet1.Count} adds before second resume — dataSet2 must be held by suspension"); + await Assert.That(results.Messages).HasCount(1).Because("exactly one message (snapshot of dataSet1)"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(dataSet1.Count); + await Assert.That(results.Messages[0].Select(c => c.Key)).IsEquivalentTo(dataSet1).Because("snapshot should contain exactly first-batch keys in order"); - // Resume second suspension — dataSet2 arrives now - suspend2.Dispose(); + // Resume second suspension — dataSet2 arrives now + suspend2.Dispose(); - results.Summary.Overall.Adds.Should().Be(allData.Count, $"exactly {allData.Count} adds total"); - results.Summary.Overall.Removes.Should().Be(0, "no removes"); - results.Messages.Should().HaveCount(2, "two messages: snapshot + second batch"); - results.Messages[1].Adds.Should().Be(dataSet2.Count); - results.Messages[1].Select(c => c.Key).Should().Equal(dataSet2, - "second message should contain exactly second-batch keys in order"); - results.Data.Count.Should().Be(allData.Count); - results.Data.Keys.OrderBy(k => k).Should().Equal(allData); - results.Error.Should().BeNull(); - results.IsCompleted.Should().BeFalse(); - } + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"exactly {allData.Count} adds total"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Messages).HasCount(2).Because("two messages: snapshot + second batch"); + await Assert.That(results.Messages[1].Adds).IsEqualTo(dataSet2.Count); + await Assert.That(results.Messages[1].Select(c => c.Key)).IsEquivalentTo(dataSet2).Because("second message should contain exactly second-batch keys in order"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count); + await Assert.That(results.Data.Keys.OrderBy(k => k)).IsEquivalentTo(allData); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsFalse(); + } - [Fact] + [Test] public async Task SuspensionsAreThreadSafe() { // Arrange @@ -233,12 +228,12 @@ public async Task SuspensionsAreThreadSafe() await Task.Run(suspend.Dispose); // Assert - results.Data.Count.Should().Be(100, "Should receive data after resume"); - results.Messages.Count.Should().Be(1, "Should receive single changeset on resume"); - results.Messages[0].Adds.Should().Be(100, "Should have 100 adds"); + await Assert.That(results.Data.Count).IsEqualTo(100).Because("Should receive data after resume"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(100).Because("Should have 100 adds"); } - [Fact] + [Test] public async Task ConcurrentSuspendDuringResumeDoesNotCorrupt() { // Stress test: races resume against re-suspend on two threads. @@ -276,15 +271,14 @@ public async Task ConcurrentSuspendDuringResumeDoesNotCorrupt() cache.AddOrUpdate(dataSet2); suspend2.Dispose(); - results.Summary.Overall.Adds.Should().Be(allData.Count, $"iteration {iter}: exactly {allData.Count} adds"); - results.Summary.Overall.Removes.Should().Be(0, $"iteration {iter}: no removes"); - results.Summary.Overall.Updates.Should().Be(0, $"iteration {iter}: no updates because keys don't overlap"); - results.Data.Count.Should().Be(allData.Count, $"iteration {iter}: {allData.Count} items in final state"); - results.Data.Keys.OrderBy(k => k).Should().Equal(allData, $"iteration {iter}: all keys present in order"); - results.Error.Should().BeNull($"iteration {iter}: no errors"); - results.IsCompleted.Should().BeFalse($"iteration {iter}: not completed"); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"iteration {iter}: exactly {allData.Count} adds"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because($"iteration {iter}: no removes"); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0).Because($"iteration {iter}: no updates because keys don't overlap"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count).Because($"iteration {iter}: {allData.Count} items in final state"); + await Assert.That(results.Data.Keys.OrderBy(k => k)).IsEquivalentTo(allData).Because($"iteration {iter}: all keys present in order"); + await Assert.That(results.Error).IsNull().Because($"iteration {iter}: no errors"); + await Assert.That(results.IsCompleted).IsFalse().Because($"iteration {iter}: not completed"); } } } } - diff --git a/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.UnitTests.cs b/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.UnitTests.cs index be0bb6145..bb97dc90b 100644 --- a/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.UnitTests.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; using System.Threading.Tasks; -using FluentAssertions; -using Xunit; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Cache; @@ -32,8 +32,8 @@ public UnitTests() _countChangeSubscription = _source.CountChanged.Do(_countChangeHistory.Add).Subscribe(); } - [Fact] - public void NotificationsCanBeSuspended() + [Test] + public async Task NotificationsCanBeSuspended() { // Arrange using var suspend = _source.SuspendNotifications(); @@ -42,48 +42,48 @@ public void NotificationsCanBeSuspended() _source.AddOrUpdate(1); // Assert - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Should not receive data after suspend"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } // https://github.com/reactivemarbles/DynamicData/issues/1136 - [Fact] - public void SuspendedConnectCompletesCorrectly() + [Test] + public async Task SuspendedConnectCompletesCorrectly() { using var source = new SourceCache(static item => item); - + using var suspension = source.SuspendNotifications(); - + source.AddOrUpdate(1); - + using var subscription = source.Connect() .RecordCacheItems(out var results); - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().BeEmpty("notifications should have been suspended"); + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("notifications should have been suspended"); suspension.Dispose(); - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().ContainSingle("notifications should have been resumed"); - results.RecordedItemsByKey.Should().BeEquivalentTo(source.KeyValues, "all changes should have propagated to the new subscriber"); + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.RecordedChangeSets).HasCount(1).Because("notifications should have been resumed"); + await Assert.That(results.RecordedItemsByKey).IsEquivalentTo(source.KeyValues).Because("all changes should have propagated to the new subscriber"); source.AddOrUpdate(2); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "a single additional source operation was performed"); - results.RecordedItemsByKey.Should().BeEquivalentTo(source.KeyValues, "all changes should have propagated to the new subscriber"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("a single additional source operation was performed"); + await Assert.That(results.RecordedItemsByKey).IsEquivalentTo(source.KeyValues).Because("all changes should have propagated to the new subscriber"); source.Dispose(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("no additional source operations were performed"); - results.HasCompleted.Should().BeTrue("the source has been disposed"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("no additional source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has been disposed"); } - [Fact] - public void SuspendingNotificationsDoesNotImpactPreview() + [Test] + public async Task SuspendingNotificationsDoesNotImpactPreview() { // Arrange using var previewResults = _source.Preview().AsAggregator(); @@ -93,14 +93,14 @@ public void SuspendingNotificationsDoesNotImpactPreview() _source.AddOrUpdate(1); // Assert - previewResults.Messages.Count.Should().Be(1, "should have received a message in Preview"); - _results.Messages.Count.Should().Be(0, "should not have gotten any updates"); - _results.Data.Count.Should().Be(0, "should not receive data after suspend"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(previewResults.Messages.Count).IsEqualTo(1).Because("should have received a message in Preview"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("should not have gotten any updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void SuspendingNotificationsPreventsWatch() + [Test] + public async Task SuspendingNotificationsPreventsWatch() { // Arrange var gotData = false; @@ -111,14 +111,14 @@ public void SuspendingNotificationsPreventsWatch() _source.AddOrUpdate(1); // Assert - gotData.Should().BeFalse("Should not have received data after suspend"); - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Should not receive data after suspend"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(gotData).IsFalse().Because("Should not have received data after suspend"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void NotificationsCanBeResumed() + [Test] + public async Task NotificationsCanBeResumed() { // Arrange { @@ -129,13 +129,13 @@ public void NotificationsCanBeResumed() Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); // Assert - _results.Messages.Count.Should().Be(37, "Should receive updates after resume"); - _results.Data.Count.Should().Be(37, "Should receive data after resume"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(_results.Messages.Count).IsEqualTo(37).Because("Should receive updates after resume"); + await Assert.That(_results.Data.Count).IsEqualTo(37).Because("Should receive data after resume"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void ExistingDataNotEmittedWhileSuspended() + [Test] + public async Task ExistingDataNotEmittedWhileSuspended() { // Arrange var suspend = _source.SuspendNotifications(); @@ -145,13 +145,13 @@ public void ExistingDataNotEmittedWhileSuspended() using var results = _source.Connect().AsAggregator(); // Assert - results.Messages.Count.Should().Be(0, "Should have no item updates"); - results.Data.Count.Should().Be(0, "Should not receive data after suspend"); - results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void ExistingDataNotEmittedViaWatchUntilResumed() + [Test] + public async Task ExistingDataNotEmittedViaWatchUntilResumed() { // Arrange var gotData = false; @@ -163,11 +163,11 @@ public void ExistingDataNotEmittedViaWatchUntilResumed() suspend.Dispose(); // Assert - gotData.Should().BeTrue("should have received a notice after the suspend was released"); + await Assert.That(gotData).IsTrue().Because("should have received a notice after the suspend was released"); } - [Fact] - public void ExistingDataNotEmittedUntilResumed() + [Test] + public async Task ExistingDataNotEmittedUntilResumed() { // Arrange var suspend = _source.SuspendNotifications(); @@ -178,13 +178,13 @@ public void ExistingDataNotEmittedUntilResumed() suspend.Dispose(); // Assert - results.Messages.Count.Should().Be(1, "Should receive updates after resume"); - results.Data.Count.Should().Be(37, "Should receive data after resume"); - results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("Should receive updates after resume"); + await Assert.That(results.Data.Count).IsEqualTo(37).Because("Should receive data after resume"); + await Assert.That(results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void ExistingAndNewDataEmittedAsASingleChangesetOnResume() + [Test] + public async Task ExistingAndNewDataEmittedAsASingleChangesetOnResume() { // Arrange var suspend = _source.SuspendNotifications(); @@ -196,13 +196,13 @@ public void ExistingAndNewDataEmittedAsASingleChangesetOnResume() suspend.Dispose(); // Assert - results.Messages.Count.Should().Be(1, "Should receive single changeset on resume"); - results.Data.Count.Should().Be(37 * 2, "Should receive data after resume"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(results.Data.Count).IsEqualTo(37 * 2).Because("Should receive data after resume"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void PendingNotificationsEmittedAsSingleChangeSetOnResume() + [Test] + public async Task PendingNotificationsEmittedAsSingleChangeSetOnResume() { // Arrange var suspend = _source.SuspendNotifications(); @@ -213,15 +213,15 @@ public void PendingNotificationsEmittedAsSingleChangeSetOnResume() suspend.Dispose(); // Assert - _results.Data.Count.Should().Be(36, "Should receive data after resume"); - _results.Messages.Count.Should().Be(1, "Should receive single changeset on resume"); - _results.Messages[0].Adds.Should().Be(37, "Should have 37 adds"); - _results.Messages[0].Removes.Should().Be(1, "Should show the remove"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(_results.Data.Count).IsEqualTo(36).Because("Should receive data after resume"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(37).Because("Should have 37 adds"); + await Assert.That(_results.Messages[0].Removes).IsEqualTo(1).Because("Should show the remove"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void MultipleSuspendsAreCumulative() + [Test] + public async Task MultipleSuspendsAreCumulative() { // Arrange var suspend = _source.SuspendNotifications(); @@ -232,13 +232,13 @@ public void MultipleSuspendsAreCumulative() suspend.Dispose(); // Assert - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Should not receive data after suspend"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void MultipleSuspendsCanBeResumed() + [Test] + public async Task MultipleSuspendsCanBeResumed() { // Arrange var suspend = _source.SuspendNotifications(); @@ -250,13 +250,13 @@ public void MultipleSuspendsCanBeResumed() suspend2.Dispose(); // Assert - _results.Messages.Count.Should().Be(1, "Should receive updates after resume"); - _results.Data.Count.Should().Be(1, "Should receive data after resume"); - _results.IsCompleted.Should().BeFalse("IsCompleted should not have fired"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should receive updates after resume"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should receive data after resume"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); } - [Fact] - public void OnCompletedFiresIfCacheDisposedWhileSuspended() + [Test] + public async Task OnCompletedFiresIfCacheDisposedWhileSuspended() { // Arrange using var suspend = _source.SuspendNotifications(); @@ -267,13 +267,13 @@ public void OnCompletedFiresIfCacheDisposedWhileSuspended() _source.Dispose(); // Assert - results.IsCompleted.Should().BeTrue("IsCompleted should fire even if Notifications are suspended"); - results.Messages.Count.Should().Be(0, "Shouldn't receive any Changesets"); - results.Data.Count.Should().Be(0, "Shouldn't receive any Data"); + await Assert.That(results.IsCompleted).IsTrue().Because("IsCompleted should fire even if Notifications are suspended"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("Shouldn't receive any Changesets"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("Shouldn't receive any Data"); } - [Fact] - public void CountNotificationsCanBeSuspended() + [Test] + public async Task CountNotificationsCanBeSuspended() { // Arrange using var suspend = _source.SuspendCount(); @@ -282,12 +282,12 @@ public void CountNotificationsCanBeSuspended() _source.AddOrUpdate(1); // Assert - _countChangeHistory.Count.Should().Be(1, "Should Not receive count updates"); - _countChangeHistory[0].Should().Be(0, "Should have only received the empty list"); + await Assert.That(_countChangeHistory.Count).IsEqualTo(1).Because("Should Not receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have only received the empty list"); } - [Fact] - public void CountNotificationsCanBeResumed() + [Test] + public async Task CountNotificationsCanBeResumed() { // Arrange { @@ -298,13 +298,13 @@ public void CountNotificationsCanBeResumed() _source.AddOrUpdate(1); // Assert - _countChangeHistory.Count.Should().Be(2, "Should receive count updates"); - _countChangeHistory[0].Should().Be(0, "Should have received the empty list"); - _countChangeHistory[1].Should().Be(1, "Should have received the updated count"); + await Assert.That(_countChangeHistory.Count).IsEqualTo(2).Because("Should receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have received the empty list"); + await Assert.That(_countChangeHistory[1]).IsEqualTo(1).Because("Should have received the updated count"); } - [Fact] - public void CountChangedAlwaysStartsWithInitialEvenWhenSuspended() + [Test] + public async Task CountChangedAlwaysStartsWithInitialEvenWhenSuspended() { // Arrange _source.AddOrUpdate(Enumerable.Range(1, 50)); @@ -316,12 +316,12 @@ public void CountChangedAlwaysStartsWithInitialEvenWhenSuspended() Enumerable.Range(100, 50).ForEach(_source.AddOrUpdate); // Assert - countChangeHistory.Count.Should().Be(1, "Should receive initial value"); - countChangeHistory[0].Should().Be(50, "Should have received the correct initial value"); + await Assert.That(countChangeHistory.Count).IsEqualTo(1).Because("Should receive initial value"); + await Assert.That(countChangeHistory[0]).IsEqualTo(50).Because("Should have received the correct initial value"); } - [Fact] - public void PendingCountNotificationsEmittedOnResume() + [Test] + public async Task PendingCountNotificationsEmittedOnResume() { // Arrange var suspend = _source.SuspendCount(); @@ -333,13 +333,13 @@ public void PendingCountNotificationsEmittedOnResume() suspend.Dispose(); // Assert - _countChangeHistory.Count.Should().Be(2, "Should receive count updates"); - _countChangeHistory[0].Should().Be(0, "Should have received the initial 0 count"); - _countChangeHistory[1].Should().Be(3, "Should have received the updated count"); + await Assert.That(_countChangeHistory.Count).IsEqualTo(2).Because("Should receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have received the initial 0 count"); + await Assert.That(_countChangeHistory[1]).IsEqualTo(3).Because("Should have received the updated count"); } - [Fact] - public void MultipleCountSuspendsAreCumulative() + [Test] + public async Task MultipleCountSuspendsAreCumulative() { // Arrange var suspend = _source.SuspendCount(); @@ -352,12 +352,12 @@ public void MultipleCountSuspendsAreCumulative() suspend.Dispose(); // Assert - _countChangeHistory.Count.Should().Be(1, "Should Not receive count updates"); - _countChangeHistory[0].Should().Be(0, "Should have only received the empty list"); + await Assert.That(_countChangeHistory.Count).IsEqualTo(1).Because("Should Not receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have only received the empty list"); } - [Fact] - public void MultipleCountSuspendsCanBeResumed() + [Test] + public async Task MultipleCountSuspendsCanBeResumed() { // Arrange var suspend = _source.SuspendCount(); @@ -371,12 +371,12 @@ public void MultipleCountSuspendsCanBeResumed() suspend2.Dispose(); // Assert - _countChangeHistory.Count.Should().Be(2, "Should receive count updates"); - _countChangeHistory[0].Should().Be(0, "Should have received the initial 0 count"); - _countChangeHistory[1].Should().Be(3, "Should have received the updated count"); + await Assert.That(_countChangeHistory.Count).IsEqualTo(2).Because("Should receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have received the initial 0 count"); + await Assert.That(_countChangeHistory[1]).IsEqualTo(3).Because("Should have received the updated count"); } - [Fact] + [Test] public async Task SuspensionsAreThreadSafe() { // Arrange @@ -388,13 +388,13 @@ public async Task SuspensionsAreThreadSafe() await Task.Run(suspend.Dispose); // Assert - _results.Data.Count.Should().Be(100, "Should receive data after resume"); - _results.Messages.Count.Should().Be(1, "Should receive single changeset on resume"); - _results.Messages[0].Adds.Should().Be(100, "Should have 100 adds"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should receive data after resume"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should have 100 adds"); } - [Fact] - public void ResumeThenReSuspendDeliversFirstBatchOnly() + [Test] + public async Task ResumeThenReSuspendDeliversFirstBatchOnly() { // Forces the ordering: resume completes before re-suspend. // The deferred subscriber activates with the first batch snapshot, @@ -408,42 +408,42 @@ public void ResumeThenReSuspendDeliversFirstBatchOnly() cache.AddOrUpdate(dataSet1); using var results = cache.Connect().AsAggregator(); - results.Messages.Count.Should().Be(0, "no messages during suspension"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages during suspension"); // Resume first — subscriber activates suspend1.Dispose(); - results.Messages.Count.Should().Be(1, "exactly one message after resume"); - results.Messages[0].Adds.Should().Be(dataSet1.Count, $"snapshot should have {dataSet1.Count} adds"); - results.Messages[0].Removes.Should().Be(0, "no removes"); - results.Messages[0].Updates.Should().Be(0, "no updates"); - results.Messages[0].Select(x => x.Key).Should().Equal(dataSet1, "snapshot should contain first batch keys"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("exactly one message after resume"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(dataSet1.Count).Because($"snapshot should have {dataSet1.Count} adds"); + await Assert.That(results.Messages[0].Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Messages[0].Updates).IsEqualTo(0).Because("no updates"); + await Assert.That(results.Messages[0].Select(x => x.Key)).IsEquivalentTo(dataSet1).Because("snapshot should contain first batch keys"); // Re-suspend, write second batch var suspend2 = cache.SuspendNotifications(); cache.AddOrUpdate(dataSet2); - results.Messages.Count.Should().Be(1, "still one message — second batch held by suspension"); - results.Summary.Overall.Adds.Should().Be(dataSet1.Count, $"still {dataSet1.Count} adds total"); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("still one message — second batch held by suspension"); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(dataSet1.Count).Because($"still {dataSet1.Count} adds total"); // Final resume suspend2.Dispose(); - results.Messages.Count.Should().Be(2, "two messages total"); - results.Messages[1].Adds.Should().Be(dataSet2.Count, $"second message has {dataSet2.Count} adds"); - results.Messages[1].Removes.Should().Be(0, "no removes in second message"); - results.Messages[1].Updates.Should().Be(0, "no updates in second message"); - results.Messages[1].Select(x => x.Key).Should().Equal(dataSet2, "second message should contain second batch keys"); - - results.Summary.Overall.Adds.Should().Be(allData.Count, $"exactly {allData.Count} adds total"); - results.Summary.Overall.Removes.Should().Be(0, "no removes"); - results.Data.Count.Should().Be(allData.Count, $"{allData.Count} items in final state"); - results.Error.Should().BeNull(); - results.IsCompleted.Should().BeFalse(); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("two messages total"); + await Assert.That(results.Messages[1].Adds).IsEqualTo(dataSet2.Count).Because($"second message has {dataSet2.Count} adds"); + await Assert.That(results.Messages[1].Removes).IsEqualTo(0).Because("no removes in second message"); + await Assert.That(results.Messages[1].Updates).IsEqualTo(0).Because("no updates in second message"); + await Assert.That(results.Messages[1].Select(x => x.Key)).IsEquivalentTo(dataSet2).Because("second message should contain second batch keys"); + + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"exactly {allData.Count} adds total"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count).Because($"{allData.Count} items in final state"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsFalse(); } - [Fact] - public void ReSuspendThenResumeDeliversAllInSingleBatch() + [Test] + public async Task ReSuspendThenResumeDeliversAllInSingleBatch() { // Forces the ordering: re-suspend before resume. // Suspend count goes 1→2→1, no resume signal fires. @@ -457,7 +457,7 @@ public void ReSuspendThenResumeDeliversAllInSingleBatch() cache.AddOrUpdate(dataSet1); using var results = cache.Connect().AsAggregator(); - results.Messages.Count.Should().Be(0, "no messages during suspension"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages during suspension"); // Re-suspend first — count goes 1→2 var suspend2 = cache.SuspendNotifications(); @@ -465,38 +465,38 @@ public void ReSuspendThenResumeDeliversAllInSingleBatch() // Resume first suspend — count goes 2→1, still suspended suspend1.Dispose(); - results.Messages.Count.Should().Be(0, "no messages — still suspended (count=1)"); - results.Summary.Overall.Adds.Should().Be(0, "no adds — still suspended"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages — still suspended (count=1)"); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(0).Because("no adds — still suspended"); // Write second batch while still suspended cache.AddOrUpdate(dataSet2); - results.Messages.Count.Should().Be(0, "still no messages"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("still no messages"); // Final resume — count goes 1→0 suspend2.Dispose(); - results.Messages.Count.Should().Be(1, "single message with all data"); - results.Messages[0].Adds.Should().Be(allData.Count, $"all {allData.Count} items in one changeset"); - results.Messages[0].Removes.Should().Be(0, "no removes"); - results.Messages[0].Updates.Should().Be(0, "no updates"); - results.Messages[0].Select(c => c.Key).OrderBy(k => k).Should().Equal(allData, "should contain both batches in order"); - - results.Summary.Overall.Adds.Should().Be(allData.Count, $"exactly {allData.Count} adds total"); - results.Summary.Overall.Removes.Should().Be(0, "no removes"); - results.Summary.Overall.Updates.Should().Be(0, "no updates"); - results.Data.Count.Should().Be(allData.Count, $"{allData.Count} items in final state"); - results.Error.Should().BeNull(); - results.IsCompleted.Should().BeFalse(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("single message with all data"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(allData.Count).Because($"all {allData.Count} items in one changeset"); + await Assert.That(results.Messages[0].Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Messages[0].Updates).IsEqualTo(0).Because("no updates"); + await Assert.That(results.Messages[0].Select(c => c.Key).OrderBy(k => k)).IsEquivalentTo(allData).Because("should contain both batches in order"); + + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"exactly {allData.Count} adds total"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0).Because("no updates"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count).Because($"{allData.Count} items in final state"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsFalse(); } - [Fact] - public void OnErrorFiresIfCacheFailsWhileSuspended() + [Test] + public async Task OnErrorFiresIfCacheFailsWhileSuspended() { // A connection made while suspended is deferred, and must still be told when the source // fails. Reporting the failure as a successful completion leaves the subscriber's error // handling unrun and its data looking complete. - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var cache = new IntermediateCache(source); using var suspend = cache.SuspendNotifications(); @@ -505,15 +505,15 @@ public void OnErrorFiresIfCacheFailsWhileSuspended() var expectedError = new Exception("Test Exception"); source.OnError(expectedError); - results.Error.Should().Be(expectedError, "a connection deferred by a suspension should see the source fail"); - results.IsCompleted.Should().BeFalse("the source failed, it did not complete"); + await Assert.That(results.Error).IsEqualTo(expectedError).Because("a connection deferred by a suspension should see the source fail"); + await Assert.That(results.IsCompleted).IsFalse().Because("the source failed, it did not complete"); } - [Fact] - public void OnErrorFiresIfCacheFailsWhileWatchIsSuspended() + [Test] + public async Task OnErrorFiresIfCacheFailsWhileWatchIsSuspended() { // Watch defers the same way Connect does, and has the same obligation. - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var cache = new IntermediateCache(source); using var suspend = cache.SuspendNotifications(); @@ -524,16 +524,16 @@ public void OnErrorFiresIfCacheFailsWhileWatchIsSuspended() var expectedError = new Exception("Test Exception"); source.OnError(expectedError); - actualError.Should().Be(expectedError, "a watch deferred by a suspension should see the source fail"); - isCompleted.Should().BeFalse("the source failed, it did not complete"); + await Assert.That(actualError).IsEqualTo(expectedError).Because("a watch deferred by a suspension should see the source fail"); + await Assert.That(isCompleted).IsFalse().Because("the source failed, it did not complete"); } - [Fact] - public void OnErrorFiresIfCacheFailsAfterResumingWhileConnectionWasSuspended() + [Test] + public async Task OnErrorFiresIfCacheFailsAfterResumingWhileConnectionWasSuspended() { // The deferred connection has activated by the time the failure arrives, so this covers // the path through the connection itself rather than through the suspension gate. - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var cache = new IntermediateCache(source); var suspend = cache.SuspendNotifications(); @@ -544,8 +544,8 @@ public void OnErrorFiresIfCacheFailsAfterResumingWhileConnectionWasSuspended() var expectedError = new Exception("Test Exception"); source.OnError(expectedError); - results.Error.Should().Be(expectedError, "an activated connection should still see the source fail"); - results.Data.Count.Should().Be(1, "the data written before the failure should have arrived"); + await Assert.That(results.Error).IsEqualTo(expectedError).Because("an activated connection should still see the source fail"); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("the data written before the failure should have arrived"); } public void Dispose() diff --git a/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.cs b/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.cs index 816b3a12c..dc6d7f1f6 100644 --- a/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.cs +++ b/src/DynamicData.Tests/Cache/SuspendNotificationsFixture.cs @@ -1,3 +1,583 @@ -namespace DynamicData.Tests.Cache; - -public static partial class SuspendNotificationsFixture; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else +using DynamicData.Kernel; +#endif + +namespace DynamicData.Tests.Cache; + +[NotInParallel] +public sealed class SuspendNotificationsRegressionFixture : IDisposable +{ + private readonly SourceCache _source = new(static x => x); + + private readonly ChangeSetAggregator _results; + + private readonly List _countChangeHistory = []; + + private readonly IDisposable _countChangeSubscription; + + public SuspendNotificationsRegressionFixture() + { + _results = _source.Connect().AsAggregator(); + _countChangeSubscription = _source.CountChanged.Do(_countChangeHistory.Add).Subscribe(); + } + + [Test] + public async Task NotificationsCanBeSuspended() + { + // Arrange + using var suspend = _source.SuspendNotifications(); + + // Act + _source.AddOrUpdate(1); + + // Assert + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task SuspendingNotificationsDoesNotImpactPreview() + { + // Arrange + using var previewResults = _source.Preview().AsAggregator(); + using var suspend = _source.SuspendNotifications(); + + // Act + _source.AddOrUpdate(1); + + // Assert + await Assert.That(previewResults.Messages.Count).IsEqualTo(1).Because("should have received a message in Preview"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("should not have gotten any updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task SuspendingNotificationsPreventsWatch() + { + // Arrange + var gotData = false; + using var suspend = _source.SuspendNotifications(); + using var sub = _source.Watch(1).Do(_ => gotData = true).Subscribe(); + + // Act + _source.AddOrUpdate(1); + + // Assert + await Assert.That(gotData).IsFalse().Because("Should not have received data after suspend"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task NotificationsCanBeResumed() + { + // Arrange + { + using var suspend = _source.SuspendNotifications(); + } + + // Act + Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); + + // Assert + await Assert.That(_results.Messages.Count).IsEqualTo(37).Because("Should receive updates after resume"); + await Assert.That(_results.Data.Count).IsEqualTo(37).Because("Should receive data after resume"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task ExistingDataNotEmittedWhileSuspended() + { + // Arrange + var suspend = _source.SuspendNotifications(); + Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); + + // Act + using var results = _source.Connect().AsAggregator(); + + // Assert + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task ExistingDataNotEmittedViaWatchUntilResumed() + { + // Arrange + var gotData = false; + var suspend = _source.SuspendNotifications(); + Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); + using var sub = _source.Watch(1).Do(_ => gotData = true).Subscribe(); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(gotData).IsTrue().Because("should have received a notice after the suspend was released"); + } + + [Test] + public async Task ExistingDataNotEmittedUntilResumed() + { + // Arrange + var suspend = _source.SuspendNotifications(); + Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); + using var results = _source.Connect().AsAggregator(); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("Should receive updates after resume"); + await Assert.That(results.Data.Count).IsEqualTo(37).Because("Should receive data after resume"); + await Assert.That(results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task ExistingAndNewDataEmittedAsASingleChangesetOnResume() + { + // Arrange + var suspend = _source.SuspendNotifications(); + Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); + using var results = _source.Connect().AsAggregator(); + Enumerable.Range(101, 37).ForEach(_source.AddOrUpdate); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(results.Data.Count).IsEqualTo(37 * 2).Because("Should receive data after resume"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task PendingNotificationsEmittedAsSingleChangeSetOnResume() + { + // Arrange + var suspend = _source.SuspendNotifications(); + Enumerable.Range(1, 37).ForEach(_source.AddOrUpdate); + _source.RemoveKey(1); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(_results.Data.Count).IsEqualTo(36).Because("Should receive data after resume"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(37).Because("Should have 37 adds"); + await Assert.That(_results.Messages[0].Removes).IsEqualTo(1).Because("Should show the remove"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task MultipleSuspendsAreCumulative() + { + // Arrange + var suspend = _source.SuspendNotifications(); + using var suspend2 = _source.SuspendNotifications(); + _source.AddOrUpdate(1); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should not receive data after suspend"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task MultipleSuspendsCanBeResumed() + { + // Arrange + var suspend = _source.SuspendNotifications(); + var suspend2 = _source.SuspendNotifications(); + _source.AddOrUpdate(1); + suspend.Dispose(); + + // Act + suspend2.Dispose(); + + // Assert + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should receive updates after resume"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should receive data after resume"); + await Assert.That(_results.IsCompleted).IsFalse().Because("IsCompleted should not have fired"); + } + + [Test] + public async Task OnCompletedFiresIfCacheDisposedWhileSuspended() + { + // Arrange + using var suspend = _source.SuspendNotifications(); + using var results = _source.Connect().AsAggregator(); + Enumerable.Range(101, 37).ForEach(_source.AddOrUpdate); + + // Act + _source.Dispose(); + + // Assert + await Assert.That(results.IsCompleted).IsTrue().Because("IsCompleted should fire even if Notifications are suspended"); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("Shouldn't receive any Changesets"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("Shouldn't receive any Data"); + } + + [Test] + public async Task CountNotificationsCanBeSuspended() + { + // Arrange + using var suspend = _source.SuspendCount(); + + // Act + _source.AddOrUpdate(1); + + // Assert + await Assert.That(_countChangeHistory.Count).IsEqualTo(1).Because("Should Not receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have only received the empty list"); + } + + [Test] + public async Task CountNotificationsCanBeResumed() + { + // Arrange + { + using var suspend = _source.SuspendCount(); + } + + // Act + _source.AddOrUpdate(1); + + // Assert + await Assert.That(_countChangeHistory.Count).IsEqualTo(2).Because("Should receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have received the empty list"); + await Assert.That(_countChangeHistory[1]).IsEqualTo(1).Because("Should have received the updated count"); + } + + [Test] + public async Task CountChangedAlwaysStartsWithInitialEvenWhenSuspended() + { + // Arrange + _source.AddOrUpdate(Enumerable.Range(1, 50)); + var countChangeHistory = new List(); + using var suspend = _source.SuspendCount(); + using var countChangeSubscription = _source.CountChanged.Do(countChangeHistory.Add).Subscribe(); + + // Act + Enumerable.Range(100, 50).ForEach(_source.AddOrUpdate); + + // Assert + await Assert.That(countChangeHistory.Count).IsEqualTo(1).Because("Should receive initial value"); + await Assert.That(countChangeHistory[0]).IsEqualTo(50).Because("Should have received the correct initial value"); + } + + [Test] + public async Task PendingCountNotificationsEmittedOnResume() + { + // Arrange + var suspend = _source.SuspendCount(); + _source.AddOrUpdate(1); + _source.AddOrUpdate(2); + _source.AddOrUpdate(3); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(_countChangeHistory.Count).IsEqualTo(2).Because("Should receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have received the initial 0 count"); + await Assert.That(_countChangeHistory[1]).IsEqualTo(3).Because("Should have received the updated count"); + } + + [Test] + public async Task MultipleCountSuspendsAreCumulative() + { + // Arrange + var suspend = _source.SuspendCount(); + using var suspend2 = _source.SuspendCount(); + _source.AddOrUpdate(1); + _source.AddOrUpdate(2); + _source.AddOrUpdate(3); + + // Act + suspend.Dispose(); + + // Assert + await Assert.That(_countChangeHistory.Count).IsEqualTo(1).Because("Should Not receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have only received the empty list"); + } + + [Test] + public async Task MultipleCountSuspendsCanBeResumed() + { + // Arrange + var suspend = _source.SuspendCount(); + var suspend2 = _source.SuspendCount(); + _source.AddOrUpdate(1); + _source.AddOrUpdate(2); + _source.AddOrUpdate(3); + suspend.Dispose(); + + // Act + suspend2.Dispose(); + + // Assert + await Assert.That(_countChangeHistory.Count).IsEqualTo(2).Because("Should receive count updates"); + await Assert.That(_countChangeHistory[0]).IsEqualTo(0).Because("Should have received the initial 0 count"); + await Assert.That(_countChangeHistory[1]).IsEqualTo(3).Because("Should have received the updated count"); + } + + [Test] + public async Task SuspensionsAreThreadSafe() + { + // Arrange + var suspend = _source.SuspendNotifications(); + var tasks = Enumerable.Range(1, 100).Select(x => Task.Run(() => _source.AddOrUpdate(x))).ToArray(); + await Task.WhenAll(tasks); + + // Act + await Task.Run(suspend.Dispose); + + // Assert + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should receive data after resume"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should receive single changeset on resume"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should have 100 adds"); + } + + [Test] + public async Task ResumeThenReSuspendDeliversFirstBatchOnly() + { + // Forces the ordering: resume completes before re-suspend. + // The deferred subscriber activates with the first batch snapshot, + // then re-suspend holds the second batch until final resume. + using var cache = new SourceCache(static x => x); + var dataSet1 = Enumerable.Range(0, 100).ToList(); + var dataSet2 = Enumerable.Range(1000, 100).ToList(); + var allData = dataSet1.Concat(dataSet2).ToList(); + + var suspend1 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet1); + + using var results = cache.Connect().AsAggregator(); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages during suspension"); + + // Resume first — subscriber activates + suspend1.Dispose(); + + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("exactly one message after resume"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(dataSet1.Count).Because($"snapshot should have {dataSet1.Count} adds"); + await Assert.That(results.Messages[0].Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Messages[0].Updates).IsEqualTo(0).Because("no updates"); + await Assert.That(results.Messages[0].Select(x => x.Key)).IsEquivalentTo(dataSet1).Because("snapshot should contain first batch keys"); + + // Re-suspend, write second batch + var suspend2 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet2); + + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("still one message — second batch held by suspension"); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(dataSet1.Count).Because($"still {dataSet1.Count} adds total"); + + // Final resume + suspend2.Dispose(); + + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("two messages total"); + await Assert.That(results.Messages[1].Adds).IsEqualTo(dataSet2.Count).Because($"second message has {dataSet2.Count} adds"); + await Assert.That(results.Messages[1].Removes).IsEqualTo(0).Because("no removes in second message"); + await Assert.That(results.Messages[1].Updates).IsEqualTo(0).Because("no updates in second message"); + await Assert.That(results.Messages[1].Select(x => x.Key)).IsEquivalentTo(dataSet2).Because("second message should contain second batch keys"); + + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"exactly {allData.Count} adds total"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count).Because($"{allData.Count} items in final state"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsFalse(); + } + + [Test] + public async Task ReSuspendThenResumeDeliversAllInSingleBatch() + { + // Forces the ordering: re-suspend before resume. + // Suspend count goes 1→2→1, no resume signal fires. + // Both batches accumulate and arrive as a single changeset on final resume. + using var cache = new SourceCache(static x => x); + var dataSet1 = Enumerable.Range(0, 100).ToList(); + var dataSet2 = Enumerable.Range(1000, 100).ToList(); + var allData = dataSet1.Concat(dataSet2).ToList(); + + var suspend1 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet1); + + using var results = cache.Connect().AsAggregator(); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages during suspension"); + + // Re-suspend first — count goes 1→2 + var suspend2 = cache.SuspendNotifications(); + + // Resume first suspend — count goes 2→1, still suspended + suspend1.Dispose(); + + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages — still suspended (count=1)"); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(0).Because("no adds — still suspended"); + + // Write second batch while still suspended + cache.AddOrUpdate(dataSet2); + + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("still no messages"); + + // Final resume — count goes 1→0 + suspend2.Dispose(); + + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("single message with all data"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(allData.Count).Because($"all {allData.Count} items in one changeset"); + await Assert.That(results.Messages[0].Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Messages[0].Updates).IsEqualTo(0).Because("no updates"); + await Assert.That(results.Messages[0].Select(c => c.Key).OrderBy(k => k)).IsEquivalentTo(allData).Because("should contain both batches in order"); + + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"exactly {allData.Count} adds total"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0).Because("no updates"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count).Because($"{allData.Count} items in final state"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsFalse(); + } + + [Test] + public async Task ConcurrentSuspendDuringResumeDoesNotCorrupt() + { + // Stress test: races resume against re-suspend on two threads. + // Both orderings are correct (tested deterministically above). + // This test verifies no corruption, deadlocks, or data loss under contention. + const int iterations = 200; + var dataSet1 = Enumerable.Range(0, 100).ToList(); + var dataSet2 = Enumerable.Range(1000, 100).ToList(); + var allData = dataSet1.Concat(dataSet2).ToList(); + + for (var iter = 0; iter < iterations; iter++) + { + using var cache = new SourceCache(static x => x); + + var suspend1 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet1); + using var results = cache.Connect().AsAggregator(); + + using var barrier = new Barrier(2); + var resumeTask = Task.Run(() => + { + barrier.SignalAndWait(); + suspend1.Dispose(); + }); + + var reSuspendTask = Task.Run(() => + { + barrier.SignalAndWait(); + return cache.SuspendNotifications(); + }); + + await Task.WhenAll(resumeTask, reSuspendTask); + var suspend2 = await reSuspendTask; + + cache.AddOrUpdate(dataSet2); + suspend2.Dispose(); + + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"iteration {iter}: exactly {allData.Count} adds"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because($"iteration {iter}: no removes"); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0).Because($"iteration {iter}: no updates because keys don't overlap"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count).Because($"iteration {iter}: {allData.Count} items in final state"); + await Assert.That(results.Data.Keys.OrderBy(k => k)).IsEquivalentTo(allData).Because($"iteration {iter}: all keys present in order"); + await Assert.That(results.Error).IsNull().Because($"iteration {iter}: no errors"); + await Assert.That(results.IsCompleted).IsFalse().Because($"iteration {iter}: not completed"); + } + } + + [Test] + public async Task ResumeSignalUnderLockPreventsStaleSnapshotFromReSuspend() + { + // Verifies that a deferred Connect subscriber never sees data written during + // a re-suspension. The resume signal fires under the lock (reentrant), so the + // deferred subscriber activates and takes its snapshot before any other thread + // can re-suspend or write new data. + // + // A slow first subscriber blocks delivery of accumulated changes, creating a + // window where the main thread re-suspends and writes a second batch. The + // deferred subscriber's snapshot must contain only the first batch. + using var cache = new SourceCache(static x => x); + var dataSet1 = Enumerable.Range(0, 100).ToList(); + var dataSet2 = Enumerable.Range(1000, 100).ToList(); + var allData = dataSet1.Concat(dataSet2).ToList(); + + using var delivering = new SemaphoreSlim(0, 1); + using var proceedWithResuspend = new SemaphoreSlim(0, 1); + + var suspend1 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet1); + + // First subscriber blocks on delivery to hold the delivery thread + var firstDelivery = true; + using var slowSub = cache.Connect().Subscribe(_ => + { + if (firstDelivery) + { + firstDelivery = false; + delivering.Release(); + proceedWithResuspend.Wait(TimeSpan.FromSeconds(5)); + } + }); + + // Deferred subscriber — will activate when resume signal fires + using var results = cache.Connect().AsAggregator(); + await Assert.That(results.Messages.Count).IsEqualTo(0).Because("no messages during suspension"); + + // Resume on background thread — delivery blocks on slow subscriber + var resumeTask = Task.Run(() => suspend1.Dispose()); + await Assert.That((await delivering.WaitAsync(TimeSpan.FromSeconds(5)))).IsTrue().Because("delivery should have started"); + + // Re-suspend and write second batch while delivery is blocked + var suspend2 = cache.SuspendNotifications(); + cache.AddOrUpdate(dataSet2); + + // dataSet2 must not appear in any message received so far + foreach (var msg in results.Messages) + { + foreach (var change in msg) + { + await Assert.That(change.Key is >= 0 and <= 99) + .IsTrue().Because("deferred subscriber should only have first-batch keys before second resume"); + } + } + + // Unblock delivery + proceedWithResuspend.Release(); + await resumeTask; + + // Only dataSet1 should have been delivered — dataSet2 is held by second suspension + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(dataSet1.Count).Because($"exactly {dataSet1.Count} adds before second resume — dataSet2 must be held by suspension"); + await Assert.That(results.Messages).HasCount(1).Because("exactly one message (snapshot of dataSet1)"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(dataSet1.Count); + await Assert.That(results.Messages[0].Select(c => c.Key)).IsEquivalentTo(dataSet1).Because("snapshot should contain exactly first-batch keys in order"); + + // Resume second suspension — dataSet2 arrives now + suspend2.Dispose(); + + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(allData.Count).Because($"exactly {allData.Count} adds total"); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0).Because("no removes"); + await Assert.That(results.Messages).HasCount(2).Because("two messages: snapshot + second batch"); + await Assert.That(results.Messages[1].Adds).IsEqualTo(dataSet2.Count); + await Assert.That(results.Messages[1].Select(c => c.Key)).IsEquivalentTo(dataSet2).Because("second message should contain exactly second-batch keys in order"); + await Assert.That(results.Data.Count).IsEqualTo(allData.Count); + await Assert.That(results.Data.Keys.OrderBy(k => k)).IsEquivalentTo(allData); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsFalse(); + } + + public void Dispose() + { + _source.Dispose(); + _results.Dispose(); + _countChangeSubscription.Dispose(); + } +} diff --git a/src/DynamicData.Tests/Cache/SwitchFixture.cs b/src/DynamicData.Tests/Cache/SwitchFixture.cs index d98bf2ad2..e5f065b34 100644 --- a/src/DynamicData.Tests/Cache/SwitchFixture.cs +++ b/src/DynamicData.Tests/Cache/SwitchFixture.cs @@ -1,135 +1,122 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading; using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; public class SwitchFixture { - [Fact] - public void ClearsForNewSource() + [Test] + public async Task ClearsForNewSource() { using var source = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>(source); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>(source); var results = switchable.Switch().AsAggregator(); - var inital = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); source.AddOrUpdate(inital); - results.Data.Count.Should().Be(100); + await Assert.That(results.Data.Count).IsEqualTo(100); var newSource = new SourceCache(p => p.Name); switchable.OnNext(newSource); - results.Data.Count.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); newSource.AddOrUpdate(inital); - results.Data.Count.Should().Be(100); + await Assert.That(results.Data.Count).IsEqualTo(100); var nextUpdates = Enumerable.Range(101, 100).Select(i => new Person("Person" + i, i)).ToArray(); newSource.AddOrUpdate(nextUpdates); - results.Data.Count.Should().Be(200); + await Assert.That(results.Data.Count).IsEqualTo(200); } - [Fact] - public void PoulatesFirstSource() + [Test] + public async Task PoulatesFirstSource() { using var source = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>(source); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>(source); var results = switchable.Switch().AsAggregator(); - var inital = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); source.AddOrUpdate(inital); - results.Data.Count.Should().Be(100); + await Assert.That(results.Data.Count).IsEqualTo(100); } - [Fact] - public void PropagatesOuterErrors() + [Test] + public async Task PropagatesOuterErrors() { using var source = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>(source); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>(source); var results = switchable.Switch().AsAggregator(); - var inital = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); source.AddOrUpdate(inital); var error = new Exception("Test"); switchable.OnError(error); - results.Error.Should().Be(error); + await Assert.That(results.Error).IsEqualTo(error); } - [Fact] - public void PropagatesInnerErrors() + [Test] + public async Task PropagatesInnerErrors() { using var source = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>>(source.Connect()); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>>(source.Connect()); var results = switchable.Switch().AsAggregator(); - var inital = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); source.AddOrUpdate(inital); - using var source2 = new BehaviorSubject>(ChangeSet.Empty); + using var source2 = new ReactiveUI.Primitives.Signals.StateSignal>(ChangeSet.Empty); switchable.OnNext(source2); var error = new Exception("Test"); source2.OnError(error); - results.Error.Should().Be(error); + await Assert.That(results.Error).IsEqualTo(error); } - [Fact] - public void CompletesWhenSourcesAndInnerComplete() + [Test] + public async Task CompletesWhenSourcesAndInnerComplete() { using var source = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>>(source.Connect()); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>>(source.Connect()); using var results = switchable.Switch().AsAggregator(); source.AddOrUpdate(Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray()); switchable.OnCompleted(); - results.IsCompleted.Should().BeFalse("the inner sequence is still running"); + await Assert.That(results.IsCompleted).IsFalse().Because("the inner sequence is still running"); source.Dispose(); - results.IsCompleted.Should().BeTrue("both the sources and the inner sequence have completed"); - results.Error.Should().BeNull(); - results.Data.Count.Should().Be(100, "all data should have been received before completion"); + await Assert.That(results.IsCompleted).IsTrue().Because("both the sources and the inner sequence have completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Data.Count).IsEqualTo(100).Because("all data should have been received before completion"); } - [Fact] - public void DoesNotCompleteWhileInnerIsStillRunning() + [Test] + public async Task DoesNotCompleteWhileInnerIsStillRunning() { using var source = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>>(source.Connect()); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>>(source.Connect()); using var results = switchable.Switch().AsAggregator(); switchable.OnCompleted(); source.AddOrUpdate(new Person("Person1", 1)); - results.IsCompleted.Should().BeFalse("the inner sequence has not completed"); - results.Data.Count.Should().Be(1, "changes should still flow after the sources sequence completes"); + await Assert.That(results.IsCompleted).IsFalse().Because("the inner sequence has not completed"); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("changes should still flow after the sources sequence completes"); } - [Fact] - public void DoesNotCompleteWhenOnlyASupersededInnerCompletes() + [Test] + public async Task DoesNotCompleteWhenOnlyASupersededInnerCompletes() { using var first = new SourceCache(p => p.Name); using var second = new SourceCache(p => p.Name); - using var switchable = new BehaviorSubject>>(first.Connect()); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>>(first.Connect()); using var results = switchable.Switch().AsAggregator(); switchable.OnNext(second.Connect()); @@ -137,72 +124,72 @@ public void DoesNotCompleteWhenOnlyASupersededInnerCompletes() first.Dispose(); - results.IsCompleted.Should().BeFalse("the superseded sequence is not the current one"); + await Assert.That(results.IsCompleted).IsFalse().Because("the superseded sequence is not the current one"); second.AddOrUpdate(new Person("Person1", 1)); - results.Data.Count.Should().Be(1, "the current sequence should still be delivering"); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("the current sequence should still be delivering"); second.Dispose(); - results.IsCompleted.Should().BeTrue("the current sequence has now completed"); + await Assert.That(results.IsCompleted).IsTrue().Because("the current sequence has now completed"); } - [Fact] - public void CompletesWhenSourcesAndInnerCompleteSynchronously() + [Test] + public async Task CompletesWhenSourcesAndInnerCompleteSynchronously() { using var results = Observable.Return(Observable.Empty>()).Switch().AsAggregator(); - results.IsCompleted.Should().BeTrue("everything completed during subscription"); - results.Error.Should().BeNull(); + await Assert.That(results.IsCompleted).IsTrue().Because("everything completed during subscription"); + await Assert.That(results.Error).IsNull(); } - [Fact] - public void DeliversChangesEmittedBeforeSynchronousCompletion() + [Test] + public async Task DeliversChangesEmittedBeforeSynchronousCompletion() { var change = new ChangeSet { new(ChangeReason.Add, "Person1", new Person("Person1", 1)) }; using var results = Observable.Return(Observable.Return((IChangeSet)change)).Switch().AsAggregator(); - results.Data.Count.Should().Be(1, "changes emitted before a synchronous completion must not be lost"); - results.IsCompleted.Should().BeTrue("the source completed"); - results.Error.Should().BeNull(); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("changes emitted before a synchronous completion must not be lost"); + await Assert.That(results.IsCompleted).IsTrue().Because("the source completed"); + await Assert.That(results.Error).IsNull(); } - [Fact] - public void IgnoresChangesFromASupersededSource() + [Test] + public async Task IgnoresChangesFromASupersededSource() { - using var first = new Subject>(); - using var second = new Subject>(); - using var switchable = new BehaviorSubject>>(first); + using var first = new ReactiveUI.Primitives.Signals.Signal>(); + using var second = new ReactiveUI.Primitives.Signals.Signal>(); + using var switchable = new ReactiveUI.Primitives.Signals.StateSignal>>(first); using var results = switchable.Switch().AsAggregator(); first.OnNext(new ChangeSet { new(ChangeReason.Add, "Person1", new Person("Person1", 1)) }); - results.Data.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(1); switchable.OnNext(second); - results.Data.Count.Should().Be(0, "moving to a new source drops what the previous one contributed"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("moving to a new source drops what the previous one contributed"); first.OnNext(new ChangeSet { new(ChangeReason.Add, "Person2", new Person("Person2", 2)) }); - results.Data.Count.Should().Be(0, "a superseded source must not be able to write into the result"); - results.Error.Should().BeNull(); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("a superseded source must not be able to write into the result"); + await Assert.That(results.Error).IsNull(); } - [Fact] - public void PropagatesInnerErrorsRaisedSynchronously() + [Test] + public async Task PropagatesInnerErrorsRaisedSynchronously() { var error = new Exception("Test"); using var results = Observable.Return(Observable.Throw>(error)).Switch().AsAggregator(); - results.Error.Should().Be(error, "the error was raised during subscription"); + await Assert.That(results.Error).IsEqualTo(error).Because("the error was raised during subscription"); } - [Fact] - public void DoesNotHoldALockWhileDeliveringDownstream() + [Test] + public async Task DoesNotHoldALockWhileDeliveringDownstream() { // Observable.Switch holds its gate for the whole of downstream delivery, which is the shape that // deadlocks when a pipeline crosses into another cache. Delivery has to go through the queue, which // enqueues and returns, so a producer is never held up by whatever a subscriber is doing. - using var switchable = new Subject>>(); - using var first = new Subject>(); + using var switchable = new ReactiveUI.Primitives.Signals.Signal>>(); + using var first = new ReactiveUI.Primitives.Signals.Signal>(); using var isDelivering = new ManualResetEventSlim(false); using var release = new ManualResetEventSlim(false); @@ -218,9 +205,9 @@ public void DoesNotHoldALockWhileDeliveringDownstream() var deliverer = new Thread(() => first.OnNext(new ChangeSet { new(ChangeReason.Add, "a", new Person("a", 1)) })) { IsBackground = true }; deliverer.Start(); - isDelivering.Wait(TimeSpan.FromSeconds(10)).Should().BeTrue("the subscriber should have been handed the change"); + await Assert.That(isDelivering.Wait(TimeSpan.FromSeconds(10))).IsTrue().Because("the subscriber should have been handed the change"); - var producer = new Thread(() => switchable.OnNext(new Subject>())) { IsBackground = true }; + var producer = new Thread(() => switchable.OnNext(new ReactiveUI.Primitives.Signals.Signal>())) { IsBackground = true }; producer.Start(); var producerFinished = producer.Join(TimeSpan.FromSeconds(2)); @@ -229,11 +216,11 @@ public void DoesNotHoldALockWhileDeliveringDownstream() deliverer.Join(TimeSpan.FromSeconds(10)); producer.Join(TimeSpan.FromSeconds(10)); - producerFinished.Should().BeTrue("writing to the source must not block while a subscriber holds onto a notification"); + await Assert.That(producerFinished).IsTrue().Because("writing to the source must not block while a subscriber holds onto a notification"); } - [Fact] - public void IgnoresErrorsFromASupersededSource() + [Test] + public async Task IgnoresErrorsFromASupersededSource() { // Switching away from a source means anything it produces afterwards belongs to a source that // is no longer selected, and that includes its failures. Ordinarily disposal stops a @@ -248,21 +235,21 @@ public void IgnoresErrorsFromASupersededSource() return Disposable.Empty; }); - using var switchable = new Subject>>(); - using var current = new Subject>(); + using var switchable = new ReactiveUI.Primitives.Signals.Signal>>(); + using var current = new ReactiveUI.Primitives.Signals.Signal>(); using var results = switchable.Switch().AsAggregator(); switchable.OnNext(superseded); switchable.OnNext(current); - supersededObserver.Should().NotBeNull("the superseded source should have been subscribed"); + await Assert.That(supersededObserver).IsNotNull().Because("the superseded source should have been subscribed"); supersededObserver!.OnError(new Exception("Test")); - results.Error.Should().BeNull("the failed source had already been switched away from"); + await Assert.That(results.Error).IsNull().Because("the failed source had already been switched away from"); current.OnNext(new ChangeSet { new(ChangeReason.Add, "a", new Person("a", 1)) }); - results.Data.Count.Should().Be(1, "the selected source should still be delivering"); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("the selected source should still be delivering"); } } diff --git a/src/DynamicData.Tests/Cache/ToCollectionFixture.cs b/src/DynamicData.Tests/Cache/ToCollectionFixture.cs index e4d18f9aa..7efa058a4 100644 --- a/src/DynamicData.Tests/Cache/ToCollectionFixture.cs +++ b/src/DynamicData.Tests/Cache/ToCollectionFixture.cs @@ -1,11 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Subjects; -using FluentAssertions; -using Xunit; -using Xunit.Abstractions; using DynamicData.Tests.Utilities; @@ -13,21 +9,19 @@ namespace DynamicData.Tests.Cache; public class ToCollectionFixture { - public ToCollectionFixture(ITestOutputHelper output) - => _output = output; public record TestItem { public static int SelectId(TestItem item) => item.Id; - + public required int Id { get; init; } - + public int Version { get; init; } } - [Fact] - public void WhenChangesAreMade_ResultMatchesSourceAndPriorResultsAreNotMutated() + [Test] + public async Task WhenChangesAreMade_ResultMatchesSourceAndPriorResultsAreNotMutated() { // Setup using var source = new SourceCache(TestItem.SelectId); @@ -39,16 +33,10 @@ public void WhenChangesAreMade_ResultMatchesSourceAndPriorResultsAreNotMutated() using var subscription = source.Connect() .ToCollection() .RecordValues(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - // TODO: Disabled due to existing defect. Fix and restore. - //results.RecordedValues.Should().ContainSingle("an initial snapshot should always be published"); - //results.RecordedValues[^1].Should().BeEmpty("no items have been added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - // TODO: Disabled due to existing defect. Fix and restore. - //priorResults.Add(results.RecordedValues[^1].ToArray()); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); + // UUT Action (add items) source.AddOrUpdate(new[] @@ -57,18 +45,18 @@ public void WhenChangesAreMade_ResultMatchesSourceAndPriorResultsAreNotMutated() new TestItem() { Id = 2 }, new TestItem() { Id = 3 } }); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Skip(priorResults.Count).Should().ContainSingle("a single source operation was performed"); - results.RecordedValues[^1].Should().BeEquivalentTo(source.Items, "snapshots should always match the source collection"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count - priorResults.Count).IsEqualTo(1); + await Assert.That(results.RecordedValues[^1]).IsEquivalentTo(source.Items); + await Assert.That(results.HasCompleted).IsFalse(); foreach (var (result, priorResult) in results.RecordedValues.Zip(priorResults)) - result.Should().BeEquivalentTo(priorResult, "previous snapshots should not be mutated"); + await Assert.That(result).IsEquivalentTo(priorResult); priorResults.Add(results.RecordedValues[^1].ToArray()); - - + + // UUT Action (replace items) source.AddOrUpdate(new[] { @@ -76,36 +64,36 @@ public void WhenChangesAreMade_ResultMatchesSourceAndPriorResultsAreNotMutated() new TestItem() { Id = 2, Version = 1 }, new TestItem() { Id = 3, Version = 1 } }); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Skip(priorResults.Count).Should().ContainSingle("a single source operation was performed"); - results.RecordedValues[^1].Should().BeEquivalentTo(source.Items, "snapshots should always match the source collection"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count - priorResults.Count).IsEqualTo(1); + await Assert.That(results.RecordedValues[^1]).IsEquivalentTo(source.Items); + await Assert.That(results.HasCompleted).IsFalse(); foreach (var (result, priorResult) in results.RecordedValues.Zip(priorResults)) - result.Should().BeEquivalentTo(priorResult, "previous snapshots should not be mutated"); + await Assert.That(result).IsEquivalentTo(priorResult); priorResults.Add(results.RecordedValues[^1].ToArray()); // UUT Action (remove items) source.RemoveKeys(source.Keys.ToArray()); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedValues.Skip(priorResults.Count).Should().ContainSingle("a single source operation was performed"); - results.RecordedValues[^1].Should().BeEquivalentTo(source.Items, "snapshots should always match the source collection"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count - priorResults.Count).IsEqualTo(1); + await Assert.That(results.RecordedValues[^1]).IsEquivalentTo(source.Items); + await Assert.That(results.HasCompleted).IsFalse(); foreach (var (result, priorResult) in results.RecordedValues.Zip(priorResults)) - result.Should().BeEquivalentTo(priorResult, "previous snapshots should not be mutated"); + await Assert.That(result).IsEquivalentTo(priorResult); priorResults.Add(results.RecordedValues[^1].ToArray()); } - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void WhenSourceCompletes_CompletionPropagates(StreamCompletionStrategy completionStrategy) + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task WhenSourceCompletes_CompletionPropagates(StreamCompletionStrategy completionStrategy) { // Setup using var source = new TestSourceCache(TestItem.SelectId); @@ -122,16 +110,16 @@ public void WhenSourceCompletes_CompletionPropagates(StreamCompletionStrategy co if (completionStrategy is StreamCompletionStrategy.Asynchronous) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedValues.Should().ContainSingle("an initial snapshot should always be published"); - results.RecordedValues[^1].Should().BeEmpty("no items were added to the source"); - results.HasCompleted.Should().BeTrue("the source has completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1); + await Assert.That(results.RecordedValues[^1]).IsEmpty(); + await Assert.That(results.HasCompleted).IsTrue(); } - [Theory] - [InlineData(StreamCompletionStrategy.Asynchronous)] - [InlineData(StreamCompletionStrategy.Immediate)] - public void WhenSourceFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) + [Test] + [Arguments(StreamCompletionStrategy.Asynchronous)] + [Arguments(StreamCompletionStrategy.Immediate)] + public async Task WhenSourceFails_ErrorPropagates(StreamCompletionStrategy completionStrategy) { // Setup using var source = new TestSourceCache(TestItem.SelectId); @@ -150,32 +138,22 @@ public void WhenSourceFails_ErrorPropagates(StreamCompletionStrategy completionS if (completionStrategy is StreamCompletionStrategy.Asynchronous) source.SetError(error); - results.Error.Should().Be(error, "errors should propagate"); - // TODO: Disabled due to existing defect. Fix and restore. - //results.RecordedValues.Should().ContainSingle("an initial snapshot should always be published"); - //results.RecordedValues[^1].Should().BeEmpty("no items were added to the source"); + await Assert.That(results.Error).IsSameReferenceAs(error); } - [Fact] - public void WhenSourceIsNull_ThrowsException() + [Test] + public async Task WhenSourceIsNull_ThrowsException() { // UUT Action - var result = FluentActions.Invoking(() => - { - _ = ObservableCacheEx.ToCollection(null!); - }) - .Should().Throw() - .WithParameterName("source") - .Which; - - _output.WriteLine(result.ToString()); + var exception = await Assert.That(() => ObservableCacheEx.ToCollection(null!)).Throws(); + await Assert.That(exception.ParamName).IsEqualTo("source"); } - [Fact] - public void WhenSubscriptionIsDisposed_SubscriptionDisposalPropagates() + [Test] + public async Task WhenSubscriptionIsDisposed_SubscriptionDisposalPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); // UUT Initialization @@ -183,18 +161,14 @@ public void WhenSubscriptionIsDisposed_SubscriptionDisposalPropagates() .ToCollection() .RecordValues(out var results); - results.Error.Should().BeNull(); - // TODO: Disabled due to existing defect. Fix and restore. - //results.RecordedValues.Should().ContainSingle("an initial snapshot should always be published"); - //results.RecordedValues[^1].Should().BeEmpty("no items were added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.HasCompleted).IsFalse(); // UUT Action subscription.Dispose(); - source.HasObservers.Should().BeFalse("subscription disposal should propagate to the source"); + await Assert.That(source.HasObservers).IsFalse(); } - private readonly ITestOutputHelper _output; } diff --git a/src/DynamicData.Tests/Cache/ToCollectionRegressionFixture.cs b/src/DynamicData.Tests/Cache/ToCollectionRegressionFixture.cs new file mode 100644 index 000000000..11e52b2d4 --- /dev/null +++ b/src/DynamicData.Tests/Cache/ToCollectionRegressionFixture.cs @@ -0,0 +1,76 @@ +namespace DynamicData.Tests.Cache; + +public class ToCollectionRegressionFixture +{ + [Test] + public async Task SubscriptionsHaveIndependentStateAndSnapshotsRemainUnchanged() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var snapshots = source.ToCollection(); + var first = new List>(); + var second = new List>(); + using var firstSubscription = snapshots.Subscribe(first.Add); + var changes = new ChangeAwareCache(); + + changes.AddOrUpdate(10, 1); + source.OnNext(changes.CaptureChanges()); + using var secondSubscription = snapshots.Subscribe(second.Add); + changes.AddOrUpdate(20, 2); + source.OnNext(changes.CaptureChanges()); + changes.Remove(1); + source.OnNext(changes.CaptureChanges()); + + await Assert.That(first.Count).IsEqualTo(3); + await Assert.That(first[0]).IsEquivalentTo(new[] { 10 }); + await Assert.That(first[1]).IsEquivalentTo(new[] { 10, 20 }); + await Assert.That(first[2]).IsEquivalentTo(new[] { 20 }); + await Assert.That(second.Count).IsEqualTo(2); + await Assert.That(second[0]).IsEquivalentTo(new[] { 20 }); + await Assert.That(second[1]).IsEquivalentTo(new[] { 20 }); + } + + [Test] + public async Task DisposingOneSubscriptionLeavesTheOtherActive() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var snapshots = source.ToCollection(); + var first = new List>(); + var second = new List>(); + using var firstSubscription = snapshots.Subscribe(first.Add); + using var secondSubscription = snapshots.Subscribe(second.Add); + firstSubscription.Dispose(); + + var changes = new ChangeAwareCache(); + changes.AddOrUpdate(10, 1); + source.OnNext(changes.CaptureChanges()); + + await Assert.That(first).IsEmpty(); + await Assert.That(second.Count).IsEqualTo(1); + await Assert.That(second[0]).IsEquivalentTo(new[] { 10 }); + await Assert.That(source.HasObservers).IsTrue(); + secondSubscription.Dispose(); + await Assert.That(source.HasObservers).IsFalse(); + } + + [Test] + public async Task EmptyChangesAndRefreshesProduceSnapshotsWithoutMutatingEarlierResults() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var snapshots = new List>(); + using var subscription = source.ToCollection().Subscribe(snapshots.Add); + var changes = new ChangeAwareCache(); + source.OnNext(changes.CaptureChanges()); + changes.AddOrUpdate(10, 1); + source.OnNext(changes.CaptureChanges()); + changes.Refresh(1); + source.OnNext(changes.CaptureChanges()); + changes.AddOrUpdate(20, 1); + source.OnNext(changes.CaptureChanges()); + + await Assert.That(snapshots.Count).IsEqualTo(4); + await Assert.That(snapshots[0]).IsEmpty(); + await Assert.That(snapshots[1]).IsEquivalentTo(new[] { 10 }); + await Assert.That(snapshots[2]).IsEquivalentTo(new[] { 10 }); + await Assert.That(snapshots[3]).IsEquivalentTo(new[] { 20 }); + } +} diff --git a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.IntegrationTests.cs b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.IntegrationTests.cs index 8dd0ae91e..c5d515035 100644 --- a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.IntegrationTests.cs @@ -1,14 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class ToObservableChangeSetFixture @@ -18,67 +7,67 @@ public static partial class Items public sealed class IntegrationTests : IntegrationTestFixtureBase { - [Theory(Timeout = 60_000)] - [InlineData(SchedulerType.Default)] - [InlineData(SchedulerType.NewThread)] - [InlineData(SchedulerType.TaskPool)] - [InlineData(SchedulerType.ThreadPool)] - public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType) + [Test, Timeout(60_000)] + [Arguments(SchedulerType.Default)] + [Arguments(SchedulerType.NewThread)] + [Arguments(SchedulerType.TaskPool)] + [Arguments(SchedulerType.ThreadPool)] + public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType, CancellationToken cancellationToken) { IScheduler scheduler = schedulerType switch { - SchedulerType.Default => DefaultScheduler.Instance, - SchedulerType.NewThread => new NewThreadScheduler(), - SchedulerType.TaskPool => TaskPoolScheduler.Default, - SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, - _ => throw new ArgumentOutOfRangeException(nameof(SchedulerType)) + SchedulerType.Default => Scheduler.Default, + SchedulerType.NewThread => new NewThreadScheduler(), + SchedulerType.TaskPool => TaskPoolScheduler.Default, + SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, + _ => throw new ArgumentOutOfRangeException(nameof(SchedulerType)) }; using var subscription1 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new Item() { - Id = (int)(id % 100), - Lifetime = TimeSpan.FromMilliseconds(50) + Id = (int)(id % 100), + Lifetime = TimeSpan.FromMilliseconds(50) }) .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results1); - + using var subscription2 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new Item() { - Id = (int)(id % 100) + 100, - Lifetime = TimeSpan.FromMilliseconds(50) + Id = (int)(id % 100) + 100, + Lifetime = TimeSpan.FromMilliseconds(50) }) .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results2); await Task.WhenAll( results1.WhenFinalized, - results2.WhenFinalized); + results2.WhenFinalized).WaitAsync(cancellationToken); - results1.Error.Should().BeNull(); - results1.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results1.RecordedItemsByKey.Should().BeEmpty("all items should have expired"); + await Assert.That(results1.Error).IsNull(); + await Assert.That(results1.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results1.RecordedItemsByKey).IsEmpty().Because("all items should have expired"); - results2.Error.Should().BeNull(); - results2.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results2.RecordedItemsByKey.Should().BeEmpty("all items should have expired"); + await Assert.That(results2.Error).IsNull(); + await Assert.That(results2.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results2.RecordedItemsByKey).IsEmpty().Because("all items should have expired"); } } } diff --git a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.UnitTests.cs b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.UnitTests.cs index 892f55535..41cb005dc 100644 --- a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.UnitTests.cs @@ -1,15 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using Microsoft.Reactive.Testing; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class ToObservableChangeSetFixture @@ -18,31 +6,29 @@ public static partial class Items { public class UnitTests { - [Fact] - public void ExpireAfterThrows_ErrorPropagates() + [Test] + public async Task ExpireAfterThrows_ErrorPropagates() { // Setup - using var source = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal(); var error = new Exception("Test Exception"); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: static item => (item.Error is not null) + keySelector: Item.SelectId, + expireAfter: static item => (item.Error is not null) ? throw item.Error : item.Lifetime) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Should().BeEmpty("no items have been emitted by the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("no items have been emitted by the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -50,30 +36,27 @@ public void ExpireAfterThrows_ErrorPropagates() source.OnNext(new Item() { Id = 2, Error = error }); source.OnNext(new Item() { Id = 3 }); - results.Error.Should().BeSameAs(error); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item was emitted before an error occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was emitted before an error occurred"); + await Assert.That(results.Error).IsSameReferenceAs(error); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item was emitted before an error occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was emitted before an error occurred"); - - results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); + await results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); } - [Fact] - public void KeySelectorIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.ToObservableChangeSet( - source: new Subject(), - keySelector: null!)) - .Should().Throw(); + [Test] + public async Task KeySelectorIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.ToObservableChangeSet( + source: new ReactiveUI.Primitives.Signals.Signal(), + keySelector: null!)).Throws(); - [Fact] - public void KeySelectorThrows_ErrorPropagates() + [Test] + public async Task KeySelectorThrows_ErrorPropagates() { // Setup - using var source = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal(); var error = new Exception("Test Exception"); - // UUT Initialization using var subscription = source .ToObservableChangeSet(static item => (item.Error is not null) @@ -83,11 +66,10 @@ public void KeySelectorThrows_ErrorPropagates() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Should().BeEmpty("no items have been emitted by the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("no items have been emitted by the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -95,20 +77,18 @@ public void KeySelectorThrows_ErrorPropagates() source.OnNext(new Item() { Id = 2, Error = error }); source.OnNext(new Item() { Id = 3 }); - results.Error.Should().BeSameAs(error); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item was emitted before an error occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was emitted before an error occurred"); + await Assert.That(results.Error).IsSameReferenceAs(error); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item was emitted before an error occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was emitted before an error occurred"); - - results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); + await results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); } - [Fact] - public void SizeLimitIsExceeded_OldestItemsAreRemoved() + [Test] + public async Task SizeLimitIsExceeded_OldestItemsAreRemoved() { // Setup - using var source = new Subject(); - + using var source = new ReactiveUI.Primitives.Signals.Signal(); // UUT Initialization using var subscription = source @@ -119,11 +99,10 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Not enough items to reach the limit var item1 = new Item() { Id = 1 }; @@ -138,389 +117,359 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() var item4 = new Item() { Id = 4 }; source.OnNext(item4); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(4, "4 items were emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3, item4 }, "4 items were emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(4).Because("4 items were emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3, item4 }).Because("4 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Limit is reached var item5 = new Item() { Id = 5 }; source.OnNext(item5); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3, item4, item5 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3, item4, item5 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: New item exceeds the limit var item6 = new Item() { Id = 6 }; source.OnNext(item6); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(6).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3, item4, item5, item6 }, "1 item was emitted, and 1 was evicted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(6).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3, item4, item5, item6 }).Because("1 item was emitted, and 1 was evicted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Replacement leaves all other items in-place var item7 = new Item() { Id = 4 }; source.OnNext(item7); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(7).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3, item7, item5, item6 }, "1 item was emitted, and replaced an existing item."); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(7).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3, item7, item5, item6 }).Because("1 item was emitted, and replaced an existing item."); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) { // Setup var item = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(10) }; var source = sourceType switch { - SourceType.Asynchronous => new Subject(), - SourceType.Immediate => Observable.Return(item), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal(), + SourceType.Immediate => Observable.Return(item), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - if (source is Subject subject) + if (source is ReactiveUI.Primitives.Signals.Signal subject) { subject.OnNext(item); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 item was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 item was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("1 item has yet to expire"); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("1 item has yet to expire"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(10).Ticks); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 item should have expired"); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 item should have expired"); else - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item should have expired"); - results.RecordedItemsByKey.Values.Should().BeEmpty("all items have expired"); - results.HasCompleted.Should().BeTrue("the source, and all outstanding expirations, have completed"); - + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item should have expired"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("all items have expired"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source, and all outstanding expirations, have completed"); - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) { // Setup var item = new Item() { Id = 1 }; var source = sourceType switch { - SourceType.Asynchronous => new Subject(), - SourceType.Immediate => Observable.Return(item), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal(), + SourceType.Immediate => Observable.Return(item), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - if (source is Subject subject) + if (source is ReactiveUI.Primitives.Signals.Signal subject) { subject.OnNext(item); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 item was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 item was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item }, "1 item was emitted"); - results.HasCompleted.Should().BeTrue("the source has completed, and no items remain to be expired"); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no items remain to be expired"); - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Fact] - public void SourceEmitsRepeatedItems_RepeatedItemsAreUpdatedAndExpirationIsRescheduled() + [Test] + public async Task SourceEmitsRepeatedItems_RepeatedItemsAreUpdatedAndExpirationIsRescheduled() { // Setup - using var source = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal(); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(1) }; source.OnNext(item1); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item2 = new Item() { Id = 2 }; source.OnNext(item2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item3 = new Item() { Id = 3, Lifetime = TimeSpan.FromSeconds(1) }; source.OnNext(item3); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item4 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(1) }; source.OnNext(item4); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4, item2, item3 }, "1 item was emitted, and replaced an existing item"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4, item2, item3 }).Because("1 item was emitted, and replaced an existing item"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item5 = new Item() { Id = 2 }; source.OnNext(item5); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4, item5, item3 }, "1 item was emitted, and replaced an existing item"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4, item5, item3 }).Because("1 item was emitted, and replaced an existing item"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item6 = new Item() { Id = 3, Lifetime = TimeSpan.FromSeconds(3) }; source.OnNext(item6); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(6).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4, item5, item6 }, "1 item was emitted, and replaced an existing item"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(6).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4, item5, item6 }).Because("1 item was emitted, and replaced an existing item"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(1).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(7).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5, item6 }, "1 item reached its expiration"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(7).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5, item6 }).Because("1 item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(2).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(8).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5, item6 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(8)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5, item6 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(3).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(8).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5 }, "1 item reached its expiration"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(8).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5 }).Because("1 item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(4).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(9).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(9)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Fact] - public void SourceEmitsUniqueItems_ItemsAreAddedAndRemovedWhenExpired() + [Test] + public async Task SourceEmitsUniqueItems_ItemsAreAddedAndRemovedWhenExpired() { // Setup - using var source = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal(); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(3) }; source.OnNext(item1); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item2 = new Item() { Id = 2 }; source.OnNext(item2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item3 = new Item() { Id = 3, Lifetime = TimeSpan.FromSeconds(1) }; source.OnNext(item3); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "1 item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(1).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2 }, "1 item expired, and 1 had its lifetime extended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2 }).Because("1 item expired, and 1 had its lifetime extended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(2).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(3).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2 }, "1 item reached its expiration"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2 }).Because("1 item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(4).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(6).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(6)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceFails_ErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceFails_ErrorPropagates(SourceType sourceType) { // Setup var error = new Exception("Test Exception"); var source = sourceType switch - { - SourceType.Asynchronous => new Subject(), - SourceType.Immediate => Observable.Throw(error), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + { + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal(), + SourceType.Immediate => Observable.Throw(error), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - // UUT Initialization & Action using var subscription = source .ToObservableChangeSet(Item.SelectId) @@ -528,23 +477,22 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - if (source is Subject subject) + if (source is ReactiveUI.Primitives.Signals.Signal subject) subject.OnError(error); - results.Error.Should().BeSameAs(error, "errors should propagate"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors should propagate"); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); else - results.RecordedChangeSets.Should().BeEmpty("an error occurred during initialization"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no items were emitted"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during initialization"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no items were emitted"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.ToObservableChangeSet( - source: (null as IObservable)!, - keySelector: Item.SelectId)) - .Should().Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.ToObservableChangeSet( + source: (null as IObservable)!, + keySelector: Item.SelectId)).Throws(); } } } diff --git a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs index f6dece980..46606ef5f 100644 --- a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs +++ b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs @@ -1,14 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class ToObservableChangeSetFixture @@ -18,25 +7,25 @@ public static partial class Sequences public class IntegrationTests : IntegrationTestFixtureBase { - [Theory(Timeout = 60_000)] - [InlineData(SchedulerType.Default)] - [InlineData(SchedulerType.NewThread)] - [InlineData(SchedulerType.TaskPool)] - [InlineData(SchedulerType.ThreadPool)] - public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType) + [Test, Timeout(60_000)] + [Arguments(SchedulerType.Default)] + [Arguments(SchedulerType.NewThread)] + [Arguments(SchedulerType.TaskPool)] + [Arguments(SchedulerType.ThreadPool)] + public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType, CancellationToken cancellationToken) { IScheduler scheduler = schedulerType switch { - SchedulerType.Default => DefaultScheduler.Instance, - SchedulerType.NewThread => new NewThreadScheduler(), - SchedulerType.TaskPool => TaskPoolScheduler.Default, - SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, - _ => throw new ArgumentOutOfRangeException(nameof(SchedulerType)) + SchedulerType.Default => Scheduler.Default, + SchedulerType.NewThread => new NewThreadScheduler(), + SchedulerType.TaskPool => TaskPoolScheduler.Default, + SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, + _ => throw new ArgumentOutOfRangeException(nameof(SchedulerType)) }; using var subscription1 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new[] { @@ -47,16 +36,16 @@ public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe( } }) .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results1); - + using var subscription2 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new[] { @@ -67,24 +56,24 @@ public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe( } }) .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(static item => item.Id) .RecordCacheItems(out var results2); await Task.WhenAll( results1.WhenFinalized, - results2.WhenFinalized); + results2.WhenFinalized).WaitAsync(cancellationToken); - results1.Error.Should().BeNull(); - results1.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results1.RecordedItemsByKey.Should().BeEmpty("all items should have expired"); + await Assert.That(results1.Error).IsNull(); + await Assert.That(results1.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results1.RecordedItemsByKey).IsEmpty().Because("all items should have expired"); - results2.Error.Should().BeNull(); - results2.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results2.RecordedItemsByKey.Should().BeEmpty("all items should have expired"); + await Assert.That(results2.Error).IsNull(); + await Assert.That(results2.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results2.RecordedItemsByKey).IsEmpty().Because("all items should have expired"); } } } diff --git a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.UnitTests.cs b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.UnitTests.cs index 94213315a..9dd5bd6d1 100644 --- a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.UnitTests.cs +++ b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.UnitTests.cs @@ -1,16 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using Microsoft.Reactive.Testing; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.Cache; public static partial class ToObservableChangeSetFixture @@ -19,31 +6,29 @@ public static partial class Sequences { public class UnitTests { - [Fact] - public void ExpireAfterThrows_ErrorPropagates() + [Test] + public async Task ExpireAfterThrows_ErrorPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception("Test Exception"); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: static item => (item.Error is not null) + keySelector: Item.SelectId, + expireAfter: static item => (item.Error is not null) ? throw item.Error : item.Lifetime) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Should().BeEmpty("no items have been emitted by the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("no items have been emitted by the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -54,30 +39,27 @@ public void ExpireAfterThrows_ErrorPropagates() new Item() { Id = 3 } }); - results.Error.Should().BeSameAs(error); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("an error occurred during processing of the sequence"); - results.RecordedItemsByKey.Values.Should().BeEmpty("an error occurred during processing of the sequence"); - + await Assert.That(results.Error).IsSameReferenceAs(error); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("an error occurred during processing of the sequence"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("an error occurred during processing of the sequence"); - results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); + await results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); } - [Fact] - public void KeySelectorIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.ToObservableChangeSet( - source: new Subject>(), - keySelector: null!)) - .Should().Throw(); + [Test] + public async Task KeySelectorIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.ToObservableChangeSet( + source: new ReactiveUI.Primitives.Signals.Signal>(), + keySelector: null!)).Throws(); - [Fact] - public void KeySelectorThrows_ErrorPropagates() + [Test] + public async Task KeySelectorThrows_ErrorPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception("Test Exception"); - // UUT Initialization using var subscription = source .ToObservableChangeSet(static item => (item.Error is not null) @@ -87,11 +69,10 @@ public void KeySelectorThrows_ErrorPropagates() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Should().BeEmpty("no items have been emitted by the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey).IsEmpty().Because("no items have been emitted by the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -102,20 +83,18 @@ public void KeySelectorThrows_ErrorPropagates() new Item() { Id = 3 } }); - results.Error.Should().BeSameAs(error); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("an error occurred during processing of the sequence"); - results.RecordedItemsByKey.Values.Should().BeEmpty("an error occurred during processing of the sequence"); - + await Assert.That(results.Error).IsSameReferenceAs(error); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("an error occurred during processing of the sequence"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("an error occurred during processing of the sequence"); - results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); + await results.ShouldNotSupportSorting($"Cache source operators do not support sorting"); } - [Fact] - public void SizeLimitIsExceeded_OldestItemsAreRemoved() + [Test] + public async Task SizeLimitIsExceeded_OldestItemsAreRemoved() { // Setup - using var source = new Subject>(); - + using var source = new ReactiveUI.Primitives.Signals.Signal>(); // UUT Initialization using var subscription = source @@ -126,11 +105,10 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no source items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no source items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Not enough items to reach the limit var item1 = new Item() { Id = 1 }; @@ -145,46 +123,43 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() item4 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3, item4 }, "4 source items were emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3, item4 }).Because("4 source items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Limit is reached var item5 = new Item() { Id = 5 }; source.OnNext(new[] { item5 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3, item4, item5 }, "1 source item was emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3, item4, item5 }).Because("1 source item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: New item exceeds the limit var item6 = new Item() { Id = 6 }; source.OnNext(new[] { item6 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3, item4, item5, item6 }, "1 source item was emitted, and 1 was evicted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3, item4, item5, item6 }).Because("1 source item was emitted, and 1 was evicted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Replacement leaves all other items in-place var item7 = new Item() { Id = 4 }; source.OnNext(new[] { item7 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2, item3, item7, item5, item6 }, "1 source item was emitted, and replaced an existing item."); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2, item3, item7, item5, item6 }).Because("1 source item was emitted, and replaced an existing item."); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) { // Setup var items = new[] @@ -196,58 +171,55 @@ public void SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpiratio var source = sourceType switch { - SourceType.Asynchronous => new Subject>(), - SourceType.Immediate => Observable.Return>(items), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal>(), + SourceType.Immediate => Observable.Return>(items), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) { subject.OnNext(items); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 sequence was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 sequence was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "3 items were emitted"); - results.HasCompleted.Should().BeFalse("2 items have yet to expire"); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("2 items have yet to expire"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(30).Ticks); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Skip(2).Count().Should().Be(2, "2 items should have expired, at different times"); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(2).Because("2 items should have expired, at different times"); else - results.RecordedChangeSets.Skip(1).Count().Should().Be(2, "2 items should have expired, at different times"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items.Where(static item => item.Lifetime is null), "all expirable items have expired"); - results.HasCompleted.Should().BeTrue("the source, and all outstanding expirations, have completed"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(2).Because("2 items should have expired, at different times"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items.Where(static item => item.Lifetime is null)).Because("all expirable items have expired"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source, and all outstanding expirations, have completed"); - - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) { // Setup var items = new[] @@ -259,66 +231,62 @@ public void SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(Sour var source = sourceType switch { - SourceType.Asynchronous => new Subject>(), - SourceType.Immediate => Observable.Return>(items), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal>(), + SourceType.Immediate => Observable.Return>(items), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) { subject.OnNext(items); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 sequence was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 sequence was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(items, "3 items were emitted"); - results.HasCompleted.Should().BeTrue("the source has completed, and no items remain to be expired"); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(items).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no items remain to be expired"); - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Fact] - public void SourceEmitsRepeatedItems_RepeatedItemsAreUpdatedAndExpirationIsRescheduled() + [Test] + public async Task SourceEmitsRepeatedItems_RepeatedItemsAreUpdatedAndExpirationIsRescheduled() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no source items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no source items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(1) }; @@ -327,11 +295,10 @@ public void SourceEmitsRepeatedItems_RepeatedItemsAreUpdatedAndExpirationIsResch source.OnNext(new[] { item1, item2, item3 }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 sequence was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 sequence was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item4 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(1) }; @@ -340,75 +307,68 @@ public void SourceEmitsRepeatedItems_RepeatedItemsAreUpdatedAndExpirationIsResch source.OnNext(new[] { item4, item5, item6 }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 sequence was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item4, item5, item6 }, "3 items were emitted, and replaced existing items"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 sequence was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item4, item5, item6 }).Because("3 items were emitted, and replaced existing items"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(1).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5, item6 }, "1 source item reached its expiration"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5, item6 }).Because("1 source item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(2).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5, item6 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5, item6 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(3).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5 }, "1 source item reached its expiration"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5 }).Because("1 source item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(4).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item5 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item5 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Fact] - public void SourceEmitsUniqueItems_ItemsAreAddedAndRemovedWhenExpired() + [Test] + public async Task SourceEmitsUniqueItems_ItemsAreAddedAndRemovedWhenExpired() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - keySelector: Item.SelectId, - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + keySelector: Item.SelectId, + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no source items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no source items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(3) }; @@ -417,67 +377,61 @@ public void SourceEmitsUniqueItems_ItemsAreAddedAndRemovedWhenExpired() source.OnNext(new[] { item1, item2, item3 }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 sequence was emitted"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2, item3 }, "3 items were emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 sequence was emitted"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2, item3 }).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(1).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2 }, "1 item expired, and 1 had its lifetime extended"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2 }).Because("1 item expired, and 1 had its lifetime extended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(2).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item1, item2 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item1, item2 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(3).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2 }, "1 item reached its expiration"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2 }).Because("1 item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(4).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItemsByKey.Values.Should().BeEquivalentTo(new[] { item2 }, "no changes were made"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItemsByKey.Values).IsEquivalentTo(new[] { item2 }).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - results.ShouldNotSupportSorting(); + await results.ShouldNotSupportSorting(); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceFails_ErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceFails_ErrorPropagates(SourceType sourceType) { // Setup var error = new Exception("Test Exception"); var source = sourceType switch - { - SourceType.Asynchronous => new Subject>(), - SourceType.Immediate => Observable.Throw>(error), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + { + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal>(), + SourceType.Immediate => Observable.Throw>(error), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - // UUT Initialization & Action using var subscription = source .ToObservableChangeSet(Item.SelectId) @@ -485,23 +439,22 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) .ValidateChangeSets(Item.SelectId) .RecordCacheItems(out var results); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) subject.OnError(error); - results.Error.Should().BeSameAs(error, "errors should propagate"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors should propagate"); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); else - results.RecordedChangeSets.Should().BeEmpty("an error occurred during initialization"); - results.RecordedItemsByKey.Values.Should().BeEmpty("no source items were emitted"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during initialization"); + await Assert.That(results.RecordedItemsByKey.Values).IsEmpty().Because("no source items were emitted"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.ToObservableChangeSet( - source: (null as IObservable>)!, - keySelector: Item.SelectId)) - .Should().Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.ToObservableChangeSet( + source: (null as IObservable>)!, + keySelector: Item.SelectId)).Throws(); } } } diff --git a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.cs b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.cs index c1239a1d8..55ee116ea 100644 --- a/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.cs +++ b/src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.cs @@ -1,15 +1,13 @@ -using System; - namespace DynamicData.Tests.Cache; public static partial class ToObservableChangeSetFixture { public const int IntegrationTestItemCount - #if RELEASE +#if RELEASE = 1_000; - #else +#else = 100; - #endif +#endif public enum SchedulerType { diff --git a/src/DynamicData.Tests/Cache/ToObservableOptionalFixture.cs b/src/DynamicData.Tests/Cache/ToObservableOptionalFixture.cs index d4ea2fd7e..5e06fbbac 100644 --- a/src/DynamicData.Tests/Cache/ToObservableOptionalFixture.cs +++ b/src/DynamicData.Tests/Cache/ToObservableOptionalFixture.cs @@ -1,13 +1,4 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reactive.Linq; -using System.Threading.Tasks; -using DynamicData.Kernel; -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -30,63 +21,63 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void NullChecks() => Assert.Throws(() => ObservableCacheEx.ToObservableOptional(null!, string.Empty)); + [Test] + public async Task NullChecks() => await Assert.That(() => ObservableCacheEx.ToObservableOptional(null!, string.Empty)).Throws(); - [Fact] - public void AddingToCacheEmitsOptionalSome() + [Test] + public async Task AddingToCacheEmitsOptionalSome() { // having - var optionals = new List>(); + var optionals = new List>(); using var optionalObservable = _source.Connect().ToObservableOptional(Key1).Do(optionals.Add).Subscribe(); // when _source.AddOrUpdate(Create(Key1, Value1)); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(1); - optionals[0].HasValue.Should().BeTrue(); - optionals[0].Value.Value.Should().Be(Value1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(1); + await Assert.That(optionals[0].HasValue).IsTrue(); + await Assert.That(optionals[0].Value.Value).IsEqualTo(Value1); } - [Fact] - public void AddingOtherKeysDoesNotEmit() + [Test] + public async Task AddingOtherKeysDoesNotEmit() { // having - var optionals = new List>(); + var optionals = new List>(); using var optionalObservable = _source.Connect().ToObservableOptional(Key1).Do(optionals.Add).Subscribe(); // when _source.AddOrUpdate(Create(Key2, Value1)); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(0); } - [Fact] - public void ExistingValueEmitsOptionalSome() + [Test] + public async Task ExistingValueEmitsOptionalSome() { // having - var optionals = new List>(); + var optionals = new List>(); _source.AddOrUpdate(Create(Key1, Value1)); // when using var optionalObservable = _source.Connect().ToObservableOptional(Key1).Do(optionals.Add).Subscribe(); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(1); - optionals[0].HasValue.Should().BeTrue(); - optionals[0].Value.Value.Should().Be(Value1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(1); + await Assert.That(optionals[0].HasValue).IsTrue(); + await Assert.That(optionals[0].Value.Value).IsEqualTo(Value1); } - [Fact] - public void RemovingFromCacheEmitsOptionalNone() + [Test] + public async Task RemovingFromCacheEmitsOptionalNone() { // having - var optionals = new List>(); + var optionals = new List>(); using var optionalObservable = _source.Connect().ToObservableOptional(Key1).Do(optionals.Add).Subscribe(); _source.AddOrUpdate(Create(Key1, Value1)); @@ -94,16 +85,16 @@ public void RemovingFromCacheEmitsOptionalNone() _source.RemoveKey(Key1); // then - _results.Data.Count.Should().Be(0); - optionals.Count.Should().Be(2); - optionals[1].HasValue.Should().BeFalse(); + await Assert.That(_results.Data.Count).IsEqualTo(0); + await Assert.That(optionals.Count).IsEqualTo(2); + await Assert.That(optionals[1].HasValue).IsFalse(); } - [Fact] - public void UpdateCacheEmitsOptionalSome() + [Test] + public async Task UpdateCacheEmitsOptionalSome() { // having - var optionals = new List>(); + var optionals = new List>(); using var optionalObservable = _source.Connect().ToObservableOptional(Key1).Do(optionals.Add).Subscribe(); _source.AddOrUpdate(Create(Key1, Value1)); @@ -111,18 +102,18 @@ public void UpdateCacheEmitsOptionalSome() _source.AddOrUpdate(Create(Key1, Value2)); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(2); - optionals[1].HasValue.Should().BeTrue(); - optionals[1].Value.Value.Should().Be(Value2); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(2); + await Assert.That(optionals[1].HasValue).IsTrue(); + await Assert.That(optionals[1].Value.Value).IsEqualTo(Value2); } - [Fact] - public void UpdateUsesEqualityComparer() + [Test] + public async Task UpdateUsesEqualityComparer() { // having - var optionalsCS = new List>(); - var optionalsNonCS = new List>(); + var optionalsCS = new List>(); + var optionalsNonCS = new List>(); using var optionalCSObservable = _source.Connect().ToObservableOptional(Key1, CaseSensitiveComparer).Do(optionalsCS.Add).Subscribe(); using var optionalNonCSObservable = _source.Connect().ToObservableOptional(Key1, CaseInsensitiveComparer).Do(optionalsNonCS.Add).Subscribe(); _source.AddOrUpdate(Create(Key1, Value1)); @@ -131,22 +122,22 @@ public void UpdateUsesEqualityComparer() _source.AddOrUpdate(Create(Key1, Value1AllCaps)); // then - _results.Data.Count.Should().Be(1); - optionalsNonCS.Count.Should().Be(1); - optionalsNonCS[0].HasValue.Should().BeTrue(); - optionalsNonCS[0].Value.Value.Should().Be(Value1); - optionalsCS.Count.Should().Be(2); - optionalsCS[0].HasValue.Should().BeTrue(); - optionalsCS[0].Value.Value.Should().Be(Value1); - optionalsCS[1].HasValue.Should().BeTrue(); - optionalsCS[1].Value.Value.Should().Be(Value1AllCaps); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionalsNonCS.Count).IsEqualTo(1); + await Assert.That(optionalsNonCS[0].HasValue).IsTrue(); + await Assert.That(optionalsNonCS[0].Value.Value).IsEqualTo(Value1); + await Assert.That(optionalsCS.Count).IsEqualTo(2); + await Assert.That(optionalsCS[0].HasValue).IsTrue(); + await Assert.That(optionalsCS[0].Value.Value).IsEqualTo(Value1); + await Assert.That(optionalsCS[1].HasValue).IsTrue(); + await Assert.That(optionalsCS[1].Value.Value).IsEqualTo(Value1AllCaps); } - [Fact] - public void UpdateWhenReferenceEqualDoesNotEmit() + [Test] + public async Task UpdateWhenReferenceEqualDoesNotEmit() { // having - var optionals = new List>(); + var optionals = new List>(); using var optionalObservable = _source.Connect().ToObservableOptional(Key1).Do(optionals.Add).Subscribe(); var kvp = Create(Key1, Value1); _source.AddOrUpdate(kvp); @@ -157,13 +148,13 @@ public void UpdateWhenReferenceEqualDoesNotEmit() _source.AddOrUpdate(kvp); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(1); - optionals[0].HasValue.Should().BeTrue(); - optionals[0].Value.Value.Should().Be(Value1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(1); + await Assert.That(optionals[0].HasValue).IsTrue(); + await Assert.That(optionals[0].Value.Value).IsEqualTo(Value1); } - [Fact] + [Test] public async Task InitialOptionalAvoidsNoneAfterSomeRaceConditions() { await Task.WhenAll(Enumerable.Range(0, 10000).Select(_ => RunTest())); @@ -172,7 +163,7 @@ async Task RunTest() { // having using ISourceCache source = new SourceCache(kvp => kvp.Key); - var optionals = new List>(); + var optionals = new List>(); // when var addTask = Task.Run(() => source.AddOrUpdate(Create(Key1, Value1))); @@ -180,71 +171,71 @@ async Task RunTest() await addTask; // then - source.Count.Should().Be(1); - optionals.Count.Should().BeInRange(1, 2); - optionals.Last().HasValue.Should().BeTrue(); - optionals.Last().Value.Value.Should().Be(Value1); + await Assert.That(source.Count).IsEqualTo(1); + await Assert.That(optionals.Count >= 1 && optionals.Count <= 2).IsTrue(); + await Assert.That(optionals.Last().HasValue).IsTrue(); + await Assert.That(optionals.Last().Value.Value).IsEqualTo(Value1); if (optionals.Count > 1) { - optionals.First().HasValue.Should().BeFalse(); + await Assert.That(optionals.First().HasValue).IsFalse(); } } } - [Fact] - public void InitialOptionalWhenMissingEmitsNone() + [Test] + public async Task InitialOptionalWhenMissingEmitsNone() { // having - var optionals = new List>(); + var optionals = new List>(); // when using var optionalObservable = _source.Connect().ToObservableOptional(Key1, initialOptionalWhenMissing: true).Do(optionals.Add).Subscribe(); // then - _results.Data.Count.Should().Be(0); - optionals.Count.Should().Be(1); - optionals[0].HasValue.Should().BeFalse(); + await Assert.That(_results.Data.Count).IsEqualTo(0); + await Assert.That(optionals.Count).IsEqualTo(1); + await Assert.That(optionals[0].HasValue).IsFalse(); } - [Fact] - public void InitialOptionalWhenPresentEmitsSome() + [Test] + public async Task InitialOptionalWhenPresentEmitsSome() { // having - var optionals = new List>(); + var optionals = new List>(); _source.AddOrUpdate(Create(Key1, Value1)); // when using var optionalObservable = _source.Connect().ToObservableOptional(Key1, initialOptionalWhenMissing: true).Do(optionals.Add).Subscribe(); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(1); - optionals[0].HasValue.Should().BeTrue(); - optionals[0].Value.Value.Should().Be(Value1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(1); + await Assert.That(optionals[0].HasValue).IsTrue(); + await Assert.That(optionals[0].Value.Value).IsEqualTo(Value1); } - [Fact] - public void InitialOptionalWhenAddedEmitsNoneThenSome() + [Test] + public async Task InitialOptionalWhenAddedEmitsNoneThenSome() { // having - var optionals = new List>(); + var optionals = new List>(); using var optionalObservable = _source.Connect().ToObservableOptional(Key1, initialOptionalWhenMissing: true).Do(optionals.Add).Subscribe(); // when _source.AddOrUpdate(Create(Key1, Value1)); // then - _results.Data.Count.Should().Be(1); - optionals.Count.Should().Be(2); - optionals[0].HasValue.Should().BeFalse(); - optionals[1].HasValue.Should().BeTrue(); - optionals[1].Value.Value.Should().Be(Value1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(optionals.Count).IsEqualTo(2); + await Assert.That(optionals[0].HasValue).IsFalse(); + await Assert.That(optionals[1].HasValue).IsTrue(); + await Assert.That(optionals[1].Value.Value).IsEqualTo(Value1); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ObservableCompletesIfAndOnlyIfSourceCompletes(bool completeSource) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task ObservableCompletesIfAndOnlyIfSourceCompletes(bool completeSource) { // having bool completed = false; @@ -259,13 +250,13 @@ public void ObservableCompletesIfAndOnlyIfSourceCompletes(bool completeSource) _source.Dispose(); // then - completed.Should().Be(completeSource); + await Assert.That(completed).IsEqualTo(completeSource); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ObservableFailsIfAndOnlyIfSourceFails(bool failSource) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task ObservableFailsIfAndOnlyIfSourceFails(bool failSource) { // having var optionalObservable = _source.Connect(); @@ -281,7 +272,7 @@ public void ObservableFailsIfAndOnlyIfSourceFails(bool failSource) _source.Dispose(); // then - receivedError.Should().Be(failSource ? testException : default); + await Assert.That(receivedError).IsEqualTo(failSource ? testException : default); } private static KeyValuePair Create(string key, string value) => new(key, value); @@ -306,4 +297,3 @@ private class KeyValuePair(string key, string value) public string Value { get; } = value; } } - diff --git a/src/DynamicData.Tests/Cache/ToSortedCollectionFixture.cs b/src/DynamicData.Tests/Cache/ToSortedCollectionFixture.cs index 5c7e84f23..d2fc28916 100644 --- a/src/DynamicData.Tests/Cache/ToSortedCollectionFixture.cs +++ b/src/DynamicData.Tests/Cache/ToSortedCollectionFixture.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.Cache; public class ToSortedCollectionFixture : IDisposable @@ -37,8 +29,8 @@ public void Dispose() _cleanup.Dispose(); } - [Fact] - public void SortAscending() + [Test] + public async Task SortAscending() { TestScheduler testScheduler = new(); @@ -63,13 +55,13 @@ public void SortAscending() testScheduler.AdvanceBy(TimeSpan.FromSeconds(2).Ticks); - _cache.Items.Should().Equal(_unsortedCollection); - _cache.Items.Should().NotEqual(_sortedCollection); - _cache.Items.OrderBy(p => p.Age).Should().Equal(_sortedCollection); + await Assert.That(_cache.Items).IsEquivalentTo(_unsortedCollection); + await Assert.That(_cache.Items).IsNotEqualTo(_sortedCollection); + await Assert.That(_cache.Items.OrderBy(p => p.Age)).IsEquivalentTo(_sortedCollection); } - [Fact] - public void SortDescending() + [Test] + public async Task SortDescending() { TestScheduler testScheduler = new(); @@ -94,8 +86,8 @@ public void SortDescending() testScheduler.AdvanceBy(TimeSpan.FromSeconds(2).Ticks); - _cache.Items.Should().Equal(_unsortedCollection); - _cache.Items.Should().NotEqual(_sortedCollection); - _cache.Items.OrderByDescending(p => p.Age).Should().Equal(_sortedCollection); + await Assert.That(_cache.Items).IsEquivalentTo(_unsortedCollection); + await Assert.That(_cache.Items).IsNotEqualTo(_sortedCollection); + await Assert.That(_cache.Items.OrderByDescending(p => p.Age)).IsEquivalentTo(_sortedCollection); } } diff --git a/src/DynamicData.Tests/Cache/TransformAsyncFixture.cs b/src/DynamicData.Tests/Cache/TransformAsyncFixture.cs index b1cedaefe..ea6cf37a5 100644 --- a/src/DynamicData.Tests/Cache/TransformAsyncFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformAsyncFixture.cs @@ -1,35 +1,30 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; public class TransformAsyncFixture { - [Fact] + [Test] public async Task Add() { using var stub = new TransformStub(); var person = new Person("Adult1", 50); stub.Source.AddOrUpdate(person); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); var firstPerson = await stub.TransformFactory(person); - stub.Results.Data.Items[0].Should().Be(firstPerson, "Should be same person"); + await Assert.That(stub.Results.Data.Items[0]).IsEqualTo(firstPerson).Because("Should be same person"); } - [Fact] + [Test] public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); @@ -38,16 +33,16 @@ public async Task BatchOfUniqueUpdates() // Thread.Sleep(10000); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var result = await Task.WhenAll(people.Select(stub.TransformFactory)); var transformed = result.OrderBy(p => p.Age).ToArray(); - stub.Results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(stub.Results.Data.Items.OrderBy(p => p.Age), "Incorrect transform result"); + await Assert.That(stub.Results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(transformed, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("each input should be transformed exactly once"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { using var stub = new TransformStub(); var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); @@ -55,23 +50,23 @@ public void Clear() stub.Source.AddOrUpdate(people); stub.Source.Clear(); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should be 80 adds"); - stub.Results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 adds"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void HandleError() + [Test] + public async Task HandleError() { using var stub = new TransformStub(p => throw new Exception("Broken")); stub.Source.AddOrUpdate(new Person("Name1", 1)); - stub.Results.Error.Should().NotBeNull(); + await Assert.That(stub.Results.Error).IsNotNull(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -80,91 +75,96 @@ public void Remove() stub.Source.AddOrUpdate(person); stub.Source.Remove(key); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - stub.Results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] + [Test] public async Task RemoveFlowsToTheEnd() { - var count = 100; - ReadOnlyObservableCollection collection; - - var cache = new SourceCache(p => p.Name); - var people = Enumerable.Range(1, count).Select(l => new Person("Name" + l, l)).ToArray(); - - cache.Connect() - .TransformAsync(async person => + const int count = 100; + using var cache = new SourceCache(person => person.Name); + var allowTransforms = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var finished = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var adds = 0; + var removes = 0; + using var subscription = cache.Connect() + .TransformAsync(async (Person person, ReactiveUI.Primitives.Optional previous, string key, CancellationToken token) => { - await Task.Delay(Random.Shared.Next(1, 12)); + await allowTransforms.Task.WaitAsync(token); return person; }) - .Bind(out collection) - .Subscribe(); + .Bind(out var collection) + .Subscribe(changes => + { + adds += changes.Adds; + removes += changes.Removes; + if (removes == count) + finished.TrySetResult(); + }, error => finished.TrySetException(error)); - foreach (var p in people) + for (var index = 0; index < count; index++) { - cache.AddOrUpdate(p); - cache.RemoveKey(p.Name); + var person = new Person("Name" + index, index); + cache.AddOrUpdate(person); + cache.RemoveKey(person.Name); } - // Add one event as an initial empty change set is sent - // NOTE TO SELF: How did this test previously work ! - var changes = await collection.ToObservableChangeSet().Take(count * 2 + 1).ToList(); - - changes.Count.Should().Be(201); - collection.Count.Should().Be(0); + allowTransforms.SetResult(); + await finished.Task.WaitAsync(TimeSpan.FromSeconds(15)); + await Assert.That(adds).IsEqualTo(count); + await Assert.That(removes).IsEqualTo(count); + await Assert.That(collection).IsEmpty(); } - [Fact] - public void ReTransformAll() + [Test] + public async Task ReTransformAll() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); - var forceTransform = new Subject(); + var forceTransform = new ReactiveUI.Primitives.Signals.Signal(); using var stub = new TransformStub(forceTransform); stub.Source.AddOrUpdate(people); forceTransform.OnNext(Unit.Default); - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Messages[1].Updates.Should().Be(10); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(10); for (var i = 1; i <= 10; i++) { var original = stub.Results.Messages[0].ElementAt(i - 1).Current; var updated = stub.Results.Messages[1].ElementAt(i - 1).Current; - updated.Should().Be(original); - ReferenceEquals(original, updated).Should().BeFalse(); + await Assert.That(updated).IsEqualTo(original); + await Assert.That(ReferenceEquals(original, updated)).IsFalse(); } } - [Fact] - public void ReTransformSelected() + [Test] + public async Task ReTransformSelected() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); - var forceTransform = new Subject>(); + var forceTransform = new ReactiveUI.Primitives.Signals.Signal>(); using var stub = new TransformStub(forceTransform); stub.Source.AddOrUpdate(people); forceTransform.OnNext(person => person.Age <= 5); - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Messages[1].Updates.Should().Be(5); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(5); for (var i = 1; i <= 5; i++) { var original = stub.Results.Messages[0].ElementAt(i - 1).Current; var updated = stub.Results.Messages[1].ElementAt(i - 1).Current; - updated.Should().Be(original); - ReferenceEquals(original, updated).Should().BeFalse(); + await Assert.That(updated).IsEqualTo(original); + await Assert.That(ReferenceEquals(original, updated)).IsFalse(); } } - [Fact] + [Test] public async Task SameKeyChanges() { using var stub = new TransformStub(); @@ -172,19 +172,19 @@ public async Task SameKeyChanges() stub.Source.AddOrUpdate(people); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should return 1 adds"); - stub.Results.Messages[0].Updates.Should().Be(9, "Should return 9 adds"); - stub.Results.Data.Count.Should().Be(1, "Should result in 1 record"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should return 1 adds"); + await Assert.That(stub.Results.Messages[0].Updates).IsEqualTo(9).Because("Should return 9 adds"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should result in 1 record"); var lastTransformed = await stub.TransformFactory(people.Last()); var onlyItemInCache = stub.Results.Data.Items[0]; - onlyItemInCache.Should().Be(lastTransformed, "Incorrect transform result"); + await Assert.That(onlyItemInCache).IsEqualTo(lastTransformed).Because("Incorrect transform result"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -194,38 +194,34 @@ public void Update() stub.Source.AddOrUpdate(newperson); stub.Source.AddOrUpdate(updated); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - stub.Results.Messages[1].Updates.Should().Be(1, "Should be 1 update"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(1).Because("Should be 1 update"); } - - - - [Theory, InlineData(true), InlineData(false)] - public void TransformOnRefresh(bool transformOnRefresh) + [Test, Arguments(true), Arguments(false)] + public async Task TransformOnRefresh(bool transformOnRefresh) { using var source = new SourceCache(p => p.Name); using var results = source.Connect() .AutoRefresh() - .TransformAsync((p, key) => Task.FromResult(new PersonWithAgeGroup(p, p.Age < 18 ? "Child" : "Adult")), TransformAsyncOptions.Default with { TransformOnRefresh = transformOnRefresh }).AsAggregator(); + .TransformAsync((p, key) => Task.FromResult(new PersonWithAgeGroup(p, p.Age < 18 ? "Child" : "Adult")), TransformAsyncOptions.Default with { TransformOnRefresh = transformOnRefresh }).AsAggregator(); var person = new Person("SomeOne", 16); source.AddOrUpdate(person); - results.Data.Count.Should().Be(1); - results.Data.Lookup("SomeOne").Value.AgeGroup.Should().Be("Child"); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Lookup("SomeOne").Value.AgeGroup).IsEqualTo("Child"); person.Age = 21; - - results.Data.Count.Should().Be(1); - results.Data.Lookup("SomeOne").Value.AgeGroup.Should().Be(transformOnRefresh ? "Adult": "Child"); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Lookup("SomeOne").Value.AgeGroup).IsEqualTo(transformOnRefresh ? "Adult" : "Child"); } - [Fact] - public void TransformAsyncCancelsTokenOnUnSubscribe() + [Test] + public async Task TransformAsyncCancelsTokenOnUnSubscribe() { using var source = new SourceCache(p => p.Name); var tcs = new TaskCompletionSource(); @@ -242,11 +238,11 @@ public void TransformAsyncCancelsTokenOnUnSubscribe() source.AddOrUpdate(new Person()); sub.Dispose(); - Assert.True(tcs.Task.IsCanceled); + await Assert.That(tcs.Task.IsCanceled).IsTrue(); } - [Theory, InlineData(10), InlineData(100)] + [Test, Arguments(10), Arguments(100)] public async Task WithMaxConcurrency(int maxConcurrency) { @@ -258,7 +254,6 @@ public async Task WithMaxConcurrency(int maxConcurrency) So it works, but how can it be tested in a scientific way ?? */ - const int transformCount = 100; using var source = new SourceCache(p => p.Name); @@ -268,7 +263,7 @@ public async Task WithMaxConcurrency(int maxConcurrency) await Task.Delay(100); return new PersonWithAgeGroup(p, p.Age < 18 ? "Child" : "Adult"); - }, TransformAsyncOptions.Default with { MaximumConcurrency = maxConcurrency }).AsAggregator(); + }, TransformAsyncOptions.Default with { MaximumConcurrency = maxConcurrency }).AsAggregator(); source.AddOrUpdate(Enumerable.Range(1, transformCount).Select(l => new Person("Person" + l, l))); diff --git a/src/DynamicData.Tests/Cache/TransformFixture.cs b/src/DynamicData.Tests/Cache/TransformFixture.cs index d149276cd..9e06da9cd 100644 --- a/src/DynamicData.Tests/Cache/TransformFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformFixture.cs @@ -1,46 +1,37 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformFixture { - [Fact] - public void Add() + [Test] + public async Task Add() { using var stub = new TransformStub(); var person = new Person("Adult1", 50); stub.Source.AddOrUpdate(person); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - stub.Results.Data.Items[0].Should().Be(stub.TransformFactory(person), "Should be same person"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(stub.Results.Data.Items[0]).IsEqualTo(stub.TransformFactory(person)).Because("Should be same person"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new TransformStub(); stub.Source.AddOrUpdate(people); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var transformed = people.Select(stub.TransformFactory).OrderBy(p => p.Age).ToArray(); - stub.Results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(transformed, "Incorrect transform result"); + await Assert.That(stub.Results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(transformed).Because("Incorrect transform result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { using var stub = new TransformStub(); var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); @@ -48,14 +39,14 @@ public void Clear() stub.Source.AddOrUpdate(people); stub.Source.Clear(); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - stub.Results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -64,79 +55,79 @@ public void Remove() stub.Source.AddOrUpdate(person); stub.Source.Remove(key); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - stub.Results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void ReTransformAll() + [Test] + public async Task ReTransformAll() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); - var forceTransform = new Subject(); + var forceTransform = new ReactiveUI.Primitives.Signals.Signal(); using var stub = new TransformStub(forceTransform); stub.Source.AddOrUpdate(people); forceTransform.OnNext(Unit.Default); - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Messages[1].Updates.Should().Be(10); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(10); for (var i = 1; i <= 10; i++) { var original = stub.Results.Messages[0].ElementAt(i - 1).Current; var updated = stub.Results.Messages[1].ElementAt(i - 1).Current; - updated.Should().Be(original); - ReferenceEquals(original, updated).Should().BeFalse(); + await Assert.That(updated).IsEqualTo(original); + await Assert.That(ReferenceEquals(original, updated)).IsFalse(); } } - [Fact] - public void ReTransformSelected() + [Test] + public async Task ReTransformSelected() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); - var forceTransform = new Subject>(); + var forceTransform = new ReactiveUI.Primitives.Signals.Signal>(); using var stub = new TransformStub(forceTransform); stub.Source.AddOrUpdate(people); forceTransform.OnNext(person => person.Age <= 5); - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Messages[1].Updates.Should().Be(5); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(5); for (var i = 1; i <= 5; i++) { var original = stub.Results.Messages[0].ElementAt(i - 1).Current; var updated = stub.Results.Messages[1].ElementAt(i - 1).Current; - updated.Should().Be(original); - ReferenceEquals(original, updated).Should().BeFalse(); + await Assert.That(updated).IsEqualTo(original); + await Assert.That(ReferenceEquals(original, updated)).IsFalse(); } } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { using var stub = new TransformStub(); var people = Enumerable.Range(1, 10).Select(i => new Person("Name", i)).ToArray(); stub.Source.AddOrUpdate(people); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should return 1 adds"); - stub.Results.Messages[0].Updates.Should().Be(9, "Should return 9 adds"); - stub.Results.Data.Count.Should().Be(1, "Should result in 1 record"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should return 1 adds"); + await Assert.That(stub.Results.Messages[0].Updates).IsEqualTo(9).Because("Should return 9 adds"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should result in 1 record"); var lastTransformed = stub.TransformFactory(people.Last()); var onlyItemInCache = stub.Results.Data.Items[0]; - onlyItemInCache.Should().Be(lastTransformed, "Incorrect transform result"); + await Assert.That(onlyItemInCache).IsEqualTo(lastTransformed).Because("Incorrect transform result"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -146,9 +137,9 @@ public void Update() stub.Source.AddOrUpdate(newperson); stub.Source.AddOrUpdate(updated); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - stub.Results.Messages[1].Updates.Should().Be(1, "Should be 1 update"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(1).Because("Should be 1 update"); } private class TransformStub : IDisposable diff --git a/src/DynamicData.Tests/Cache/TransformFixtureParallel.cs b/src/DynamicData.Tests/Cache/TransformFixtureParallel.cs index 5ff66a0d0..a9d1c12ce 100644 --- a/src/DynamicData.Tests/Cache/TransformFixtureParallel.cs +++ b/src/DynamicData.Tests/Cache/TransformFixtureParallel.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.PLinq; +#else using DynamicData.PLinq; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformFixtureParallel : IDisposable @@ -30,33 +27,33 @@ public TransformFixtureParallel() _results = new ChangeSetAggregator(pTransform); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(person), "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(person)).Because("Should be same person"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddOrUpdate(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var transformed = people.Select(_transformFactory).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(transformed, "Incorrect transform result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(transformed).Because("Incorrect transform result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); @@ -64,10 +61,10 @@ public void Clear() _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() @@ -76,8 +73,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -85,33 +82,33 @@ public void Remove() _source.AddOrUpdate(person); _source.Remove(key); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name", i)).ToArray(); _source.AddOrUpdate(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should return 1 adds"); - _results.Messages[0].Updates.Should().Be(9, "Should return 9 adds"); - _results.Data.Count.Should().Be(1, "Should result in 1 record"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should return 1 adds"); + await Assert.That(_results.Messages[0].Updates).IsEqualTo(9).Because("Should return 9 adds"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should result in 1 record"); var lastTransformed = _transformFactory(people.Last()); var onlyItemInCache = _results.Data.Items[0]; // TODO: This is not producing consitent results, the lastTransformed item should be equal to the onlyItemInCache - onlyItemInCache.Should().Be(lastTransformed, "Incorrect transform result"); + await Assert.That(onlyItemInCache).IsEqualTo(lastTransformed).Because("Incorrect transform result"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newPerson = new Person(key, 50); @@ -120,8 +117,8 @@ public void Update() _source.AddOrUpdate(newPerson); _source.AddOrUpdate(updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[1].Updates.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[1].Updates).IsEqualTo(1).Because("Should be 1 update"); } } diff --git a/src/DynamicData.Tests/Cache/TransformImmutableFixture.cs b/src/DynamicData.Tests/Cache/TransformImmutableFixture.cs index 4b529b345..a5ac90e75 100644 --- a/src/DynamicData.Tests/Cache/TransformImmutableFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformImmutableFixture.cs @@ -1,26 +1,16 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Cache; public sealed class TransformImmutableFixture { - [Fact] - public void ItemsAreManipulated_ItemsAreTransformed() + [Test] + public async Task ItemsAreManipulated_ItemsAreTransformed() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var results = source .TransformImmutable(transformFactory: Item.NameSelector) .AsAggregator(); - // Additions var item1 = new Item() { Id = 1, Name = "Item #1" }; var item2 = new Item() { Id = 2, Name = "Item #2" }; @@ -31,12 +21,11 @@ public void ItemsAreManipulated_ItemsAreTransformed() }; source.OnNext(operation1); - results.Error.Should().BeNull(); - results.Messages.Count.Should().Be(1, "1 source operation was performed"); - results.Messages.ElementAt(0).Select(change => change.CurrentIndex).Should().BeEquivalentTo(operation1.Select(change => change.CurrentIndex), "indexes should be preserved"); - results.Messages.ElementAt(0).Select(change => change.PreviousIndex).Should().BeEquivalentTo(operation1.Select(change => change.PreviousIndex), "indexes should be preserved"); - results.Data.Items.Should().BeEquivalentTo(new[] { item1.Name, item2.Name }, "2 items were added"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Messages.ElementAt(0).Select(change => change.CurrentIndex)).IsEquivalentTo(operation1.Select(change => change.CurrentIndex)).Because("indexes should be preserved"); + await Assert.That(results.Messages.ElementAt(0).Select(change => change.PreviousIndex)).IsEquivalentTo(operation1.Select(change => change.PreviousIndex)).Because("indexes should be preserved"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item1.Name, item2.Name }).Because("2 items were added"); // Replace items, changing inclusion var item3 = new Item() { Id = item1.Id, Name = "Item #3" }; @@ -48,12 +37,11 @@ public void ItemsAreManipulated_ItemsAreTransformed() }; source.OnNext(operation2); - results.Error.Should().BeNull(); - results.Messages.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.Messages.ElementAt(1).Select(change => change.CurrentIndex).Should().BeEquivalentTo(operation2.Select(change => change.CurrentIndex), "indexes should be preserved"); - results.Messages.ElementAt(1).Select(change => change.PreviousIndex).Should().BeEquivalentTo(operation2.Select(change => change.PreviousIndex), "indexes should be preserved"); - results.Data.Items.Should().BeEquivalentTo(new[] { item3.Name, item4.Name }, "2 items were replaced"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Messages.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Messages.ElementAt(1).Select(change => change.CurrentIndex)).IsEquivalentTo(operation2.Select(change => change.CurrentIndex)).Because("indexes should be preserved"); + await Assert.That(results.Messages.ElementAt(1).Select(change => change.PreviousIndex)).IsEquivalentTo(operation2.Select(change => change.PreviousIndex)).Because("indexes should be preserved"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item3.Name, item4.Name }).Because("2 items were replaced"); // Refresh items var operation3 = new ChangeSet() @@ -63,12 +51,11 @@ public void ItemsAreManipulated_ItemsAreTransformed() }; source.OnNext(operation3); - results.Error.Should().BeNull(); - results.Messages.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.Messages.ElementAt(2).Select(change => change.CurrentIndex).Should().BeEquivalentTo(operation3.Select(change => change.CurrentIndex), "indexes should be preserved"); - results.Messages.ElementAt(2).Select(change => change.PreviousIndex).Should().BeEquivalentTo(operation3.Select(change => change.PreviousIndex), "indexes should be preserved"); - results.Data.Items.Should().BeEquivalentTo(new[] { item3.Name, item4.Name }, "2 items were refreshed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Messages.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Messages.ElementAt(2).Select(change => change.CurrentIndex)).IsEquivalentTo(operation3.Select(change => change.CurrentIndex)).Because("indexes should be preserved"); + await Assert.That(results.Messages.ElementAt(2).Select(change => change.PreviousIndex)).IsEquivalentTo(operation3.Select(change => change.PreviousIndex)).Because("indexes should be preserved"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item3.Name, item4.Name }).Because("2 items were refreshed"); // Move items var operation4 = new ChangeSet() @@ -78,12 +65,11 @@ public void ItemsAreManipulated_ItemsAreTransformed() }; source.OnNext(operation4); - results.Error.Should().BeNull(); - results.Messages.Skip(3).Count().Should().Be(1, "1 source operation was performed"); - results.Messages.ElementAt(3).Select(change => change.CurrentIndex).Should().BeEquivalentTo(operation4.Select(change => change.CurrentIndex), "indexes should be preserved"); - results.Messages.ElementAt(3).Select(change => change.PreviousIndex).Should().BeEquivalentTo(operation4.Select(change => change.PreviousIndex), "indexes should be preserved"); - results.Data.Items.Should().BeEquivalentTo(new[] { item4.Name, item3.Name }, "2 items were moved"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Messages.Skip(3).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Messages.ElementAt(3).Select(change => change.CurrentIndex)).IsEquivalentTo(operation4.Select(change => change.CurrentIndex)).Because("indexes should be preserved"); + await Assert.That(results.Messages.ElementAt(3).Select(change => change.PreviousIndex)).IsEquivalentTo(operation4.Select(change => change.PreviousIndex)).Because("indexes should be preserved"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item4.Name, item3.Name }).Because("2 items were moved"); // Remove items var operation5 = new ChangeSet() @@ -93,26 +79,24 @@ public void ItemsAreManipulated_ItemsAreTransformed() }; source.OnNext(operation5); - results.Error.Should().BeNull(); - results.Messages.Skip(4).Count().Should().Be(1, "1 source operation was performed"); - results.Messages.ElementAt(4).Select(change => change.CurrentIndex).Should().BeEquivalentTo(operation5.Select(change => change.CurrentIndex), "indexes should be preserved"); - results.Messages.ElementAt(4).Select(change => change.PreviousIndex).Should().BeEquivalentTo(operation5.Select(change => change.PreviousIndex), "indexes should be preserved"); - results.Data.Items.Should().BeEmpty("2 items were removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Messages.Skip(4).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Messages.ElementAt(4).Select(change => change.CurrentIndex)).IsEquivalentTo(operation5.Select(change => change.CurrentIndex)).Because("indexes should be preserved"); + await Assert.That(results.Messages.ElementAt(4).Select(change => change.PreviousIndex)).IsEquivalentTo(operation5.Select(change => change.PreviousIndex)).Because("indexes should be preserved"); + await Assert.That(results.Data.Items).IsEmpty().Because("2 items were removed"); - - results.IsCompleted.Should().BeFalse(); + await Assert.That(results.IsCompleted).IsFalse(); } - [Fact] - public void SourceCompletes_CompletionIsPropagated() + [Test] + public async Task SourceCompletes_CompletionIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var results = source .TransformImmutable(transformFactory: Item.NameSelector) .AsAggregator(); - var item1 = new Item() { Id = 1, Name = "Item #1" }; source.OnNext(new ChangeSet() { @@ -120,12 +104,11 @@ public void SourceCompletes_CompletionIsPropagated() }); source.OnCompleted(); - results.Error.Should().BeNull(); - results.IsCompleted.Should().BeTrue(); - results.Messages.Count.Should().Be(1, "1 source operation was performed"); - results.Data.Items.Should().BeEquivalentTo(new[] { item1.Name }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsTrue(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item1.Name }).Because("1 item was added"); - // Make sure no extraneous notifications are published. var item2 = new Item() { Id = 2, Name = "Item #2" }; source.OnNext(new ChangeSet() @@ -133,11 +116,11 @@ public void SourceCompletes_CompletionIsPropagated() new(reason: ChangeReason.Add, key: item2.Id, current: item2) }); - results.Messages.Skip(1).Should().BeEmpty("no source operations should have been processed"); + await Assert.That(results.Messages.Skip(1)).IsEmpty().Because("no source operations should have been processed"); } - [Fact] - public void SourceCompletesImmediately_CompletionIsPropagated() + [Test] + public async Task SourceCompletesImmediately_CompletionIsPropagated() { var item1 = new Item() { Id = 1, Name = "Item #1" }; @@ -159,17 +142,16 @@ public void SourceCompletesImmediately_CompletionIsPropagated() .TransformImmutable(transformFactory: Item.NameSelector) .AsAggregator(); - - results.Error.Should().BeNull(); - results.IsCompleted.Should().BeTrue(); - results.Messages.Count.Should().Be(1, "1 source operation was performed"); - results.Data.Items.Should().BeEquivalentTo(new[] { item1.Name }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.IsCompleted).IsTrue(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item1.Name }).Because("1 item was added"); } - [Fact] - public void SourceErrors_ErrorIsPropagated() + [Test] + public async Task SourceErrors_ErrorIsPropagated() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception(); @@ -177,7 +159,6 @@ public void SourceErrors_ErrorIsPropagated() .TransformImmutable(transformFactory: Item.NameSelector) .AsAggregator(); - var item1 = new Item() { Id = 1, Name = "Item #1" }; source.OnNext(new ChangeSet() { @@ -185,12 +166,11 @@ public void SourceErrors_ErrorIsPropagated() }); source.OnError(error); - results.Error.Should().Be(error); - results.IsCompleted.Should().BeFalse(); - results.Messages.Count.Should().Be(1, "1 source operation was performed"); - results.Data.Items.Should().BeEquivalentTo(new[] { item1.Name }, "1 item was added"); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.IsCompleted).IsFalse(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item1.Name }).Because("1 item was added"); - // Make sure no extraneous notifications are published. var item2 = new Item() { Id = 2, Name = "Item #2" }; source.OnNext(new ChangeSet() @@ -198,11 +178,11 @@ public void SourceErrors_ErrorIsPropagated() new(reason: ChangeReason.Add, key: item2.Id, current: item2) }); - results.Messages.Skip(1).Should().BeEmpty("no source operations should have been processed"); + await Assert.That(results.Messages.Skip(1)).IsEmpty().Because("no source operations should have been processed"); } - [Fact] - public void SourceErrorsImmediately_ErrorIsPropagated() + [Test] + public async Task SourceErrorsImmediately_ErrorIsPropagated() { var item1 = new Item() { Id = 1, Name = "Item #1" }; var error = new Exception(); @@ -223,31 +203,28 @@ public void SourceErrorsImmediately_ErrorIsPropagated() .TransformImmutable(transformFactory: Item.NameSelector) .AsAggregator(); - - results.Error.Should().Be(error); - results.IsCompleted.Should().BeFalse(); - results.Messages.Count.Should().Be(1, "1 source operation was performed"); - results.Data.Items.Should().BeEquivalentTo(new[] { item1.Name }, "1 item was added"); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.IsCompleted).IsFalse(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item1.Name }).Because("1 item was added"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableCacheEx.TransformImmutable( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableCacheEx.TransformImmutable( source: (null as IObservable>)!, - transformFactory: Item.NameSelector)) - .Should().Throw(); + transformFactory: Item.NameSelector)).Throws(); - [Fact] - public void TransformFactoryIsNull_ThrowsException() - => FluentActions.Invoking(() => Observable + [Test] + public async Task TransformFactoryIsNull_ThrowsException() + => await Assert.That(() => Observable .Never>() - .TransformImmutable(transformFactory: null!)) - .Should().Throw(); + .TransformImmutable(transformFactory: null!)).Throws(); - [Fact] - public void TransformFactoryThrows_ExceptionIsCaptured() + [Test] + public async Task TransformFactoryThrows_ExceptionIsCaptured() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception(); @@ -255,36 +232,34 @@ public void TransformFactoryThrows_ExceptionIsCaptured() .TransformImmutable(transformFactory: _ => throw error) .AsAggregator(); - var item1 = new Item() { Id = 1, Name = "Item #1" }; source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: item1.Id, current: item1) }); - results.Error.Should().Be(error); - results.Messages.Should().BeEmpty("no source operations should have been processed"); - results.IsCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.Messages).IsEmpty().Because("no source operations should have been processed"); + await Assert.That(results.IsCompleted).IsFalse(); } // https://github.com/reactivemarbles/DynamicData/issues/925 - [Fact] - public void TDestinationIsValueType_DoesNotThrowException() + [Test] + public async Task TDestinationIsValueType_DoesNotThrowException() { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var results = source .TransformImmutable(transformFactory: static value => value.Length) .AsAggregator(); - source.OnNext(new ChangeSet() { new(reason: ChangeReason.Add, key: "Item #1", current: "Item #1", index: 0) }); - results.Error.Should().BeNull(); - results.Messages.Count.Should().Be(1, "1 source operation was performed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("1 source operation was performed"); } private class Item diff --git a/src/DynamicData.Tests/Cache/TransformManyAsyncFixture.cs b/src/DynamicData.Tests/Cache/TransformManyAsyncFixture.cs index 3781b1a2a..767ad771e 100644 --- a/src/DynamicData.Tests/Cache/TransformManyAsyncFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformManyAsyncFixture.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive.Linq; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; @@ -36,7 +31,7 @@ public sealed class TransformManyAsyncFixture : IDisposable public TransformManyAsyncFixture() { - unchecked{ _randomizer = new Randomizer((int)0xf7ee_bee7); } + unchecked { _randomizer = new Randomizer((int)0xf7ee_bee7); } _animalFaker = Fakers.Animal.Clone().WithSeed(_randomizer); _animalOwnerFaker = Fakers.AnimalOwner.Clone().WithSeed(_randomizer).WithInitialAnimals(_animalFaker); @@ -44,8 +39,8 @@ public TransformManyAsyncFixture() _animalOwnerResults = _animalOwners.Connect().AsAggregator(); } - [Fact] - public void EnumerableResultContainsAllInitialChildrenInSingleChangeSet() + [Test] + public async Task EnumerableResultContainsAllInitialChildrenInSingleChangeSet() { // Arrange _animalOwners.AddOrUpdate(_animalOwnerFaker.Generate(InitialOwnerCount)); @@ -54,13 +49,13 @@ public void EnumerableResultContainsAllInitialChildrenInSingleChangeSet() using var animalResults = CreateEnumerableChangeSet().AsAggregator(); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - animalResults.Messages.Count.Should().Be(1); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(animalResults.Messages.Count).IsEqualTo(1); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] - public void ResultContainsAllInitialChildren() + [Test] + public async Task ResultContainsAllInitialChildren() { // Arrange _animalOwners.AddOrUpdate(_animalOwnerFaker.Generate(InitialOwnerCount)); @@ -69,13 +64,13 @@ public void ResultContainsAllInitialChildren() using var animalResults = CreateObservableCollectionChangeSet().AsAggregator(); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - animalResults.Messages.Count.Should().Be(1); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(animalResults.Messages.Count).IsEqualTo(1); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] - public void ResultContainsChildrenFromAddedParents() + [Test] + public async Task ResultContainsChildrenFromAddedParents() { // Arrange using var animalResults = CreateObservableCollectionChangeSet().AsAggregator(); @@ -84,12 +79,12 @@ public void ResultContainsChildrenFromAddedParents() _animalOwners.AddOrUpdate(_animalOwnerFaker.Generate(InitialOwnerCount)); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - animalResults.Messages.Count.Should().Be(1); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(animalResults.Messages.Count).IsEqualTo(1); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] + [Test] public async Task ResultContainsChildrenFromAddedParentsAsync() { // Arrange @@ -103,13 +98,13 @@ public async Task ResultContainsChildrenFromAddedParentsAsync() await shared.Take(1); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - animalResults.Messages.Count.Should().BeGreaterThan(0); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(animalResults.Messages.Count).IsGreaterThan(0); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] - public void ResultContainsAddedChildrenFromExistingParents() + [Test] + public async Task ResultContainsAddedChildrenFromExistingParents() { // Arrange _animalOwners.AddOrUpdate(_animalOwnerFaker.Generate(InitialOwnerCount)); @@ -119,11 +114,11 @@ public void ResultContainsAddedChildrenFromExistingParents() _animalOwners.Items.ForEach(owner => owner.AddAnimals(_animalFaker, 1, AddCount)); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] + [Test] public async Task ResultDoesNotContainChildrenFromRemovedParentsAsync() { // Arrange @@ -137,12 +132,12 @@ public async Task ResultDoesNotContainChildrenFromRemovedParentsAsync() await taskTracker.WhenAll(); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - RemoveCount); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - RemoveCount); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] - public void ResultsWorkWithComparer() + [Test] + public async Task ResultsWorkWithComparer() { // Arrange using var animalResults = CreateObservableCollectionChangeSet(FamilyKey, comparer: Animal.NameComparer).AsAggregator(); @@ -151,11 +146,11 @@ public void ResultsWorkWithComparer() _animalOwners.AddOrUpdate(_animalOwnerFaker.Generate(InitialOwnerCount)); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults, FamilyKey, Animal.NameComparer); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults, FamilyKey, Animal.NameComparer); } - [Fact] + [Test] public async Task ResultsWithObservableCacheChangesAsync() { // Arrange @@ -170,14 +165,14 @@ public async Task ResultsWithObservableCacheChangesAsync() await taskTracker.WhenAll(); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount + ownerAddCount); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount + ownerAddCount); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Theory] - [InlineData(false)] - [InlineData(true)] - public void ResultCompletesOnlyWhenSourceCompletes(bool completeSource) + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task ResultCompletesOnlyWhenSourceCompletes(bool completeSource) { // Arrange using var animalResults = CreateObservableCollectionChangeSet().AsAggregator(); @@ -190,12 +185,12 @@ public void ResultCompletesOnlyWhenSourceCompletes(bool completeSource) } // Assert - _animalOwnerResults.IsCompleted.Should().Be(completeSource); - CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); + await Assert.That(_animalOwnerResults.IsCompleted).IsEqualTo(completeSource); + await CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange var expectedError = new Exception("Expected"); @@ -206,7 +201,7 @@ public void ResultFailsIfSourceFails() _animalOwners.Dispose(); // Assert - results.Exception.Should().Be(expectedError); + await Assert.That(results.Exception).IsEqualTo(expectedError); } public void Dispose() @@ -223,40 +218,40 @@ private AnimalOwner CreateWithSameId(AnimalOwner original) sameId.Animals.AddRange(newOwner.Animals.Items); return sameId; } - - private static void CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults, Func keySelector, IComparer comparer) + + private static async Task CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults, Func keySelector, IComparer comparer) where T : notnull { var expectedOwners = owners.ToList(); // These should be subsets of each other - expectedOwners.Should().BeSubsetOf(ownerResults.Data.Items); - ownerResults.Data.Items.Count.Should().Be(expectedOwners.Count); + await Assert.That(expectedOwners.Except(ownerResults.Data.Items).Any()).IsFalse(); + await Assert.That(ownerResults.Data.Items.Count).IsEqualTo(expectedOwners.Count); var allAnimals = expectedOwners.SelectMany(owner => owner.Animals.Items).ToList(); var expectedAnimals = allAnimals.GroupBy(keySelector).Select(group => group.OrderBy(a => a, comparer).First()).ToList(); - expectedAnimals.Should().BeSubsetOf(animalResults.Data.Items); - animalResults.Data.Count.Should().Be(expectedAnimals.Count); + await Assert.That(expectedAnimals.Except(animalResults.Data.Items).Any()).IsFalse(); + await Assert.That(animalResults.Data.Count).IsEqualTo(expectedAnimals.Count); } - private static void CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults) + private static async Task CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults) where T : notnull { var expectedOwners = owners.ToList(); // These should be subsets of each other - expectedOwners.Should().BeSubsetOf(ownerResults.Data.Items); - ownerResults.Data.Items.Count.Should().Be(expectedOwners.Count); + await Assert.That(expectedOwners.Except(ownerResults.Data.Items).Any()).IsFalse(); + await Assert.That(ownerResults.Data.Items.Count).IsEqualTo(expectedOwners.Count); // All owner animals should be in the results foreach (var owner in owners) { - owner.Animals.Items.Should().BeSubsetOf(animalResults.Data.Items); + await Assert.That(owner.Animals.Items.Except(animalResults.Data.Items).Any()).IsFalse(); } // Results should not have more than the total number of animals - animalResults.Data.Count.Should().Be(owners.Sum(owner => owner.Animals.Count)); + await Assert.That(animalResults.Data.Count).IsEqualTo(owners.Sum(owner => owner.Animals.Count)); } private Func RandomDelay => () => Task.Delay(_randomizer.Number(MinTaskDelay, MaxTaskDelay)); @@ -311,7 +306,7 @@ private class TaskTracker(Func delayFactory) public Task Create() => Add(delayFactory()); - public Task Add(Task task) => task.With(t => { lock (_lock) _tasks.Add(task); } ); + public Task Add(Task task) => task.With(t => { lock (_lock) _tasks.Add(task); }); public IEnumerable Add(IEnumerable tasks) => tasks.With(ts => ts.ForEach(t => Add(t))); @@ -354,7 +349,7 @@ private Task FromAction(Action action) => private List GetList() { - lock(_lock) + lock (_lock) { var result = _tasks.ToList(); _tasks.Clear(); diff --git a/src/DynamicData.Tests/Cache/TransformManyFixture.cs b/src/DynamicData.Tests/Cache/TransformManyFixture.cs index fdfe3a1dd..61c611224 100644 --- a/src/DynamicData.Tests/Cache/TransformManyFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformManyFixture.cs @@ -1,11 +1,4 @@ -using System; - using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -22,8 +15,8 @@ public TransformManyFixture() _results = _source.Connect().TransformMany(p => p.Relations.RecursiveSelect(r => r.Relations), p => p.Name).IgnoreUpdateWhen((current, previous) => current.Name == previous.Name).AsAggregator(); } - [Fact] - public void ChildrenAreRemovedWhenParentIsRemoved() + [Test] + public async Task ChildrenAreRemovedWhenParentIsRemoved() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -34,7 +27,7 @@ public void ChildrenAreRemovedWhenParentIsRemoved() _source.AddOrUpdate(mother); _source.Remove(mother); - _results.Data.Count.Should().Be(0, "Should be 4 in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 4 in the cache"); } public void Dispose() @@ -43,8 +36,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RecursiveChildrenCanBeAdded() + [Test] + public async Task RecursiveChildrenCanBeAdded() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -55,10 +48,10 @@ public void RecursiveChildrenCanBeAdded() _source.AddOrUpdate(mother); - _results.Data.Count.Should().Be(4, "Should be 4 in the cache"); - _results.Data.Lookup("Child1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child2").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child3").HasValue.Should().BeTrue(); - _results.Data.Lookup("Friend1").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(4).Because("Should be 4 in the cache"); + await Assert.That(_results.Data.Lookup("Child1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child2").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child3").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Friend1").HasValue).IsTrue(); } } diff --git a/src/DynamicData.Tests/Cache/TransformManyObservableCacheFixture.cs b/src/DynamicData.Tests/Cache/TransformManyObservableCacheFixture.cs index a15d1c051..71a4b57af 100644 --- a/src/DynamicData.Tests/Cache/TransformManyObservableCacheFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformManyObservableCacheFixture.cs @@ -1,249 +1,245 @@ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Tests.Domain; - -using FluentAssertions; - -using Xunit; - -namespace DynamicData.Tests.Cache; - -public class TransformManyObservableCollectionFixture -{ - [Fact] - public void FlattenObservableCollection() - { - var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); - - var childIndex = 0; - var parents = Enumerable.Range(1, 50).Select( - i => - { - var parent = new Parent( - i, - new[] - { - children[childIndex], - children[childIndex + 1] - }); - - childIndex += 2; - return parent; - }).ToArray(); - - using var source = new SourceCache(x => x.Id); - using var aggregator = source.Connect().TransformMany(p => p.Children, c => c.Name).AsAggregator(); - source.AddOrUpdate(parents); - - aggregator.Data.Count.Should().Be(100); - - //add a child to an observable collection and check the new item is added - parents[0].Children.Add(new Person("NewlyAddded", 100)); - aggregator.Data.Count.Should().Be(101); - - ////remove first parent and check children have gone - source.RemoveKey(1); - aggregator.Data.Count.Should().Be(98); - - //check items can be cleared and then added back in - var childrenInZero = parents[1].Children.ToArray(); - parents[1].Children.Clear(); - aggregator.Data.Count.Should().Be(96); - parents[1].Children.AddRange(childrenInZero); - aggregator.Data.Count.Should().Be(98); - - //replace produces an update - var replacedChild = parents[1].Children[0]; - parents[1].Children[0] = new Person("Replacement", 100); - aggregator.Data.Count.Should().Be(98); - - aggregator.Data.Lookup(replacedChild.Key).HasValue.Should().BeFalse(); - aggregator.Data.Lookup("Replacement").HasValue.Should().BeTrue(); - } - - [Fact] - public void FlattenReadOnlyObservableCollection() - { - var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); - - var childIndex = 0; - var parents = Enumerable.Range(1, 50).Select( - i => - { - var parent = new Parent( - i, - new[] - { - children[childIndex], - children[childIndex + 1] - }); - - childIndex += 2; - return parent; - }).ToArray(); - - using var source = new SourceCache(x => x.Id); - using var aggregator = source.Connect().TransformMany(p => p.ChildrenReadonly, c => c.Name).AsAggregator(); - source.AddOrUpdate(parents); - - aggregator.Data.Count.Should().Be(100); - - //add a child to an observable collection and check the new item is added - parents[0].Children.Add(new Person("NewlyAddded", 100)); - aggregator.Data.Count.Should().Be(101); - - ////remove first parent and check children have gone - source.RemoveKey(1); - aggregator.Data.Count.Should().Be(98); - - //check items can be cleared and then added back in - var childrenInZero = parents[1].Children.ToArray(); - parents[1].Children.Clear(); - aggregator.Data.Count.Should().Be(96); - parents[1].Children.AddRange(childrenInZero); - aggregator.Data.Count.Should().Be(98); - - //replace produces an update - var replacedChild = parents[1].Children[0]; - parents[1].Children[0] = new Person("Replacement", 100); - aggregator.Data.Count.Should().Be(98); - - aggregator.Data.Lookup(replacedChild.Key).HasValue.Should().BeFalse(); - aggregator.Data.Lookup("Replacement").HasValue.Should().BeTrue(); - } - - [Fact] - public void FlattenObservableCache() - { - var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); - - var childIndex = 0; - var parents = Enumerable.Range(1, 50).Select( - i => - { - var parent = new Parent( - i, - new[] - { - children[childIndex], - children[childIndex + 1] - }); - - childIndex += 2; - return parent; - }).ToArray(); - - using var source = new SourceCache(x => x.Id); - using var aggregator = source.Connect().TransformMany(p => p.ChildrenCache, c => c.Name).AsAggregator(); - source.AddOrUpdate(parents); - - aggregator.Data.Count.Should().Be(100); - - //add a child to an observable collection and check the new item is added - parents[0].Children.Add(new Person("NewlyAddded", 100)); - aggregator.Data.Count.Should().Be(101); - - ////remove first parent and check children have gone - source.RemoveKey(1); - aggregator.Data.Count.Should().Be(98); - - //check items can be cleared and then added back in - var childrenInZero = parents[1].Children.ToArray(); - parents[1].Children.Clear(); - aggregator.Data.Count.Should().Be(96); - parents[1].Children.AddRange(childrenInZero); - aggregator.Data.Count.Should().Be(98); - - //replace produces an update - var replacedChild = parents[1].Children[0]; - parents[1].Children[0] = new Person("Replacement", 100); - aggregator.Data.Count.Should().Be(98); - - aggregator.Data.Lookup(replacedChild.Key).HasValue.Should().BeFalse(); - aggregator.Data.Lookup("Replacement").HasValue.Should().BeTrue(); - } - - [Fact] - public void ObservableCollectionWithoutInitialData() - { - using var parents = new SourceCache(d => d.Id); - var collection = parents.Connect().TransformMany(d => d.Children, p => p.Name).AsObservableCache(); - - var parent = new Parent(1); - parents.AddOrUpdate(parent); - - collection.Count.Should().Be(0); - - parent.Children.Add(new Person("child1", 1)); - collection.Count.Should().Be(1); - - parent.Children.Add(new Person("child2", 2)); - collection.Count.Should().Be(2); - } - - [Fact] - public void ReadOnlyObservableCollectionWithoutInitialData() - { - using var parents = new SourceCache(d => d.Id); - var collection = parents.Connect().TransformMany(d => d.ChildrenReadonly, p => p.Name).AsObservableCache(); - - var parent = new Parent(1); - parents.AddOrUpdate(parent); - - collection.Count.Should().Be(0); - - parent.Children.Add(new Person("child1", 1)); - collection.Count.Should().Be(1); - - parent.Children.Add(new Person("child2", 2)); - collection.Count.Should().Be(2); - } - - [Fact] - public void ObservableCacheWithoutInitialData() - { - using var parents = new SourceCache(d => d.Id); - var collection = parents.Connect().TransformMany(d => d.ChildrenCache, p => p.Name).AsObservableCache(); - - var parent = new Parent(1); - parents.AddOrUpdate(parent); - - collection.Count.Should().Be(0); - - parent.Children.Add(new Person("child1", 1)); - collection.Count.Should().Be(1); - - parent.Children.Add(new Person("child2", 2)); - collection.Count.Should().Be(2); - } - - private class Parent - { - public Parent(int id, IEnumerable children) - { - Id = id; - Children = new ObservableCollection(children); - ChildrenReadonly = new ReadOnlyObservableCollection(Children); - ChildrenCache = Children.ToObservableChangeSet(x => x.Name).AsObservableCache(); - } - - public Parent(int id) - { - Id = id; - Children = new ObservableCollection(); - ChildrenReadonly = new ReadOnlyObservableCollection(Children); - ChildrenCache = Children.ToObservableChangeSet(x => x.Name).AsObservableCache(); - } - - public ObservableCollection Children { get; } - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.Cache; + +public class TransformManyObservableCollectionFixture +{ + [Test] + public async Task FlattenObservableCollection() + { + var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); + + var childIndex = 0; + var parents = Enumerable.Range(1, 50).Select( + i => + { + var parent = new Parent( + i, + new[] + { + children[childIndex], + children[childIndex + 1] + }); + + childIndex += 2; + return parent; + }).ToArray(); + + using var source = new SourceCache(x => x.Id); + using var aggregator = source.Connect().TransformMany(p => p.Children, c => c.Name).AsAggregator(); + source.AddOrUpdate(parents); + + await Assert.That(aggregator.Data.Count).IsEqualTo(100); + + //add a child to an observable collection and check the new item is added + parents[0].Children.Add(new Person("NewlyAddded", 100)); + await Assert.That(aggregator.Data.Count).IsEqualTo(101); + + ////remove first parent and check children have gone + source.RemoveKey(1); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + //check items can be cleared and then added back in + var childrenInZero = parents[1].Children.ToArray(); + parents[1].Children.Clear(); + await Assert.That(aggregator.Data.Count).IsEqualTo(96); + parents[1].Children.AddRange(childrenInZero); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + //replace produces an update + var replacedChild = parents[1].Children[0]; + parents[1].Children[0] = new Person("Replacement", 100); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + await Assert.That(aggregator.Data.Lookup(replacedChild.Key).HasValue).IsFalse(); + await Assert.That(aggregator.Data.Lookup("Replacement").HasValue).IsTrue(); + } + + [Test] + public async Task FlattenReadOnlyObservableCollection() + { + var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); + + var childIndex = 0; + var parents = Enumerable.Range(1, 50).Select( + i => + { + var parent = new Parent( + i, + new[] + { + children[childIndex], + children[childIndex + 1] + }); + + childIndex += 2; + return parent; + }).ToArray(); + + using var source = new SourceCache(x => x.Id); + using var aggregator = source.Connect().TransformMany(p => p.ChildrenReadonly, c => c.Name).AsAggregator(); + source.AddOrUpdate(parents); + + await Assert.That(aggregator.Data.Count).IsEqualTo(100); + + //add a child to an observable collection and check the new item is added + parents[0].Children.Add(new Person("NewlyAddded", 100)); + await Assert.That(aggregator.Data.Count).IsEqualTo(101); + + ////remove first parent and check children have gone + source.RemoveKey(1); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + //check items can be cleared and then added back in + var childrenInZero = parents[1].Children.ToArray(); + parents[1].Children.Clear(); + await Assert.That(aggregator.Data.Count).IsEqualTo(96); + parents[1].Children.AddRange(childrenInZero); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + //replace produces an update + var replacedChild = parents[1].Children[0]; + parents[1].Children[0] = new Person("Replacement", 100); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + await Assert.That(aggregator.Data.Lookup(replacedChild.Key).HasValue).IsFalse(); + await Assert.That(aggregator.Data.Lookup("Replacement").HasValue).IsTrue(); + } + + [Test] + public async Task FlattenObservableCache() + { + var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); + + var childIndex = 0; + var parents = Enumerable.Range(1, 50).Select( + i => + { + var parent = new Parent( + i, + new[] + { + children[childIndex], + children[childIndex + 1] + }); + + childIndex += 2; + return parent; + }).ToArray(); + + using var source = new SourceCache(x => x.Id); + using var aggregator = source.Connect().TransformMany(p => p.ChildrenCache, c => c.Name).AsAggregator(); + source.AddOrUpdate(parents); + + await Assert.That(aggregator.Data.Count).IsEqualTo(100); + + //add a child to an observable collection and check the new item is added + parents[0].Children.Add(new Person("NewlyAddded", 100)); + await Assert.That(aggregator.Data.Count).IsEqualTo(101); + + ////remove first parent and check children have gone + source.RemoveKey(1); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + //check items can be cleared and then added back in + var childrenInZero = parents[1].Children.ToArray(); + parents[1].Children.Clear(); + await Assert.That(aggregator.Data.Count).IsEqualTo(96); + parents[1].Children.AddRange(childrenInZero); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + //replace produces an update + var replacedChild = parents[1].Children[0]; + parents[1].Children[0] = new Person("Replacement", 100); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); + + await Assert.That(aggregator.Data.Lookup(replacedChild.Key).HasValue).IsFalse(); + await Assert.That(aggregator.Data.Lookup("Replacement").HasValue).IsTrue(); + } + + [Test] + public async Task ObservableCollectionWithoutInitialData() + { + using var parents = new SourceCache(d => d.Id); + var collection = parents.Connect().TransformMany(d => d.Children, p => p.Name).AsObservableCache(); + + var parent = new Parent(1); + parents.AddOrUpdate(parent); + + await Assert.That(collection.Count).IsEqualTo(0); + + parent.Children.Add(new Person("child1", 1)); + await Assert.That(collection.Count).IsEqualTo(1); + + parent.Children.Add(new Person("child2", 2)); + await Assert.That(collection.Count).IsEqualTo(2); + } + + [Test] + public async Task ReadOnlyObservableCollectionWithoutInitialData() + { + using var parents = new SourceCache(d => d.Id); + var collection = parents.Connect().TransformMany(d => d.ChildrenReadonly, p => p.Name).AsObservableCache(); + + var parent = new Parent(1); + parents.AddOrUpdate(parent); + + await Assert.That(collection.Count).IsEqualTo(0); + + parent.Children.Add(new Person("child1", 1)); + await Assert.That(collection.Count).IsEqualTo(1); + + parent.Children.Add(new Person("child2", 2)); + await Assert.That(collection.Count).IsEqualTo(2); + } + + [Test] + public async Task ObservableCacheWithoutInitialData() + { + using var parents = new SourceCache(d => d.Id); + var collection = parents.Connect().TransformMany(d => d.ChildrenCache, p => p.Name).AsObservableCache(); + + var parent = new Parent(1); + parents.AddOrUpdate(parent); + + await Assert.That(collection.Count).IsEqualTo(0); + + parent.Children.Add(new Person("child1", 1)); + await Assert.That(collection.Count).IsEqualTo(1); + + parent.Children.Add(new Person("child2", 2)); + await Assert.That(collection.Count).IsEqualTo(2); + } + + private class Parent + { + public Parent(int id, IEnumerable children) + { + Id = id; + Children = new ObservableCollection(children); + ChildrenReadonly = new ReadOnlyObservableCollection(Children); + ChildrenCache = Children.ToObservableChangeSet(x => x.Name).AsObservableCache(); + } + + public Parent(int id) + { + Id = id; + Children = new ObservableCollection(); + ChildrenReadonly = new ReadOnlyObservableCollection(Children); + ChildrenCache = Children.ToObservableChangeSet(x => x.Name).AsObservableCache(); + } + + public ObservableCollection Children { get; } + public ReadOnlyObservableCollection ChildrenReadonly { get; } - public IObservableCache ChildrenCache { get; } - - public int Id { get; } - } -} + public IObservableCache ChildrenCache { get; } + + public int Id { get; } + } +} diff --git a/src/DynamicData.Tests/Cache/TransformManyRefreshFixture.cs b/src/DynamicData.Tests/Cache/TransformManyRefreshFixture.cs index 6d14af74c..a4cd11f11 100644 --- a/src/DynamicData.Tests/Cache/TransformManyRefreshFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformManyRefreshFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformManyRefreshFixture : IDisposable @@ -22,8 +15,8 @@ public TransformManyRefreshFixture() _results = _source.Connect().AutoRefresh().TransformMany(p => p.Friends, p => p.Name).AsAggregator(); } - [Fact] - public void AutoRefresh() + [Test] + public async Task AutoRefresh() { var person = new PersonWithFriends("Person", 50); _source.AddOrUpdate(person); @@ -34,13 +27,13 @@ public void AutoRefresh() new PersonWithFriends("Friend2", 45) }; - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Lookup("Friend1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Friend2").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Lookup("Friend1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Friend2").HasValue).IsTrue(); } - [Fact] - public void AutoRefreshOnOtherProperty() + [Test] + public async Task AutoRefreshOnOtherProperty() { var friends = new List { new("Friend1", 40) }; var person = new PersonWithFriends("Person", 50, friends); @@ -49,13 +42,13 @@ public void AutoRefreshOnOtherProperty() friends.Add(new PersonWithFriends("Friend2", 45)); person.Age = 55; - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Lookup("Friend1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Friend2").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Lookup("Friend1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Friend2").HasValue).IsTrue(); } - [Fact] - public void DirectRefresh() + [Test] + public async Task DirectRefresh() { var friends = new List { new("Friend1", 40) }; var person = new PersonWithFriends("Person", 50, friends); @@ -64,9 +57,9 @@ public void DirectRefresh() friends.Add(new PersonWithFriends("Friend2", 45)); _source.Refresh(person); - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Lookup("Friend1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Friend2").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Lookup("Friend1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Friend2").HasValue).IsTrue(); } public void Dispose() diff --git a/src/DynamicData.Tests/Cache/TransformManySimpleFixture.cs b/src/DynamicData.Tests/Cache/TransformManySimpleFixture.cs index 409436e1b..6f056b623 100644 --- a/src/DynamicData.Tests/Cache/TransformManySimpleFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformManySimpleFixture.cs @@ -1,11 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformManySimpleFixture : IDisposable @@ -21,8 +15,8 @@ public TransformManySimpleFixture() _results = _source.Connect().TransformMany(p => p.Relations, p => p.Name).AsAggregator(); } - [Fact] - public void Adds() + [Test] + public async Task Adds() { var parent = new PersonWithChildren( "parent", @@ -34,11 +28,11 @@ public void Adds() new("Child3", 3) }); _source.AddOrUpdate(parent); - _results.Data.Count.Should().Be(3, "Should be 4 in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("Should be 4 in the cache"); - _results.Data.Lookup("Child1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child2").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child3").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Lookup("Child1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child2").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child3").HasValue).IsTrue(); } public void Dispose() @@ -47,8 +41,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var parent = new PersonWithChildren( "parent", @@ -59,11 +53,11 @@ public void Remove() }); _source.AddOrUpdate(parent); _source.Remove(parent); - _results.Data.Count.Should().Be(0, "Should be 4 in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 4 in the cache"); } - [Fact] - public void RemovewithIncompleteChildren() + [Test] + public async Task RemovewithIncompleteChildren() { var parent1 = new PersonWithChildren( "parent", @@ -82,11 +76,11 @@ public void RemovewithIncompleteChildren() new("Child1", 1), new("Child3", 3) }); _source.Remove(parent2); - _results.Data.Count.Should().Be(0, "Should be 0 in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 in the cache"); } - [Fact] - public void UpdateWithLessChildren() + [Test] + public async Task UpdateWithLessChildren() { var parent1 = new PersonWithChildren( "parent", @@ -105,13 +99,13 @@ public void UpdateWithLessChildren() new("Child1", 1), new("Child3", 3), }); _source.AddOrUpdate(parent2); - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Lookup("Child1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child3").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Lookup("Child1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child3").HasValue).IsTrue(); } - [Fact] - public void UpdateWithMultipleChanges() + [Test] + public async Task UpdateWithMultipleChanges() { var parent1 = new PersonWithChildren( "parent", @@ -130,9 +124,9 @@ public void UpdateWithMultipleChanges() new("Child1", 1), new("Child3", 3), new("Child5", 3), }); _source.AddOrUpdate(parent2); - _results.Data.Count.Should().Be(3, "Should be 2 in the cache"); - _results.Data.Lookup("Child1").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child3").HasValue.Should().BeTrue(); - _results.Data.Lookup("Child5").HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Lookup("Child1").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child3").HasValue).IsTrue(); + await Assert.That(_results.Data.Lookup("Child5").HasValue).IsTrue(); } } diff --git a/src/DynamicData.Tests/Cache/TransformOnObservableFixture.cs b/src/DynamicData.Tests/Cache/TransformOnObservableFixture.cs index cc37806b7..6e5a53810 100644 --- a/src/DynamicData.Tests/Cache/TransformOnObservableFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformOnObservableFixture.cs @@ -1,18 +1,10 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.Cache; @@ -34,7 +26,7 @@ public class TransformOnObservableFixture : IDisposable private readonly ISourceCache _animalCache = new SourceCache(a => a.Id); private readonly ChangeSetAggregator _animalResults; private readonly Faker _animalFaker; - private readonly Randomizer _randomizer = new (0x2112_2112); + private readonly Randomizer _randomizer = new(0x2112_2112); public TransformOnObservableFixture() { @@ -43,8 +35,8 @@ public TransformOnObservableFixture() _animalResults = _animalCache.Connect().AsAggregator(); } - [Fact] - public void ResultContainsAllInitialChildren() + [Test] + public async Task ResultContainsAllInitialChildren() { // Arrange @@ -52,13 +44,13 @@ public void ResultContainsAllInitialChildren() using var results = _animalCache.Connect().TransformOnObservable((ani, id) => Observable.Return(ani.Name)).AsAggregator(); // Assert - _animalResults.Data.Count.Should().Be(InitialCount); - results.Data.Count.Should().Be(InitialCount); - results.Messages.Count.Should().Be(1, "The child observables fire on subscription so everything should appear as a single changeset"); + await Assert.That(_animalResults.Data.Count).IsEqualTo(InitialCount); + await Assert.That(results.Data.Count).IsEqualTo(InitialCount); + await Assert.That(results.Messages.Count).IsEqualTo(1).Because("The child observables fire on subscription so everything should appear as a single changeset"); } - [Fact] - public void ResultContainsAddedValues() + [Test] + public async Task ResultContainsAddedValues() { // Arrange using var results = _animalCache.Connect().TransformOnObservable((ani, id) => Observable.Return(ani.Name)).AsAggregator(); @@ -67,13 +59,13 @@ public void ResultContainsAddedValues() _animalCache.AddOrUpdate(_animalFaker.Generate(AddCount)); // Assert - _animalResults.Data.Count.Should().Be(InitialCount + AddCount); - results.Data.Count.Should().Be(_animalResults.Data.Count); - results.Messages.Count.Should().Be(2, "Initial Adds and then the subsequent Additions should each be a single message"); + await Assert.That(_animalResults.Data.Count).IsEqualTo(InitialCount + AddCount); + await Assert.That(results.Data.Count).IsEqualTo(_animalResults.Data.Count); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("Initial Adds and then the subsequent Additions should each be a single message"); } - [Fact] - public void ResultDoesNotContainRemovedValues() + [Test] + public async Task ResultDoesNotContainRemovedValues() { // Arrange using var results = _animalCache.Connect().TransformOnObservable((ani, id) => Observable.Return(ani.Name)).AsAggregator(); @@ -82,12 +74,12 @@ public void ResultDoesNotContainRemovedValues() _animalCache.RemoveKeys(_randomizer.ListItems(_animalCache.Items.ToList(), RemoveCount).Select(a => a.Id)); // Assert - _animalResults.Data.Count.Should().Be(InitialCount - RemoveCount); - results.Data.Count.Should().Be(_animalResults.Data.Count); - results.Messages.Count.Should().Be(2, "1 for Adds and 1 for Removes"); + await Assert.That(_animalResults.Data.Count).IsEqualTo(InitialCount - RemoveCount); + await Assert.That(results.Data.Count).IsEqualTo(_animalResults.Data.Count); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("1 for Adds and 1 for Removes"); } - [Fact] + [Test] public async Task ResultUpdatesOnFutureValues() { // Create an observable that fires a wrong value on an interval a fixed number of times @@ -109,20 +101,20 @@ IObservable CreateChildObs(Animal a, int id) => await task; // Assert - _animalResults.Data.Count.Should().Be(InitialCount); - results.Data.Count.Should().Be(_animalResults.Data.Count); - results.Summary.Overall.Adds.Should().Be(InitialCount); - results.Summary.Overall.Updates.Should().Be(InitialCount * UpdateCount, $"Each item should update {UpdateCount} times"); - results.Messages.Count.Should().BeGreaterThanOrEqualTo(1, "The delay may cause the messages to appear as multiple changesets"); - _animalCache.Items.ForEach(animal => results.Data.Lookup(animal.Id).Should().Be(Optional.Some(animal.Name))); + await Assert.That(_animalResults.Data.Count).IsEqualTo(InitialCount); + await Assert.That(results.Data.Count).IsEqualTo(_animalResults.Data.Count); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(InitialCount); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(InitialCount * UpdateCount).Because($"Each item should update {UpdateCount} times"); + await Assert.That(results.Messages.Count).IsGreaterThanOrEqualTo(1).Because("The delay may cause the messages to appear as multiple changesets"); + foreach (var animal in _animalCache.Items) { await Assert.That(results.Data.Lookup(animal.Id)).IsEqualTo(ReactiveUI.Primitives.Optional.Some(animal.Name)); } } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { IObservable CreateChildObs(Animal a, int id) => completeChildren @@ -139,12 +131,12 @@ IObservable CreateChildObs(Animal a, int id) => } // Assert - _animalResults.IsCompleted.Should().Be(completeSource); - results.IsCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(_animalResults.IsCompleted).IsEqualTo(completeSource); + await Assert.That(results.IsCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void ResultFailsIfChildFails() + [Test] + public async Task ResultFailsIfChildFails() { // Arrange var expectedError = new Exception("Expected"); @@ -154,11 +146,11 @@ public void ResultFailsIfChildFails() using var results = _animalCache.Connect().TransformOnObservable(_ => throwObservable).AsAggregator(); // Assert - results.Error.Should().Be(expectedError); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange var expectedError = new Exception("Expected"); @@ -169,17 +161,17 @@ public void ResultFailsIfSourceFails() _animalCache.Dispose(); // Assert - results.Error.Should().Be(expectedError); + await Assert.That(results.Error).IsEqualTo(expectedError); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void OrderOfChangesIsPreserved(bool removeFirst) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task OrderOfChangesIsPreserved(bool removeFirst) { // Arrange using var results = _animalCache.Connect().TransformOnObservable(Observable.Return).AsAggregator(); - (var firstReason, var nextReason, var expectedChanges) = removeFirst + (var firstReason, var nextReason, var expectedChanges) = removeFirst ? (ChangeReason.Remove, ChangeReason.Add, InitialCount * 2) : (ChangeReason.Add, ChangeReason.Remove, InitialCount * 3); @@ -199,10 +191,10 @@ public void OrderOfChangesIsPreserved(bool removeFirst) }); // Assert - results.Messages.Count.Should().Be(2); - results.Messages[1].Count.Should().Be(expectedChanges); - results.Messages[1].Take(InitialCount).All(change => change.Reason == firstReason).Should().BeTrue(); - results.Messages[1].Skip(InitialCount).All(change => change.Reason == nextReason).Should().BeTrue(); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Count).IsEqualTo(expectedChanges); + await Assert.That(results.Messages[1].Take(InitialCount).All(change => change.Reason == firstReason)).IsTrue(); + await Assert.That(results.Messages[1].Skip(InitialCount).All(change => change.Reason == nextReason)).IsTrue(); } public void Dispose() diff --git a/src/DynamicData.Tests/Cache/TransformSafeAsyncFixture.cs b/src/DynamicData.Tests/Cache/TransformSafeAsyncFixture.cs index b0b26cfb6..cf61820dc 100644 --- a/src/DynamicData.Tests/Cache/TransformSafeAsyncFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformSafeAsyncFixture.cs @@ -1,82 +1,76 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; -using DynamicData.Cache; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Cache; public class TransformSafeAsyncFixture { - [Fact] - public void ReTransformAll() + [Test] + public async Task ReTransformAll() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); - var forceTransform = new Subject(); + var forceTransform = new ReactiveUI.Primitives.Signals.Signal(); using var stub = new TransformStub(forceTransform); stub.Source.AddOrUpdate(people); forceTransform.OnNext(Unit.Default); - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Messages[1].Updates.Should().Be(10); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(10); for (var i = 1; i <= 10; i++) { var original = stub.Results.Messages[0].ElementAt(i - 1).Current; var updated = stub.Results.Messages[1].ElementAt(i - 1).Current; - updated.Should().Be(original); - ReferenceEquals(original, updated).Should().BeFalse(); + await Assert.That(updated).IsEqualTo(original); + await Assert.That(ReferenceEquals(original, updated)).IsFalse(); } } - [Fact] - public void ReTransformSelected() + [Test] + public async Task ReTransformSelected() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); - var forceTransform = new Subject>(); + var forceTransform = new ReactiveUI.Primitives.Signals.Signal>(); using var stub = new TransformStub(forceTransform); stub.Source.AddOrUpdate(people); forceTransform.OnNext(person => person.Age <= 5); - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Messages[1].Updates.Should().Be(5); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(5); for (int i = 1; i <= 5; i++) { var original = stub.Results.Messages[0].ElementAt(i - 1).Current; var updated = stub.Results.Messages[1].ElementAt(i - 1).Current; - updated.Should().Be(original); - ReferenceEquals(original, updated).Should().BeFalse(); + await Assert.That(updated).IsEqualTo(original); + await Assert.That(ReferenceEquals(original, updated)).IsFalse(); } } - [Fact] + [Test] public async Task Add() { using var stub = new TransformStub(); var person = new Person("Adult1", 50); stub.Source.AddOrUpdate(person); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); var firstPerson = await stub.TransformFactory(person); - stub.Results.Data.Items[0].Should().Be(firstPerson, "Should be same person"); + await Assert.That(stub.Results.Data.Items[0]).IsEqualTo(firstPerson).Because("Should be same person"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -85,15 +79,15 @@ public void Remove() stub.Source.AddOrUpdate(person); stub.Source.Remove(key); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 80 adds"); - stub.Results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 adds"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -104,28 +98,28 @@ public void Update() stub.Source.AddOrUpdate(newperson); stub.Source.AddOrUpdate(updated); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - stub.Results.Messages[1].Updates.Should().Be(1, "Should be 1 update"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(stub.Results.Messages[1].Updates).IsEqualTo(1).Because("Should be 1 update"); } } - [Fact] + [Test] public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new TransformStub(); stub.Source.AddOrUpdate(people); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var result = await Task.WhenAll(people.Select(stub.TransformFactory)); var transformed = result.OrderBy(p => p.Age).ToArray(); - stub.Results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(stub.Results.Data.Items.OrderBy(p => p.Age), "Incorrect transform result"); + await Assert.That(stub.Results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(stub.Results.Data.Items.OrderBy(p => p.Age)).Because("Incorrect transform result"); } - [Fact] + [Test] public async Task SameKeyChanges() { using var stub = new TransformStub(); @@ -133,19 +127,19 @@ public async Task SameKeyChanges() stub.Source.AddOrUpdate(people); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should return 1 adds"); - stub.Results.Messages[0].Updates.Should().Be(9, "Should return 9 adds"); - stub.Results.Data.Count.Should().Be(1, "Should result in 1 record"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should return 1 adds"); + await Assert.That(stub.Results.Messages[0].Updates).IsEqualTo(9).Because("Should return 9 adds"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should result in 1 record"); var lastTransformed = await stub.TransformFactory(people.Last()); var onlyItemInCache = stub.Results.Data.Items[0]; - onlyItemInCache.Should().Be(lastTransformed, "Incorrect transform result"); + await Assert.That(onlyItemInCache).IsEqualTo(lastTransformed).Because("Incorrect transform result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { using var stub = new TransformStub(); var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); @@ -153,14 +147,14 @@ public void Clear() stub.Source.AddOrUpdate(people); stub.Source.Clear(); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - stub.Results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void HandleError() + [Test] + public async Task HandleError() { using var stub = new TransformStub(p => { @@ -172,20 +166,20 @@ public void HandleError() var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); stub.Source.AddOrUpdate(people); - stub.Results.Error.Should().BeNull(); + await Assert.That(stub.Results.Error).IsNull(); Exception? error = null; stub.Source.Connect() .Subscribe(changes => { }, ex => error = ex); - error.Should().BeNull(); + await Assert.That(error).IsNull(); - stub.HandledErrors.Count.Should().Be(50); - stub.Results.Data.Count.Should().Be(50); + await Assert.That(stub.HandledErrors.Count).IsEqualTo(50); + await Assert.That(stub.Results.Data.Count).IsEqualTo(50); } - [Theory, InlineData(true), InlineData(false)] - public void TransformOnRefresh(bool transformOnRefresh) + [Test, Arguments(true), Arguments(false)] + public async Task TransformOnRefresh(bool transformOnRefresh) { int errorCount = 0; using var source = new SourceCache(p => p.Name); @@ -196,20 +190,19 @@ public void TransformOnRefresh(bool transformOnRefresh) var person = new Person("SomeOne", 16); source.AddOrUpdate(person); - results.Data.Count.Should().Be(1); - results.Data.Lookup("SomeOne").Value.AgeGroup.Should().Be("Child"); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Lookup("SomeOne").Value.AgeGroup).IsEqualTo("Child"); person.Age = 21; - - results.Data.Count.Should().Be(1); - results.Data.Lookup("SomeOne").Value.AgeGroup.Should().Be(transformOnRefresh ? "Adult" : "Child"); - errorCount.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Lookup("SomeOne").Value.AgeGroup).IsEqualTo(transformOnRefresh ? "Adult" : "Child"); + await Assert.That(errorCount).IsEqualTo(0); } - [Fact] - public void TransformSafeAsyncCancelsTokenOnUnSubscribe() + [Test] + public async Task TransformSafeAsyncCancelsTokenOnUnSubscribe() { using var source = new SourceCache(p => p.Name); var tcs = new TaskCompletionSource(); @@ -227,11 +220,11 @@ public void TransformSafeAsyncCancelsTokenOnUnSubscribe() source.AddOrUpdate(new Person()); sub.Dispose(); - Assert.True(tcs.Task.IsCanceled); + await Assert.That(tcs.Task.IsCanceled).IsTrue(); } - [Theory, InlineData(10), InlineData(100)] + [Test, Arguments(10), Arguments(100)] public async Task WithMaxConcurrency(int maxConcurrency) { @@ -258,16 +251,13 @@ public async Task WithMaxConcurrency(int maxConcurrency) , TransformAsyncOptions.Default with { MaximumConcurrency = maxConcurrency }) .AsAggregator(); - source.AddOrUpdate(Enumerable.Range(1, transformCount).Select(l => new Person("Person" + l, l))); - await results.Data.CountChanged.Where(c => c == transformCount).Take(1); - errorCount.Should().Be(0); + await Assert.That(errorCount).IsEqualTo(0); } - private class TransformStub : IDisposable { public TransformStub() diff --git a/src/DynamicData.Tests/Cache/TransformSafeFixture.cs b/src/DynamicData.Tests/Cache/TransformSafeFixture.cs index cd9aabc7d..ddfad2801 100644 --- a/src/DynamicData.Tests/Cache/TransformSafeFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformSafeFixture.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformSafeFixture : IDisposable @@ -39,25 +35,25 @@ public TransformSafeFixture() _results = new ChangeSetAggregator(safeTransform); } - [Fact] - public void AddWithError() + [Test] + public async Task AddWithError() { var person = new Person("Person", 3); _source.AddOrUpdate(person); - _errors.Count.Should().Be(1, "Should be 1 error reported"); - _results.Messages.Count.Should().Be(1, "Should be 1 message"); + await Assert.That(_errors.Count).IsEqualTo(1).Because("Should be 1 error reported"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 message"); } - [Fact] - public void AddWithNoError() + [Test] + public async Task AddWithNoError() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(person), "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(person)).Because("Should be same person"); } public void Dispose() @@ -66,8 +62,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void UpdateBatch() + [Test] + public async Task UpdateBatch() { const string key = "Adult1"; var update1 = new Person(key, 1); @@ -82,31 +78,31 @@ public void UpdateBatch() innerCache.AddOrUpdate(update3); }); - _errors.Count.Should().Be(1, "Should be 1 error reported"); - _results.Messages.Count.Should().Be(1, "Should be 1 messages"); + await Assert.That(_errors.Count).IsEqualTo(1).Because("Should be 1 error reported"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 messages"); - _results.Data.Count.Should().Be(1, "Should 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(update2), "Change 2 shoud be the only item cached"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(update2)).Because("Change 2 shoud be the only item cached"); } - [Fact] - public void UpdateBatchAndClear() + [Test] + public async Task UpdateBatchAndClear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddOrUpdate(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); - _errors.Count.Should().Be(33, "Should be 33 errors"); - _results.Messages[0].Adds.Should().Be(67, "Should be 67 add"); - _results.Messages[1].Removes.Should().Be(67, "Should be 67 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_errors.Count).IsEqualTo(33).Because("Should be 33 errors"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(67).Because("Should be 67 add"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(67).Because("Should be 67 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void UpdateSucessively() + [Test] + public async Task UpdateSucessively() { const string key = "Adult1"; var update1 = new Person(key, 1); @@ -117,10 +113,10 @@ public void UpdateSucessively() _source.AddOrUpdate(update2); _source.AddOrUpdate(update3); - _errors.Count.Should().Be(1, "Should be 1 error reported"); - _results.Messages.Count.Should().Be(3, "Should be 3 messages"); + await Assert.That(_errors.Count).IsEqualTo(1).Because("Should be 1 error reported"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 messages"); - _results.Data.Count.Should().Be(1, "Should 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(update2), "Change 2 shoud be the only item cached"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(update2)).Because("Change 2 shoud be the only item cached"); } } diff --git a/src/DynamicData.Tests/Cache/TransformSafeParallelFixture.cs b/src/DynamicData.Tests/Cache/TransformSafeParallelFixture.cs index dace5e75d..9093fc066 100644 --- a/src/DynamicData.Tests/Cache/TransformSafeParallelFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformSafeParallelFixture.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformSafeParallelFixture : IDisposable @@ -39,25 +35,25 @@ public TransformSafeParallelFixture() _results = new ChangeSetAggregator(safeTransform); } - [Fact] - public void AddWithError() + [Test] + public async Task AddWithError() { var person = new Person("Person", 3); _source.AddOrUpdate(person); - _errors.Count.Should().Be(1, "Should be 1 error reported"); - _results.Messages.Count.Should().Be(1, "Should be 1 messages"); + await Assert.That(_errors.Count).IsEqualTo(1).Because("Should be 1 error reported"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 messages"); } - [Fact] - public void AddWithNoError() + [Test] + public async Task AddWithNoError() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(person), "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(person)).Because("Should be same person"); } public void Dispose() @@ -66,8 +62,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void UpdateBatch() + [Test] + public async Task UpdateBatch() { const string key = "Adult1"; var update1 = new Person(key, 1); @@ -82,31 +78,31 @@ public void UpdateBatch() updater.AddOrUpdate(update3); }); - _errors.Count.Should().Be(1, "Should be 1 error reported"); - _results.Messages.Count.Should().Be(1, "Should be 1 messages"); + await Assert.That(_errors.Count).IsEqualTo(1).Because("Should be 1 error reported"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 messages"); - _results.Data.Count.Should().Be(1, "Should 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(update2), "Change 2 shoud be the only item cached"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(update2)).Because("Change 2 shoud be the only item cached"); } - [Fact] - public void UpdateBatchAndClear() + [Test] + public async Task UpdateBatchAndClear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddOrUpdate(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); - _errors.Count.Should().Be(33, "Should be 33 errors"); - _results.Messages[0].Adds.Should().Be(67, "Should be 67 add"); - _results.Messages[1].Removes.Should().Be(67, "Should be 67 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_errors.Count).IsEqualTo(33).Because("Should be 33 errors"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(67).Because("Should be 67 add"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(67).Because("Should be 67 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void UpdateSucessively() + [Test] + public async Task UpdateSucessively() { const string key = "Adult1"; var update1 = new Person(key, 1); @@ -117,10 +113,10 @@ public void UpdateSucessively() _source.AddOrUpdate(update2); _source.AddOrUpdate(update3); - _errors.Count.Should().Be(1, "Should be 1 error reported"); - _results.Messages.Count.Should().Be(3, "Should be 3 messages"); + await Assert.That(_errors.Count).IsEqualTo(1).Because("Should be 1 error reported"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 messages"); - _results.Data.Count.Should().Be(1, "Should 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(update2), "Change 2 shoud be the only item cached"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(update2)).Because("Change 2 shoud be the only item cached"); } } diff --git a/src/DynamicData.Tests/Cache/TransformTreeFixture.cs b/src/DynamicData.Tests/Cache/TransformTreeFixture.cs index 33bf44573..2d0a20780 100644 --- a/src/DynamicData.Tests/Cache/TransformTreeFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformTreeFixture.cs @@ -1,17 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformTreeFixture : IDisposable { - private readonly BehaviorSubject, bool>> _filter; + private readonly ReactiveUI.Primitives.Signals.StateSignal, bool>> _filter; private readonly IObservableCache, int> _result; @@ -21,30 +12,30 @@ public TransformTreeFixture() { _sourceCache = new SourceCache(e => e.Id); - _filter = new BehaviorSubject, bool>>(n => n.IsRoot); + _filter = new ReactiveUI.Primitives.Signals.StateSignal, bool>>(n => n.IsRoot); _result = _sourceCache.Connect().TransformToTree(e => e.BossId, _filter).AsObservableCache(); } - [Fact] - public void AddMissingChild() + [Test] + public async Task AddMissingChild() { var boss = new EmployeeDto(2) { BossId = 0, Name = "Boss" }; var minion = new EmployeeDto(1) { BossId = 2, Name = "DogsBody" }; _sourceCache.AddOrUpdate(boss); _sourceCache.AddOrUpdate(minion); - _result.Count.Should().Be(1); + await Assert.That(_result.Count).IsEqualTo(1); var firstNode = _result.Items[0]; - firstNode.Item.Should().Be(boss); + await Assert.That(firstNode.Item).IsEqualTo(boss); var childNode = firstNode.Children.Items[0]; - childNode.Item.Should().Be(minion); + await Assert.That(childNode.Item).IsEqualTo(minion); } - [Fact] - public void AddMissingParent() + [Test] + public async Task AddMissingParent() { var emp10 = new EmployeeDto(10) { BossId = 11, Name = "Employee10" }; var emp11 = new EmployeeDto(11) { BossId = 0, Name = "Employee11" }; @@ -56,40 +47,40 @@ public void AddMissingParent() _sourceCache.AddOrUpdate(emp12); _sourceCache.AddOrUpdate(emp13); - _result.Count.Should().Be(1); + await Assert.That(_result.Count).IsEqualTo(1); var emp11Node = _result.Lookup(11); - emp11Node.HasValue.Should().BeTrue(); - emp11Node.Value.Children.Count.Should().Be(2); + await Assert.That(emp11Node.HasValue).IsTrue(); + await Assert.That(emp11Node.Value.Children.Count).IsEqualTo(2); var emp10Node = emp11Node.Value.Children.Lookup(10); - emp10Node.HasValue.Should().BeTrue(); - emp10Node.Value.Children.Count.Should().Be(0); + await Assert.That(emp10Node.HasValue).IsTrue(); + await Assert.That(emp10Node.Value.Children.Count).IsEqualTo(0); var emp13Node = emp11Node.Value.Children.Lookup(13); - emp13Node.HasValue.Should().BeTrue(); - emp13Node.Value.Children.Count.Should().Be(1); + await Assert.That(emp13Node.HasValue).IsTrue(); + await Assert.That(emp13Node.Value.Children.Count).IsEqualTo(1); var emp12Node = emp13Node.Value.Children.Lookup(12); - emp12Node.HasValue.Should().BeTrue(); - emp12Node.Value.Children.Count.Should().Be(0); + await Assert.That(emp12Node.HasValue).IsTrue(); + await Assert.That(emp12Node.Value.Children.Count).IsEqualTo(0); } - [Fact] - public void BuildTreeFromMixedData() + [Test] + public async Task BuildTreeFromMixedData() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); - _result.Count.Should().Be(2); + await Assert.That(_result.Count).IsEqualTo(2); var firstNode = _result.Items[0]; - firstNode.Children.Count.Should().Be(3); + await Assert.That(firstNode.Children.Count).IsEqualTo(3); var secondNode = _result.Items.Skip(1).First(); - secondNode.Children.Count.Should().Be(0); + await Assert.That(secondNode.Children.Count).IsEqualTo(0); } - [Fact] - public void ChangeParent() + [Test] + public async Task ChangeParent() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); @@ -104,13 +95,13 @@ public void ChangeParent() var emp4 = _result.Lookup(1).Value.Children.Lookup(4).Value; //check boss is = 1 - emp4.Parent.Value.Item.Id.Should().Be(1); + await Assert.That(emp4.Parent.Value.Item.Id).IsEqualTo(1); //lookup previous boss (emp 4 should no longet be a child) var emp3 = _result.Lookup(1).Value.Children.Lookup(3).Value; //emp 4 must be removed from previous boss's child collection - emp3.Children.Lookup(4).HasValue.Should().BeFalse(); + await Assert.That(emp3.Children.Lookup(4).HasValue).IsFalse(); } public void Dispose() @@ -120,31 +111,31 @@ public void Dispose() _filter.Dispose(); } - [Fact] - public void RemoveAChildNodeWillPushOrphansUpTheHierachy() + [Test] + public async Task RemoveAChildNodeWillPushOrphansUpTheHierachy() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); _sourceCache.Remove(4); //we expect the children of node 4 to be pushed up become new roots - _result.Count.Should().Be(3); + await Assert.That(_result.Count).IsEqualTo(3); var thirdNode = _result.Items.Skip(2).First(); - thirdNode.Key.Should().Be(5); + await Assert.That(thirdNode.Key).IsEqualTo(5); } - [Fact] - public void RemoveARootNodeWillPushOrphansUpTheHierachy() + [Test] + public async Task RemoveARootNodeWillPushOrphansUpTheHierachy() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); _sourceCache.Remove(1); //we expect the original children nodes to be pushed up become new roots - _result.Count.Should().Be(4); + await Assert.That(_result.Count).IsEqualTo(4); } - [Fact] - public void UpdateAParentNode() + [Test] + public async Task UpdateAParentNode() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); @@ -155,15 +146,15 @@ public void UpdateAParentNode() }; _sourceCache.AddOrUpdate(changed); - _result.Count.Should().Be(2); + await Assert.That(_result.Count).IsEqualTo(2); var firstNode = _result.Items[0]; - firstNode.Children.Count.Should().Be(3); - firstNode.Item.Name.Should().Be(changed.Name); + await Assert.That(firstNode.Children.Count).IsEqualTo(3); + await Assert.That(firstNode.Item.Name).IsEqualTo(changed.Name); } - [Fact] - public void UpdateChildNode() + [Test] + public async Task UpdateChildNode() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); @@ -174,33 +165,33 @@ public void UpdateChildNode() }; _sourceCache.AddOrUpdate(changed); - _result.Count.Should().Be(2); + await Assert.That(_result.Count).IsEqualTo(2); var changedNode = _result.Items[0].Children.Items[0]; - changedNode.Parent.Value.Item.Id.Should().Be(1); - changedNode.Children.Count.Should().Be(1); - changed.Name.Should().Be(changed.Name); + await Assert.That(changedNode.Parent.Value.Item.Id).IsEqualTo(1); + await Assert.That(changedNode.Children.Count).IsEqualTo(1); + await Assert.That(changedNode.Item.Name).IsEqualTo(changed.Name); } - [Fact] - public void UseCustomFilter() + [Test] + public async Task UseCustomFilter() { _sourceCache.AddOrUpdate(TransformTreeFixture.CreateEmployees()); - _result.Count.Should().Be(2); + await Assert.That(_result.Count).IsEqualTo(2); _filter.OnNext(node => true); - _result.Count.Should().Be(8); + await Assert.That(_result.Count).IsEqualTo(8); _filter.OnNext(node => node.Depth == 3); - _result.Count.Should().Be(1); + await Assert.That(_result.Count).IsEqualTo(1); _sourceCache.RemoveKey(5); - _result.Count.Should().Be(0); + await Assert.That(_result.Count).IsEqualTo(0); _filter.OnNext(node => node.IsRoot); - _result.Count.Should().Be(2); + await Assert.That(_result.Count).IsEqualTo(2); } private static IEnumerable CreateEmployees() diff --git a/src/DynamicData.Tests/Cache/TransformTreeWithRefreshFixture.cs b/src/DynamicData.Tests/Cache/TransformTreeWithRefreshFixture.cs index 68748a69b..8d539ccd8 100644 --- a/src/DynamicData.Tests/Cache/TransformTreeWithRefreshFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformTreeWithRefreshFixture.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Cache; @@ -28,72 +25,72 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void DoNotUpdateTreeWhenParentIdNotChanged() + [Test] + public async Task DoNotUpdateTreeWhenParentIdNotChanged() { _sourceCache.Lookup(1).Value.Name = "Employee11"; _sourceCache.Lookup(2).Value.Name = "Employee22"; var node1 = _result.Lookup(1); - node1.HasValue.Should().BeTrue(); - node1.Value.Parent.HasValue.Should().BeFalse(); + await Assert.That(node1.HasValue).IsTrue(); + await Assert.That(node1.Value.Parent.HasValue).IsFalse(); var node2 = node1.Value.Children.Lookup(2); - node2.HasValue.Should().BeTrue(); - node2.Value.Parent.HasValue.Should().BeTrue(); - node2.Value.Parent.Value.Key.Should().Be(1); + await Assert.That(node2.HasValue).IsTrue(); + await Assert.That(node2.Value.Parent.HasValue).IsTrue(); + await Assert.That(node2.Value.Parent.Value.Key).IsEqualTo(1); } - [Fact] - public void UpdateTreeWhenParentIdOfNonRootItemChangedToExistingId() + [Test] + public async Task UpdateTreeWhenParentIdOfNonRootItemChangedToExistingId() { _sourceCache.Lookup(2).Value.BossId = 3; // node 2 added to node 3 children cache var node2 = _result.Lookup(1).Value.Children.Lookup(3).Value.Children.Lookup(2); - node2.HasValue.Should().BeTrue(); - node2.Value.IsRoot.Should().BeFalse(); + await Assert.That(node2.HasValue).IsTrue(); + await Assert.That(node2.Value.IsRoot).IsFalse(); // node 2 removed from node 1 children cache - _result.Lookup(1).Value.Children.Lookup(2).HasValue.Should().BeFalse(); + await Assert.That(_result.Lookup(1).Value.Children.Lookup(2).HasValue).IsFalse(); } - [Fact] - public void UpdateTreeWhenParentIdOfNonRootItemChangedToNonExistingId() + [Test] + public async Task UpdateTreeWhenParentIdOfNonRootItemChangedToNonExistingId() { _sourceCache.Lookup(2).Value.BossId = 25; // node 2 added to root var node2 = _result.Lookup(2); - node2.HasValue.Should().BeTrue(); - node2.Value.IsRoot.Should().BeTrue(); + await Assert.That(node2.HasValue).IsTrue(); + await Assert.That(node2.Value.IsRoot).IsTrue(); // node 2 removed from node 1 children cache - _result.Lookup(1).Value.Children.Lookup(2).HasValue.Should().BeFalse(); + await Assert.That(_result.Lookup(1).Value.Children.Lookup(2).HasValue).IsFalse(); } - [Fact] - public void UpdateTreeWhenParentIdOfRootItemChangedToExistingId() + [Test] + public async Task UpdateTreeWhenParentIdOfRootItemChangedToExistingId() { _sourceCache.Lookup(1).Value.BossId = 7; // node 1 added to node 7 children cache var node1 = _result.Lookup(7).Value.Children.Lookup(1); - node1.HasValue.Should().BeTrue(); - node1.Value.IsRoot.Should().BeFalse(); + await Assert.That(node1.HasValue).IsTrue(); + await Assert.That(node1.Value.IsRoot).IsFalse(); // node 1 removed from root - _result.Lookup(1).HasValue.Should().BeFalse(); + await Assert.That(_result.Lookup(1).HasValue).IsFalse(); } - [Fact] - public void UpdateTreeWhenParentIdOfRootItemChangedToNonExistingId() + [Test] + public async Task UpdateTreeWhenParentIdOfRootItemChangedToNonExistingId() { _sourceCache.Lookup(1).Value.BossId = 25; // node 1 added to node 7 children cache var node1 = _result.Lookup(1); - node1.HasValue.Should().BeTrue(); - node1.Value.IsRoot.Should().BeTrue(); + await Assert.That(node1.HasValue).IsTrue(); + await Assert.That(node1.Value.IsRoot).IsTrue(); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] diff --git a/src/DynamicData.Tests/Cache/TransformWithInlineUpdateFixture.cs b/src/DynamicData.Tests/Cache/TransformWithInlineUpdateFixture.cs index 0be034a13..0f24b5a02 100644 --- a/src/DynamicData.Tests/Cache/TransformWithInlineUpdateFixture.cs +++ b/src/DynamicData.Tests/Cache/TransformWithInlineUpdateFixture.cs @@ -1,17 +1,11 @@ -using System; -using System.Linq; using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TransformWithInlineUpdateFixture { - [Fact] - public void InlineUpdate() + [Test] + public async Task InlineUpdate() { using var stub = new TransformWithInlineUpdateFixtureStub(); var person = new Person("Adult1", 50); @@ -24,28 +18,28 @@ public void InlineUpdate() var updatedTransform = stub.Results.Data.Items[0]; - updatedTransform.Age.Should().Be(personUpdate.Age, "Age should be updated from 50 to 51."); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - transformedPerson.Should().Be(stub.Results.Data.Items[0], "Should be same transformed person instance."); + await Assert.That(updatedTransform.Age).IsEqualTo(personUpdate.Age).Because("Age should be updated from 50 to 51."); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(stub.Results.Data.Items[0]).IsSameReferenceAs(transformedPerson).Because("Should be same transformed person instance."); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new TransformWithInlineUpdateFixtureStub(); stub.Source.AddOrUpdate(people); - stub.Results.Messages.Count.Should().Be(1, "Should be 1 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var transformed = people.Select(stub.TransformFactory).OrderBy(p => p.Age).ToArray(); - stub.Results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(transformed, "Incorrect transform result"); + await Assert.That(stub.Results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(transformed, Person.NameAgeGenderComparer).Because("Incorrect transform result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { using var stub = new TransformWithInlineUpdateFixtureStub(); var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); @@ -53,14 +47,14 @@ public void Clear() stub.Source.AddOrUpdate(people); stub.Source.Clear(); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - stub.Results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -69,16 +63,15 @@ public void Remove() stub.Source.AddOrUpdate(person); stub.Source.Remove(key); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - stub.Results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - stub.Results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(stub.Results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - - [Fact] - public void TransformOnRefresh() + [Test] + public async Task TransformOnRefresh() { using var stub = new TransformWithInlineUpdateFixtureStub(true); var person = new Person("Adult1", 50); @@ -91,10 +84,10 @@ public void TransformOnRefresh() var updatedTransform = stub.Results.Data.Items[0]; - updatedTransform.Age.Should().Be(51, "Age should be updated from 50 to 51."); - stub.Results.Messages.Count.Should().Be(2, "Should be 2 updates"); - stub.Results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - transformedPerson.Should().Be(stub.Results.Data.Items[0], "Should be same transformed person instance."); + await Assert.That(updatedTransform.Age).IsEqualTo(51).Because("Age should be updated from 50 to 51."); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(stub.Results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(stub.Results.Data.Items[0]).IsSameReferenceAs(transformedPerson).Because("Should be same transformed person instance."); } private class TransformWithInlineUpdateFixtureStub : IDisposable @@ -109,7 +102,7 @@ public TransformWithInlineUpdateFixtureStub(bool transformOnRefresh = false) public ISourceCache Source { get; } = new SourceCache(p => p.Name); - public Action UpdateAction { get; } = (transformed, current) => transformed.Age=current.Age; + public Action UpdateAction { get; } = (transformed, current) => transformed.Age = current.Age; public Func TransformFactory { get; } = (p) => new Person(p.Name, p.Age); diff --git a/src/DynamicData.Tests/Cache/TrueForAllFixture.cs b/src/DynamicData.Tests/Cache/TrueForAllFixture.cs index f9dece32b..7d97dafbe 100644 --- a/src/DynamicData.Tests/Cache/TrueForAllFixture.cs +++ b/src/DynamicData.Tests/Cache/TrueForAllFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TrueForAllFixture : IDisposable @@ -22,8 +14,8 @@ public TrueForAllFixture() public void Dispose() => _source.Dispose(); - [Fact] - public void InitialItemReturnsFalseWhenObservableHasNoValue() + [Test] + public async Task InitialItemReturnsFalseWhenObservableHasNoValue() { bool? valueReturned = null; var subscribed = _observable.Subscribe(result => { valueReturned = result; }); @@ -31,20 +23,20 @@ public void InitialItemReturnsFalseWhenObservableHasNoValue() var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); - valueReturned.HasValue.Should().BeTrue(); + await Assert.That(valueReturned.HasValue).IsTrue(); if (valueReturned is null) { throw new InvalidOperationException(nameof(valueReturned)); } - valueReturned.Value.Should().Be(false, "The initial value should be false"); + await Assert.That(valueReturned.Value).IsFalse().Because("The initial value should be false"); subscribed.Dispose(); } - [Fact] - public void InlineObservableChangeProducesResult() + [Test] + public async Task InlineObservableChangeProducesResult() { bool? valueReturned = null; var subscribed = _observable.Subscribe(result => { valueReturned = result; }); @@ -58,12 +50,12 @@ public void InlineObservableChangeProducesResult() throw new InvalidOperationException(nameof(valueReturned)); } - valueReturned.Value.Should().Be(true, "Value should be true"); + await Assert.That(valueReturned.Value).IsTrue().Because("Value should be true"); subscribed.Dispose(); } - [Fact] - public void MultipleValuesReturnTrue() + [Test] + public async Task MultipleValuesReturnTrue() { bool? valueReturned = null; var subscribed = _observable.Subscribe(result => { valueReturned = result; }); @@ -80,19 +72,19 @@ public void MultipleValuesReturnTrue() throw new InvalidOperationException(nameof(valueReturned)); } - valueReturned.Value.Should().Be(false, "Value should be false"); + await Assert.That(valueReturned.Value).IsFalse().Because("Value should be false"); item1.InvokeObservable(true); item2.InvokeObservable(true); item3.InvokeObservable(true); - valueReturned.Value.Should().Be(true, "Value should be true"); + await Assert.That(valueReturned.Value).IsTrue().Because("Value should be true"); subscribed.Dispose(); } - private class ObjectWithObservable(int id) + private class ObjectWithObservable(int id) : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _changed = new ReactiveUI.Primitives.Signals.Signal(); public int Id { get; } = id; @@ -105,5 +97,10 @@ public void InvokeObservable(bool value) Value = value; _changed.OnNext(value); } + + public void Dispose() + { + _changed.Dispose(); + } } } diff --git a/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs b/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs index ad5d9086d..f4b3e2c09 100644 --- a/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs +++ b/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs @@ -1,13 +1,3 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class TrueForAnyFixture : IDisposable @@ -24,8 +14,8 @@ public TrueForAnyFixture() public void Dispose() => _source.Dispose(); - [Fact] - public void InitialItemReturnsFalseWhenObservaleHasNoValue() + [Test] + public async Task InitialItemReturnsFalseWhenObservaleHasNoValue() { bool? valueReturned = null; var subscribed = _observable.Subscribe(result => { valueReturned = result; }); @@ -33,14 +23,14 @@ public void InitialItemReturnsFalseWhenObservaleHasNoValue() var item = new ObjectWithObservable(1); _source.AddOrUpdate(item); - valueReturned.HasValue.Should().BeTrue(); - valueReturned!.Value.Should().Be(false, "The intial value should be false"); + await Assert.That(valueReturned.HasValue).IsTrue(); + await Assert.That(valueReturned!.Value).IsFalse().Because("The intial value should be false"); subscribed.Dispose(); } - [Fact] - public void InlineObservableChangeProducesResult() + [Test] + public async Task InlineObservableChangeProducesResult() { bool? valueReturned = null; var subscribed = _observable.Subscribe(result => { valueReturned = result; }); @@ -49,13 +39,13 @@ public void InlineObservableChangeProducesResult() item.InvokeObservable(true); _source.AddOrUpdate(item); - valueReturned.HasValue.Should().BeTrue(); - valueReturned!.Value.Should().Be(true, "Value should be true"); + await Assert.That(valueReturned.HasValue).IsTrue(); + await Assert.That(valueReturned!.Value).IsTrue().Because("Value should be true"); subscribed.Dispose(); } - [Fact] - public void MultipleValuesReturnTrue() + [Test] + public async Task MultipleValuesReturnTrue() { bool? valueReturned = null; var subscribed = _observable.Subscribe(result => { valueReturned = result; }); @@ -72,16 +62,16 @@ public void MultipleValuesReturnTrue() throw new InvalidOperationException(nameof(valueReturned)); } - valueReturned.Value.Should().Be(false, "Value should be false"); + await Assert.That(valueReturned.Value).IsFalse().Because("Value should be false"); item1.InvokeObservable(true); - valueReturned.Value.Should().Be(true, "Value should be true"); + await Assert.That(valueReturned.Value).IsTrue().Because("Value should be true"); subscribed.Dispose(); } // https://github.com/reactivemarbles/DynamicData/issues/922 - [Fact] - public void ValuesPublishedOnSubscriptionDoNotTriggerPrematureOutput() + [Test] + public async Task ValuesPublishedOnSubscriptionDoNotTriggerPrematureOutput() { var item1 = new ObjectWithObservable(1); var item2 = new ObjectWithObservable(2); @@ -95,13 +85,13 @@ public void ValuesPublishedOnSubscriptionDoNotTriggerPrematureOutput() .ValidateSynchronization() .RecordValues(out var results); - results.RecordedValues.Count.Should().Be(1, because: "No items were added to the source, and no value changes were made to the items"); - results.RecordedValues[0].Should().Be(true, because: "One of the two items in the source has a true value"); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("No items were added to the source, and no value changes were made to the items"); + await Assert.That(results.RecordedValues[0]).IsTrue().Because("One of the two items in the source has a true value"); } - private class ObjectWithObservable(int id) + private class ObjectWithObservable(int id) : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _changed = new ReactiveUI.Primitives.Signals.Signal(); public int Id { get; } = id; @@ -114,5 +104,10 @@ public void InvokeObservable(bool value) Value = value; _changed.OnNext(value); } + + public void Dispose() + { + _changed.Dispose(); + } } } diff --git a/src/DynamicData.Tests/Cache/WatchFixture.cs b/src/DynamicData.Tests/Cache/WatchFixture.cs index 6cc1116b3..4d1b27ba1 100644 --- a/src/DynamicData.Tests/Cache/WatchFixture.cs +++ b/src/DynamicData.Tests/Cache/WatchFixture.cs @@ -1,10 +1,3 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; public class WatchFixture : IDisposable @@ -19,14 +12,14 @@ public WatchFixture() _results = new ChangeSetAggregator(_source.Connect().DisposeMany()); } - [Fact] - public void AddWillNotCallDispose() + [Test] + public async Task AddWillNotCallDispose() { _source.AddOrUpdate(new DisposableObject(1)); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].IsDisposed.Should().Be(false, "Should not be disposed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0].IsDisposed).IsFalse().Because("Should not be disposed"); } public void Dispose() @@ -35,37 +28,37 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void EverythingIsDisposedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsDisposedWhenStreamIsDisposed() { _source.AddOrUpdate(Enumerable.Range(1, 10).Select(i => new DisposableObject(i))); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[1].All(d => d.Current.IsDisposed).Should().BeTrue(); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[1].All(d => d.Current.IsDisposed)).IsTrue(); } - [Fact] - public void RemoveWillCallDispose() + [Test] + public async Task RemoveWillCallDispose() { _source.AddOrUpdate(new DisposableObject(1)); _source.Edit(updater => updater.Remove(1)); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Should be 0 items in the cache"); - _results.Messages[1].First().Current.IsDisposed.Should().Be(true, "Should be disposed"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 items in the cache"); + await Assert.That(_results.Messages[1].First().Current.IsDisposed).IsTrue().Because("Should be disposed"); } - [Fact] - public void UpdateWillCallDispose() + [Test] + public async Task UpdateWillCallDispose() { _source.AddOrUpdate(new DisposableObject(1)); _source.AddOrUpdate(new DisposableObject(1)); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 items in the cache"); - _results.Messages[1].First().Current.IsDisposed.Should().Be(false, "Current should not be disposed"); - _results.Messages[1].First().Previous.Value.IsDisposed.Should().Be(true, "Previous should be disposed"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 items in the cache"); + await Assert.That(_results.Messages[1].First().Current.IsDisposed).IsFalse().Because("Current should not be disposed"); + await Assert.That(_results.Messages[1].First().Previous.Value.IsDisposed).IsTrue().Because("Previous should be disposed"); } private class DisposableObject(int id) : IDisposable diff --git a/src/DynamicData.Tests/Cache/WatcherFixture.cs b/src/DynamicData.Tests/Cache/WatcherFixture.cs index 23faff11f..5cbbed73a 100644 --- a/src/DynamicData.Tests/Cache/WatcherFixture.cs +++ b/src/DynamicData.Tests/Cache/WatcherFixture.cs @@ -1,22 +1,10 @@ -#region - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Experimental; +#else using DynamicData.Experimental; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - -#endregion - namespace DynamicData.Tests.Cache; public class WatcherFixture : IDisposable @@ -48,18 +36,18 @@ public WatcherFixture() }); } - [Fact] - public void AddNew() + [Test] + public async Task AddNew() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(50).Ticks); var result = _results.Data.Items[0]; - result.UpdateCount.Should().Be(1, "Person should have received 1 update"); - result.Completed.Should().Be(false, "Person should have received 1 update"); + await Assert.That(result.UpdateCount).IsEqualTo(1).Because("Person should have received 1 update"); + await Assert.That(result.Completed).IsFalse().Because("Person should have received 1 update"); } public void Dispose() @@ -70,8 +58,8 @@ public void Dispose() _watcher.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); @@ -80,16 +68,16 @@ public void Remove() _source.Remove(person.Key); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(11).Ticks); - _results.Messages.Count.Should().Be(2, "Should be 1 updates"); - _results.Data.Count.Should().Be(0, "Should be 0 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 item in the cache"); var secondResult = _results.Messages[1].First(); - secondResult.Current.UpdateCount.Should().Be(1, "Second Person should have received 1 update"); - secondResult.Current.Completed.Should().Be(true, "Second person should have received 1 update"); + await Assert.That(secondResult.Current.UpdateCount).IsEqualTo(1).Because("Second Person should have received 1 update"); + await Assert.That(secondResult.Current.Completed).IsTrue().Because("Second person should have received 1 update"); } - [Fact] - public void Update() + [Test] + public async Task Update() { var first = new Person("Adult1", 50); var second = new Person("Adult1", 51); @@ -99,16 +87,16 @@ public void Update() _source.AddOrUpdate(second); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(10).Ticks); - _results.Messages.Count.Should().Be(2, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); var secondResult = _results.Messages[1].First(); - secondResult.Previous.Value.UpdateCount.Should().Be(1, "Second Person should have received 1 update"); - secondResult.Previous.Value.Completed.Should().Be(true, "Second person should have received 1 update"); + await Assert.That(secondResult.Previous.Value.UpdateCount).IsEqualTo(1).Because("Second Person should have received 1 update"); + await Assert.That(secondResult.Previous.Value.Completed).IsTrue().Because("Second person should have received 1 update"); } - [Fact] - public void Watch() + [Test] + public async Task Watch() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); @@ -117,8 +105,8 @@ public void Watch() var watch = _watcher.Watch("Adult1").Subscribe(result.Add); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(50).Ticks); - result.Count.Should().Be(1, "Should be 1 updates"); - result[0].Current.Should().Be(person, "Should be 1 item in the cache"); + await Assert.That(result.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(result[0].Current).IsEqualTo(person).Because("Should be 1 item in the cache"); _source.Edit(updater => updater.Remove(("Adult1"))); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks); @@ -126,8 +114,8 @@ public void Watch() watch.Dispose(); } - [Fact] - public void WatchMany() + [Test] + public async Task WatchMany() { _source.AddOrUpdate(new Person("Adult1", 50)); @@ -137,30 +125,30 @@ public void WatchMany() var watch3 = _watcher.Watch("Adult1").Subscribe(result.Add); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(100).Ticks); - result.Count.Should().Be(3, "Should be 3 updates"); + await Assert.That(result.Count).IsEqualTo(3).Because("Should be 3 updates"); foreach (var update in result) { - update.Reason.Should().Be(ChangeReason.Add, "Change reason should be add"); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Add).Because("Change reason should be add"); } result.Clear(); _source.AddOrUpdate(new Person("Adult1", 51)); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks); - result.Count.Should().Be(3, "Should be 3 updates"); + await Assert.That(result.Count).IsEqualTo(3).Because("Should be 3 updates"); foreach (var update in result) { - update.Reason.Should().Be(ChangeReason.Update, "Change reason should be add"); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Update).Because("Change reason should be add"); } result.Clear(); _source.Remove("Adult1"); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks); - result.Count.Should().Be(3, "Should be 3 updates"); + await Assert.That(result.Count).IsEqualTo(3).Because("Should be 3 updates"); foreach (var update in result) { - update.Reason.Should().Be(ChangeReason.Remove, "Change reason should be add"); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Remove).Because("Change reason should be add"); } result.Clear(); diff --git a/src/DynamicData.Tests/Cache/XorFixture.cs b/src/DynamicData.Tests/Cache/XorFixture.cs index 8a320430a..5708a0f9d 100644 --- a/src/DynamicData.Tests/Cache/XorFixture.cs +++ b/src/DynamicData.Tests/Cache/XorFixture.cs @@ -1,19 +1,14 @@ -using System; -using System.Collections.Generic; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Cache; +[InheritsTests] public class XOrFixture : XOrFixtureBase { protected override IObservable> CreateObservable() => _source1.Connect().Xor(_source2.Connect()); } +[InheritsTests] public class XOrCollectionFixture : XOrFixtureBase { protected override IObservable> CreateObservable() @@ -46,29 +41,29 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemovingFromOneDoesNotFromResult() + [Test] + public async Task RemovingFromOneDoesNotFromResult() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); _source2.Remove(person); - _results.Messages.Count.Should().Be(3, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Cache should have no items"); } - [Fact] - public void UpdatingBothDoeNotProducesResult() + [Test] + public async Task UpdatingBothDoeNotProducesResult() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); _source2.AddOrUpdate(person); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void UpdatingOneProducesOnlyOneUpdate() + [Test] + public async Task UpdatingOneProducesOnlyOneUpdate() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); @@ -76,18 +71,18 @@ public void UpdatingOneProducesOnlyOneUpdate() var personUpdated = new Person("Adult1", 51); _source2.AddOrUpdate(personUpdated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void UpdatingOneSourceOnlyProducesResult() + [Test] + public async Task UpdatingOneSourceOnlyProducesResult() { var person = new Person("Adult1", 50); _source1.AddOrUpdate(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/CachePathCoverageFixture.cs b/src/DynamicData.Tests/CachePathCoverageFixture.cs new file mode 100644 index 000000000..624d577b2 --- /dev/null +++ b/src/DynamicData.Tests/CachePathCoverageFixture.cs @@ -0,0 +1,195 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else +using DynamicData.Cache.Internal; +#endif + +namespace DynamicData.Tests; + +public class CachePathCoverageFixture +{ + [Test] + public async Task VirtualChangeSetsCompareTheirWindowAndSortedSnapshot() + { + var sorted = VirtualChangeSet.Empty.SortedItems; + var first = new VirtualChangeSet(Array.Empty>(), sorted, new VirtualResponse(2, 0, 5)); + var equal = new VirtualChangeSet(Array.Empty>(), sorted, new VirtualResponse(2, 0, 5)); + var otherWindow = new VirtualChangeSet(Array.Empty>(), sorted, new VirtualResponse(2, 1, 5)); + + await Assert.That(first.Equals(first)).IsTrue(); + await Assert.That(first == equal).IsTrue(); + await Assert.That(first.Equals((object)equal)).IsTrue(); + await Assert.That(first.GetHashCode()).IsEqualTo(equal.GetHashCode()); + await Assert.That(first != otherWindow).IsTrue(); + await Assert.That(first.Equals((VirtualChangeSet?)null)).IsFalse(); + await Assert.That(first.Equals(new object())).IsFalse(); + } + + [Test] + public async Task SizeExpirerCapsTheResultAndForwardsCompletion() + { + using var source = new SourceCache(value => value); + using var results = new SizeExpirer(source.Connect(), 2).Run().AsAggregator(); + source.AddOrUpdate(new[] { 1, 2, 3, 4 }); + await Assert.That(results.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Items.All(value => value is >= 1 and <= 4)).IsTrue(); + source.Dispose(); + await Assert.That(results.IsCompleted).IsTrue(); + await Assert.That(() => new SizeExpirer(source.Connect(), 0)).Throws(); + await Assert.That(() => new SizeExpirer(null!, 1)).Throws(); + } + + [Test] + public async Task VirtualAggregatorRecordsErrorsAndDisposesItsCache() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = new VirtualChangeSetAggregator(source); + source.OnNext(VirtualChangeSet.Empty); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Summary).IsNotNull(); + var error = new InvalidOperationException("expected"); + source.OnError(error); + await Assert.That(results.Error).IsSameReferenceAs(error); + results.Dispose(); + results.Dispose(); + await Assert.That(source.HasObservers).IsFalse(); + } + + [Test] + public async Task QueryTriggerReflectsCurrentStateAndStopsAfterRemoval() + { + using var source = new SourceCache(value => value); + using var trigger = new ReactiveUI.Primitives.Signals.Signal(); + var snapshots = new List(); + using var subscription = source.Connect().QueryWhenChanged(_ => trigger) + .Subscribe(query => snapshots.Add(query.Items.Order().ToArray())); + source.AddOrUpdate(1); + trigger.OnNext(0); + await Assert.That(snapshots.Count).IsEqualTo(2); + await Assert.That(snapshots.All(snapshot => snapshot.SequenceEqual(new[] { 1 }))).IsTrue(); + source.RemoveKey(1); + trigger.OnNext(0); + await Assert.That(snapshots.Count).IsEqualTo(3); + await Assert.That(snapshots[^1]).IsEmpty(); + await Assert.That(trigger.HasObservers).IsFalse(); + } + + [Test] + [Arguments(0)] + [Arguments(1)] + [Arguments(2)] + public async Task FinallyRunsExactlyOnceAfterTerminationOrDisposal(int termination) + { + using var source = new ReactiveUI.Primitives.Signals.Signal(); + var events = new List(); + var error = new InvalidOperationException("expected"); + Exception? receivedError = null; + using var subscription = new FinallySafe(source, () => events.Add("finally")).Run().Subscribe( + value => events.Add(value.ToString()), + failure => { receivedError = failure; events.Add("error"); }, + () => events.Add("completed")); + + source.OnNext(7); + if (termination == 0) + source.OnCompleted(); + else if (termination == 1) + source.OnError(error); + subscription.Dispose(); + subscription.Dispose(); + source.OnNext(9); + + var expected = termination switch + { + 0 => new[] { "7", "completed", "finally" }, + 1 => new[] { "7", "error", "finally" }, + _ => new[] { "7", "finally" } + }; + await Assert.That(events.SequenceEqual(expected)).IsTrue(); + await Assert.That(receivedError).IsSameReferenceAs(termination == 1 ? error : null); + await Assert.That(source.HasObservers).IsFalse(); + } + + [Test] + public async Task FilteringRefreshesAddsUpdatesAndRemovesOnlyMatchingItems() + { + var filtered = new ChangeAwareCache(); + filtered.FilterChanges(new ChangeSet + { + new(ChangeReason.Add, 1, 2), + new(ChangeReason.Add, 2, 3), + new(ChangeReason.Add, 3, 4) + }, value => value % 2 == 0); + await Assert.That(filtered.Keys.Order().SequenceEqual(new[] { 1, 3 })).IsTrue(); + filtered.CaptureChanges(); + + filtered.FilterChanges(new ChangeSet + { + new(ChangeReason.Refresh, 1, 2), + new(ChangeReason.Refresh, 2, 6), + new(ChangeReason.Refresh, 3, 5), + new(ChangeReason.Refresh, 4, 7) + }, value => value % 2 == 0); + var refreshChanges = filtered.CaptureChanges(); + await Assert.That(refreshChanges.Refreshes).IsEqualTo(1); + await Assert.That(refreshChanges.Adds).IsEqualTo(1); + await Assert.That(refreshChanges.Removes).IsEqualTo(1); + await Assert.That(filtered.Lookup(2).Value).IsEqualTo(6); + + filtered.FilterChanges(new ChangeSet + { + new(ChangeReason.Update, 1, 8, ReactiveUI.Primitives.Optional.Create(2)), + new(ChangeReason.Update, 2, 9, ReactiveUI.Primitives.Optional.Create(6)), + new(ChangeReason.Remove, 1, 8) + }, value => value % 2 == 0); + await Assert.That(filtered.Count).IsEqualTo(0); + } + + [Test] + public async Task RefilterRetainsMatchingItemsWithoutSpuriousUpdates() + { + var all = new Cache(); + var filtered = new ChangeAwareCache(); + await Assert.That(filtered.RefreshFilteredFrom(all, value => true)).IsEmpty(); + all.AddOrUpdate(2, 1); + all.AddOrUpdate(3, 2); + all.AddOrUpdate(4, 3); + await Assert.That(filtered.RefreshFilteredFrom(all, value => value % 2 == 0).Adds).IsEqualTo(2); + await Assert.That(filtered.RefreshFilteredFrom(all, value => value % 2 == 0)).IsEmpty(); + var changed = filtered.RefreshFilteredFrom(all, value => value >= 3); + await Assert.That(changed.Adds).IsEqualTo(1); + await Assert.That(changed.Removes).IsEqualTo(1); + await Assert.That(filtered.Items.Order().SequenceEqual(new[] { 3, 4 })).IsTrue(); + } + + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task CacheListCombinationTracksMembershipAndDisposesConnections(bool readOnlyCaches) + { + using var first = new SourceCache(value => value); + using var second = new SourceCache(value => value); + first.AddOrUpdate(new[] { 1, 2 }); + second.AddOrUpdate(new[] { 2, 3 }); + using var mutable = new SourceList>(); + using var readOnly = new SourceList>(); + mutable.AddRange(new[] { first, second }); + readOnly.AddRange(new[] { first, second }); + using var intersection = (readOnlyCaches ? readOnly.And() : mutable.And()).AsAggregator(); + using var union = (readOnlyCaches ? readOnly.Or() : mutable.Or()).AsAggregator(); + using var except = (readOnlyCaches ? readOnly.Except() : mutable.Except()).AsAggregator(); + using var exclusive = (readOnlyCaches ? readOnly.Xor() : mutable.Xor()).AsAggregator(); + + await Assert.That(intersection.Data.Items).IsEquivalentTo(new[] { 2 }); + await Assert.That(union.Data.Items).IsEquivalentTo(new[] { 1, 2, 3 }); + await Assert.That(except.Data.Items).IsEquivalentTo(new[] { 1 }); + await Assert.That(exclusive.Data.Items).IsEquivalentTo(new[] { 1, 3 }); + second.RemoveKey(2); + await Assert.That(intersection.Data.Items).IsEmpty(); + await Assert.That(exclusive.Data.Items).IsEquivalentTo(new[] { 1, 2, 3 }); + var messageCount = union.Messages.Count; + union.Dispose(); + first.AddOrUpdate(4); + await Assert.That(union.Messages.Count).IsEqualTo(messageCount); + } +} diff --git a/src/DynamicData.Tests/Domain/Animal.cs b/src/DynamicData.Tests/Domain/Animal.cs index 744b058ee..f1e90b490 100644 --- a/src/DynamicData.Tests/Domain/Animal.cs +++ b/src/DynamicData.Tests/Domain/Animal.cs @@ -1,8 +1,9 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Threading; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif namespace DynamicData.Tests.Domain; diff --git a/src/DynamicData.Tests/Domain/AnimalOwner.cs b/src/DynamicData.Tests/Domain/AnimalOwner.cs index 26049705b..408638384 100644 --- a/src/DynamicData.Tests/Domain/AnimalOwner.cs +++ b/src/DynamicData.Tests/Domain/AnimalOwner.cs @@ -1,8 +1,8 @@ -using System; -using System.Collections; -using System.Collections.ObjectModel; -using System.Reactive.Disposables; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif namespace DynamicData.Tests.Domain; diff --git a/src/DynamicData.Tests/Domain/Fakers.cs b/src/DynamicData.Tests/Domain/Fakers.cs index 720b74565..6ceb7672d 100644 --- a/src/DynamicData.Tests/Domain/Fakers.cs +++ b/src/DynamicData.Tests/Domain/Fakers.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; using Bogus; -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.Domain; diff --git a/src/DynamicData.Tests/Domain/Market.cs b/src/DynamicData.Tests/Domain/Market.cs index a100e6df3..9ffa94c1a 100644 --- a/src/DynamicData.Tests/Domain/Market.cs +++ b/src/DynamicData.Tests/Domain/Market.cs @@ -1,11 +1,9 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reactive.Linq; -using System.Threading; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; -using DynamicData.Tests.Utilities; +#endif namespace DynamicData.Tests.Domain; @@ -87,7 +85,7 @@ public Market RefreshAllPrices(Func getNewPrice) => this.With(_ => }))); public Market RefreshAllPrices(Func getNewPrice) => RefreshAllPrices(_ => getNewPrice()); - + public Market RefreshAllPrices(decimal newPrice) => RefreshAllPrices(_ => newPrice); public void RemoveAllPrices() => this.With(_ => _latestPrices.Clear()); @@ -128,7 +126,6 @@ public int Compare([DisallowNull] IMarket x, [DisallowNull] IMarket y) => } } - internal sealed class FixedMarket : IMarket { public FixedMarket(Func getPrice, int minId, int maxId, bool completable = true) diff --git a/src/DynamicData.Tests/Domain/MarketPrice.cs b/src/DynamicData.Tests/Domain/MarketPrice.cs index f8fb2c6ad..26119e865 100644 --- a/src/DynamicData.Tests/Domain/MarketPrice.cs +++ b/src/DynamicData.Tests/Domain/MarketPrice.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using Bogus; @@ -55,14 +53,16 @@ public decimal Price private class CurrentPriceEqualityComparer : IEqualityComparer { - public virtual bool Equals([DisallowNull] MarketPrice x, [DisallowNull] MarketPrice y) => x.MarketId.Equals(x.MarketId) && x.ItemId == y.ItemId && x.Price == y.Price; - [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations", Justification = "Suppressed for Net 9.0")] - public int GetHashCode([DisallowNull] MarketPrice obj) => throw new NotImplementedException(); + public virtual bool Equals([DisallowNull] MarketPrice x, [DisallowNull] MarketPrice y) => x.ItemId == y.ItemId && x.Price == y.Price; + + public virtual int GetHashCode([DisallowNull] MarketPrice obj) => HashCode.Combine(obj.ItemId, obj.Price); } private sealed class TimeStampPriceEqualityComparer : CurrentPriceEqualityComparer, IEqualityComparer { public override bool Equals([DisallowNull] MarketPrice x, [DisallowNull] MarketPrice y) => base.Equals(x, y) && x.TimeStamp == y.TimeStamp; + + public override int GetHashCode([DisallowNull] MarketPrice obj) => HashCode.Combine(base.GetHashCode(obj), obj.TimeStamp); } private sealed class LowestPriceComparer : IComparer diff --git a/src/DynamicData.Tests/Domain/ParentAndChildren.cs b/src/DynamicData.Tests/Domain/ParentAndChildren.cs index 746d45fa9..eab88eb99 100644 --- a/src/DynamicData.Tests/Domain/ParentAndChildren.cs +++ b/src/DynamicData.Tests/Domain/ParentAndChildren.cs @@ -1,6 +1,8 @@ -using System; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif namespace DynamicData.Tests.Domain; @@ -12,7 +14,7 @@ public ParentAndChildren(Person parent, Person[] children) Children = children; } - public ParentAndChildren(string parentId, Optional parent, Person[] children) + public ParentAndChildren(string parentId, ReactiveUI.Primitives.Optional parent, Person[] children) { Parent = parent.ValueOrDefault(); ParentId = parentId; diff --git a/src/DynamicData.Tests/Domain/ParentChild.cs b/src/DynamicData.Tests/Domain/ParentChild.cs index d907d62e7..b02d76f51 100644 --- a/src/DynamicData.Tests/Domain/ParentChild.cs +++ b/src/DynamicData.Tests/Domain/ParentChild.cs @@ -1,4 +1,4 @@ -namespace DynamicData.Tests.Domain; +namespace DynamicData.Tests.Domain; public class ParentChild(Person child, Person parent) { diff --git a/src/DynamicData.Tests/Domain/Person.cs b/src/DynamicData.Tests/Domain/Person.cs index bca018cb6..d94204c88 100644 --- a/src/DynamicData.Tests/Domain/Person.cs +++ b/src/DynamicData.Tests/Domain/Person.cs @@ -1,7 +1,8 @@ -using System; -using System.Collections.Generic; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif namespace DynamicData.Tests.Domain; diff --git a/src/DynamicData.Tests/Domain/PersonObs.cs b/src/DynamicData.Tests/Domain/PersonObs.cs index 08bd463b7..98e7399eb 100644 --- a/src/DynamicData.Tests/Domain/PersonObs.cs +++ b/src/DynamicData.Tests/Domain/PersonObs.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Subjects; - namespace DynamicData.Tests.Domain; [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Acceptable in test.")] public class PersonObs(string name, int age, string gender = "F", string? parentName = null) : IEquatable { - private readonly BehaviorSubject _age = new BehaviorSubject(age); + private readonly ReactiveUI.Primitives.Signals.StateSignal _age = new ReactiveUI.Primitives.Signals.StateSignal(age); public PersonObs(string firstname, string lastname, int age, string gender = "F", string? parentName = null) : this(firstname + " " + lastname, age, gender, parentName) diff --git a/src/DynamicData.Tests/Domain/PersonWithChildren.cs b/src/DynamicData.Tests/Domain/PersonWithChildren.cs index 9930cf7cb..d9eca2f3c 100644 --- a/src/DynamicData.Tests/Domain/PersonWithChildren.cs +++ b/src/DynamicData.Tests/Domain/PersonWithChildren.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Linq; - namespace DynamicData.Tests.Domain; public class PersonWithChildren : IKey diff --git a/src/DynamicData.Tests/Domain/PersonWithEmployment.cs b/src/DynamicData.Tests/Domain/PersonWithEmployment.cs index c95e9ce75..18c2e3a44 100644 --- a/src/DynamicData.Tests/Domain/PersonWithEmployment.cs +++ b/src/DynamicData.Tests/Domain/PersonWithEmployment.cs @@ -1,5 +1,3 @@ -using System; - namespace DynamicData.Tests.Domain; public class PersonWithEmployment(IGroup source) : IDisposable diff --git a/src/DynamicData.Tests/Domain/PersonWithFriends.cs b/src/DynamicData.Tests/Domain/PersonWithFriends.cs index 43db20717..a4b22d1be 100644 --- a/src/DynamicData.Tests/Domain/PersonWithFriends.cs +++ b/src/DynamicData.Tests/Domain/PersonWithFriends.cs @@ -1,7 +1,8 @@ -using System.Collections.Generic; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif namespace DynamicData.Tests.Domain; diff --git a/src/DynamicData.Tests/Domain/PersonWithGender.cs b/src/DynamicData.Tests/Domain/PersonWithGender.cs index dc4ac6c09..3cc79fe46 100644 --- a/src/DynamicData.Tests/Domain/PersonWithGender.cs +++ b/src/DynamicData.Tests/Domain/PersonWithGender.cs @@ -1,6 +1,5 @@ -using System; - namespace DynamicData.Tests.Domain; + public record PersonWithAgeGroup(Person Person, string AgeGroup); public class PersonWithGender : IEquatable diff --git a/src/DynamicData.Tests/Domain/PersonWithRelations.cs b/src/DynamicData.Tests/Domain/PersonWithRelations.cs index f488865f5..6e9103f9c 100644 --- a/src/DynamicData.Tests/Domain/PersonWithRelations.cs +++ b/src/DynamicData.Tests/Domain/PersonWithRelations.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Linq; - namespace DynamicData.Tests.Domain; public class PersonWithRelations : IKey diff --git a/src/DynamicData.Tests/Domain/RandomPersonGenerator.cs b/src/DynamicData.Tests/Domain/RandomPersonGenerator.cs index 77a799667..fabcd7933 100644 --- a/src/DynamicData.Tests/Domain/RandomPersonGenerator.cs +++ b/src/DynamicData.Tests/Domain/RandomPersonGenerator.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - namespace DynamicData.Tests.Domain; public class RandomPersonGenerator diff --git a/src/DynamicData.Tests/Domain/SelfObservingPerson.cs b/src/DynamicData.Tests/Domain/SelfObservingPerson.cs index 7a11ea949..65da4e13a 100644 --- a/src/DynamicData.Tests/Domain/SelfObservingPerson.cs +++ b/src/DynamicData.Tests/Domain/SelfObservingPerson.cs @@ -1,6 +1,3 @@ -using System; -using System.Reactive.Linq; - namespace DynamicData.Tests.Domain; public class SelfObservingPerson : IDisposable diff --git a/src/DynamicData.Tests/DynamicData.Tests.csproj b/src/DynamicData.Tests/DynamicData.Tests.csproj index 4b9e28c65..d02351a05 100644 --- a/src/DynamicData.Tests/DynamicData.Tests.csproj +++ b/src/DynamicData.Tests/DynamicData.Tests.csproj @@ -1,27 +1,52 @@ - + - net9.0 + Exe + net10.0;net11.0 $(NoWarn);CS0618;CA1801;CA1812;CA1816;CA1062;CA1063;CS8767;CS8602;CS8618;IDE1006 - 2.* + - - - - - - - + + - - all - runtime; build; native; contentfiles; analyzers - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/DynamicData.Tests/EnumerableExFixtures.cs b/src/DynamicData.Tests/EnumerableExFixtures.cs index d25cc8325..8402da555 100644 --- a/src/DynamicData.Tests/EnumerableExFixtures.cs +++ b/src/DynamicData.Tests/EnumerableExFixtures.cs @@ -1,11 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests; public class EnumerableExFixtures @@ -16,45 +10,45 @@ public class EnumerableExFixtures private readonly Person _person3 = new("Three", 3); - [Fact] - public void CanConvertToObservableChangeSetCache() + [Test] + public async Task CanConvertToObservableChangeSetCache() { var source = new[] { _person1, _person2, _person3 }; var changeSet = source.AsObservableChangeSet().AsObservableList(); - changeSet.Items.Should().BeEquivalentTo(source); + await Assert.That(changeSet.Items).IsEquivalentTo(source); } - [Fact] - public void CanConvertToObservableChangeSetList() + [Test] + public async Task CanConvertToObservableChangeSetList() { var source = new[] { _person1, _person2, _person3 }; var changeSet = source.AsObservableChangeSet(x => x.Age).AsObservableCache(); - changeSet.Items.Should().BeEquivalentTo(source); + await Assert.That(changeSet.Items).IsEquivalentTo(source); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void RespectsCompleteConfigurationForCache(bool shouldComplete) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task RespectsCompleteConfigurationForCache(bool shouldComplete) { var completed = false; var source = new[] { _person1, _person2, _person3 }; using (source.AsObservableChangeSet(x => x.Age, shouldComplete).Subscribe(_ => { }, () => completed = true)) { - Assert.Equal(completed, shouldComplete); + await Assert.That(completed).IsEqualTo(shouldComplete); } } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void RespectsCompleteConfigurationForList(bool shouldComplete) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task RespectsCompleteConfigurationForList(bool shouldComplete) { var completed = false; var source = new[] { _person1, _person2, _person3 }; using (source.AsObservableChangeSet(shouldComplete).Subscribe(_ => { }, () => completed = true)) { - Assert.Equal(completed, shouldComplete); + await Assert.That(completed).IsEqualTo(shouldComplete); } } } diff --git a/src/DynamicData.Tests/EnumerableIListFixture.cs b/src/DynamicData.Tests/EnumerableIListFixture.cs index 2c18d4302..328ef2de1 100644 --- a/src/DynamicData.Tests/EnumerableIListFixture.cs +++ b/src/DynamicData.Tests/EnumerableIListFixture.cs @@ -1,18 +1,20 @@ -using System; +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; -using System.Collections.Generic; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Reactive.Subjects; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; -using Xunit; +#endif namespace DynamicData.Tests { public class EnumerableIListFixture { - [Fact] - public void EnumerableIListTests() + [Test] + public async Task EnumerableIListTests() { var data = new byte[40]; var rng = new Random(1234567); @@ -27,41 +29,41 @@ public void EnumerableIListTests() fixture.Add(lastItem); fixture.Insert(0, firstItem); - Assert.Equal(fixture.Count, listOfRandomFloats.Count); + await Assert.That(fixture.Count).IsEqualTo(listOfRandomFloats.Count); - Assert.True(fixture.IndexOf(lastItem) > 0); + await Assert.That(fixture.IndexOf(lastItem) > 0).IsTrue(); fixture.Remove(lastItem); - Assert.Equal(fixture.Count, listOfRandomFloats.Count); + await Assert.That(fixture.Count).IsEqualTo(listOfRandomFloats.Count); fixture.RemoveAt(0); - Assert.Equal(fixture[10], listOfRandomFloats[10]); + await Assert.That(fixture[10]).IsEqualTo(listOfRandomFloats[10]); fixture.Clear(); - Assert.True(fixture.Count == 0); + await Assert.That(fixture.Count == 0).IsTrue(); } - [Fact] - public void ExceptionTests() + [Test] + public async Task ExceptionTests() { - var exSubject = new Subject(); + var exSubject = new ReactiveUI.Primitives.Signals.Signal(); object exceptionRecived = default!; - exSubject.ObserveOn(ImmediateScheduler.Instance).Subscribe(ex => { exceptionRecived = ex; }); + exSubject.ObserveOn(Scheduler.Immediate).Subscribe(ex => { exceptionRecived = ex; }); exSubject.OnNext(new UnspecifiedIndexException()); - Assert.IsType(exceptionRecived); + await Assert.That(exceptionRecived).IsTypeOf(); exSubject.OnNext(new KeySelectorException()); - Assert.IsType(exceptionRecived); + await Assert.That(exceptionRecived).IsTypeOf(); exSubject.OnNext(new MissingKeyException()); - Assert.IsType(exceptionRecived); + await Assert.That(exceptionRecived).IsTypeOf(); } } } diff --git a/src/DynamicData.Tests/IntegrationTestFixtureBase.cs b/src/DynamicData.Tests/IntegrationTestFixtureBase.cs index d28b8cf87..0e40a1cb8 100644 --- a/src/DynamicData.Tests/IntegrationTestFixtureBase.cs +++ b/src/DynamicData.Tests/IntegrationTestFixtureBase.cs @@ -1,9 +1,6 @@ -using Xunit; - namespace DynamicData.Tests; -[Collection(CollectionName)] -[CollectionDefinition(CollectionName, DisableParallelization = true)] +[NotInParallel] public class IntegrationTestFixtureBase { public const string CollectionName diff --git a/src/DynamicData.Tests/Internal/CacheInfrastructureCoverageFixture.cs b/src/DynamicData.Tests/Internal/CacheInfrastructureCoverageFixture.cs new file mode 100644 index 000000000..debd0e836 --- /dev/null +++ b/src/DynamicData.Tests/Internal/CacheInfrastructureCoverageFixture.cs @@ -0,0 +1,196 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else +using DynamicData.Cache.Internal; +#endif +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.Internal; + +public class CacheInfrastructureCoverageFixture +{ + [Test] + public async Task LockFreeObservableCacheConnectEmitsInitialSnapshotAndLiveUpdates() + { + using var cache = new LockFreeObservableCache(); + var first = new Person("One", 1); + var second = new Person("Two", 2); + + cache.Edit(updater => updater.AddOrUpdate(first, first.Name)); + + using var results = cache.Connect(suppressEmptyChangeSets: false).AsAggregator(); + + cache.Edit(updater => updater.AddOrUpdate(second, second.Name)); + + await Assert.That(cache.Count).IsEqualTo(2); + await Assert.That(cache.Items).IsEquivalentTo(new[] { first, second }); + await Assert.That(cache.Keys).IsEquivalentTo(new[] { first.Name, second.Name }); + await Assert.That(cache.KeyValues[first.Name]).IsSameReferenceAs(first); + await Assert.That(cache.Lookup(second.Name).Value).IsSameReferenceAs(second); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Single().Current).IsSameReferenceAs(first); + await Assert.That(results.Messages[1].Single().Current).IsSameReferenceAs(second); + } + + [Test] + public async Task LockFreeObservableCacheConnectHonorsPredicateAndEmptySuppression() + { + using var cache = new LockFreeObservableCache(); + var included = new Person("Adult", 30); + var excluded = new Person("Child", 10); + + cache.Edit(updater => updater.AddOrUpdate(new[] + { + new KeyValuePair(included.Name, included), + new KeyValuePair(excluded.Name, excluded), + })); + + using var suppressed = cache.Connect(static person => person.Age >= 18).AsAggregator(); + using var unsuppressed = cache.Connect(static person => person.Age > 100, suppressEmptyChangeSets: false).AsAggregator(); + + cache.Edit(updater => updater.AddOrUpdate(new Person("StillChild", 12), "StillChild")); + + await Assert.That(suppressed.Data.Count).IsEqualTo(1); + await Assert.That(suppressed.Data.Lookup(included.Name).Value).IsSameReferenceAs(included); + await Assert.That(suppressed.Messages.Count).IsEqualTo(1).Because("non-matching live updates should be suppressed"); + await Assert.That(unsuppressed.Messages.Count).IsEqualTo(2).Because("suppressEmptyChangeSets: false should surface each empty initial/live evaluation"); + await Assert.That(unsuppressed.Messages.All(static message => message.Count == 0)).IsTrue(); + } + + [Test] + public async Task LockFreeObservableCacheCountChangedStartsWithCurrentCountAndCompletesOnDispose() + { + using var cache = new LockFreeObservableCache(); + cache.Edit(updater => updater.AddOrUpdate(new Person("Existing", 1), "Existing")); + + var counts = new List(); + var completed = false; + using var subscription = cache.CountChanged.Subscribe(counts.Add, _ => { }, () => completed = true); + + cache.Dispose(); + + await Assert.That(counts).IsEquivalentTo(new[] { 1 }); + await Assert.That(completed).IsTrue(); + } + + [Test] + public async Task LockFreeObservableCacheWatchEmitsInitialAndMatchingLiveChangesOnly() + { + using var cache = new LockFreeObservableCache(); + var initial = new Person("Tracked", 1); + var updated = new Person("Tracked", 2); + + cache.Edit(updater => updater.AddOrUpdate(initial, initial.Name)); + + var watched = new List>(); + using var subscription = cache.Watch(initial.Name).Subscribe(watched.Add); + + cache.Edit( + updater => + { + updater.AddOrUpdate(new Person("Other", 3), "Other"); + updater.AddOrUpdate(updated, updated.Name); + updater.Remove("Other"); + }); + + await Assert.That(watched.Select(static change => change.Reason)).IsEquivalentTo(new[] { ChangeReason.Add, ChangeReason.Update }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(watched[0].Current).IsSameReferenceAs(initial); + await Assert.That(watched[1].Current).IsSameReferenceAs(updated); + } + + [Test] + public async Task LockFreeObservableCacheConstructedFromSourceClonesChangesAndCompletesOnDispose() + { + using var source = new SourceCache(static person => person.Name); + using var cache = new LockFreeObservableCache(source.Connect()); + var person = new Person("Source", 1); + + using var results = cache.Connect().AsAggregator(); + + source.AddOrUpdate(person); + + await Assert.That(cache.Count).IsEqualTo(1); + await Assert.That(results.Data.Lookup(person.Name).Value).IsSameReferenceAs(person); + + cache.Dispose(); + + await Assert.That(results.IsCompleted).IsTrue(); + } + + [Test] + public async Task CacheUpdaterWithDictionaryExposesKeyValuesAndLoadsReplacementItems() + { + var original = new Person("Original", 1); + var replacement = new Person("Replacement", 2); + var updater = new CacheUpdater(new Dictionary { [original.Name] = original }, static person => person.Name); + + updater.Load(new[] { replacement }); + + await Assert.That(updater.Count).IsEqualTo(1); + await Assert.That(updater.Items).IsEquivalentTo(new[] { replacement }); + await Assert.That(updater.Keys).IsEquivalentTo(new[] { replacement.Name }); + await Assert.That(updater.KeyValues.Single().Value).IsSameReferenceAs(replacement); + await Assert.That(updater.GetKey(replacement)).IsEqualTo(replacement.Name); + await Assert.That(updater.GetKeyValues(new[] { replacement }).Single().Key).IsEqualTo(replacement.Name); + await Assert.That(updater.Lookup(replacement).Value).IsSameReferenceAs(replacement); + } + + [Test] + public async Task CacheUpdaterComparerOverloadsSkipEquivalentUpdatesAndApplyDifferentItems() + { + var cache = new ChangeAwareCache(); + var updater = new CacheUpdater(cache, static person => person.Name); + var original = new Person("SameAge", 42); + var sameAge = new Person("SameAge", 42); + var newAge = new Person("SameAge", 43); + + updater.AddOrUpdate(original); + updater.AddOrUpdate(sameAge, Person.AgeComparer); + updater.AddOrUpdate(new[] { newAge }, Person.AgeComparer); + + var changes = cache.CaptureChanges(); + + await Assert.That(cache.Lookup(original.Name).Value).IsSameReferenceAs(newAge); + await Assert.That(changes.Count).IsEqualTo(2); + await Assert.That(changes.Select(static change => change.Reason)).IsEquivalentTo(new[] { ChangeReason.Add, ChangeReason.Update }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task CacheUpdaterRefreshAndRemoveEnumerableOverloadsUseSelectedKeys() + { + var cache = new ChangeAwareCache(); + var updater = new CacheUpdater(cache, static person => person.Name); + var first = new Person("First", 1); + var second = new Person("Second", 2); + var third = new Person("Third", 3); + + updater.AddOrUpdate(new[] { first, second, third }); + cache.CaptureChanges(); + + updater.Refresh(new[] { first, second }); + updater.Refresh(new[] { third.Name }); + updater.Remove(new[] { first }); + updater.Remove(new[] { second.Name }); + updater.Remove(new[] { new KeyValuePair(third.Name, third) }); + + var changes = cache.CaptureChanges(); + + await Assert.That(cache.Count).IsEqualTo(0); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Refresh)).IsEqualTo(3); + await Assert.That(changes.Count(static change => change.Reason == ChangeReason.Remove)).IsEqualTo(3); + } + + [Test] + public async Task CacheUpdaterThrowsWhenKeySelectorIsRequiredButMissing() + { + var updater = new CacheUpdater(new ChangeAwareCache()); + var person = new Person("MissingSelector", 1); + + await Assert.That(() => updater.AddOrUpdate(person)).Throws(); + await Assert.That(() => updater.AddOrUpdate(new[] { person })).Throws(); + await Assert.That(() => updater.GetKey(person)).Throws(); + await Assert.That(() => updater.Lookup(person)).Throws(); + await Assert.That(() => updater.Refresh(person)).Throws(); + await Assert.That(() => updater.Remove(person)).Throws(); + } +} diff --git a/src/DynamicData.Tests/Internal/CacheParentSubscriptionFixture.cs b/src/DynamicData.Tests/Internal/CacheParentSubscriptionFixture.cs index 5f11b9fc5..fe06bf321 100644 --- a/src/DynamicData.Tests/Internal/CacheParentSubscriptionFixture.cs +++ b/src/DynamicData.Tests/Internal/CacheParentSubscriptionFixture.cs @@ -1,29 +1,16 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; -using System.Threading; -using System.Threading.Tasks; - using Bogus; -using DynamicData.Internal; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Internal; /// /// Tests for /// behavioral contracts using a minimal concrete subclass. /// +[NotInParallel] public sealed class CacheParentSubscriptionFixture { private const int SeedMin = 1; @@ -36,8 +23,8 @@ public sealed class CacheParentSubscriptionFixture /// Test item with a typed key — no string parsing. private sealed record TestItem(int Key, string Value); - [Fact] - public void ParentOnNext_CalledForEachChangeSet() + [Test] + public async Task ParentOnNext_CalledForEachChangeSet() { var itemCount = _rand.Number(BatchSizeMin, BatchSizeMax); using var source = new SourceCache(x => x.Key); @@ -52,19 +39,19 @@ public void ParentOnNext_CalledForEachChangeSet() foreach (var item in items) source.AddOrUpdate(item); - sub.ParentCallCount.Should().Be(items.Count, "ParentOnNext should fire once per changeset"); - observer.EmitCount.Should().Be(items.Count, "EmitChanges should fire after each parent update"); + await Assert.That(sub.ParentCallCount).IsEqualTo(items.Count); + await Assert.That(observer.EmitCount).IsEqualTo(items.Count); } - [Fact] - public void ChildOnNext_CalledForEachEmission() + [Test] + public async Task ChildOnNext_CalledForEachEmission() { using var source = new SourceCache(x => x.Key); - var childSubjects = new List>(); + var childSubjects = new List>(); var observer = new TestObserver(); using var sub = new TestSubscription(observer, key => { - var subj = new Subject(); + var subj = new ReactiveUI.Primitives.Signals.Signal(); childSubjects.Add(subj); return subj; }); @@ -73,16 +60,16 @@ public void ChildOnNext_CalledForEachEmission() var key = _rand.Number(SeedMin, SeedMax); source.AddOrUpdate(new TestItem(key, "parent")); - childSubjects.Should().HaveCount(1); + await Assert.That(childSubjects).HasCount(1); var childValue = _rand.String2(_rand.Number(5, 15)); childSubjects[0].OnNext(childValue); - sub.ChildCalls.Should().ContainSingle() - .Which.Should().Be((childValue, key)); + await Assert.That(sub.ChildCalls).HasCount(1); + await Assert.That(sub.ChildCalls[0]).IsEqualTo((childValue, key)); } - [Fact] - public void EmitChanges_FiresOnceForBatch() + [Test] + public async Task EmitChanges_FiresOnceForBatch() { var batchSize = _rand.Number(BatchSizeMin, BatchSizeMax); using var source = new SourceCache(x => x.Key); @@ -96,12 +83,12 @@ public void EmitChanges_FiresOnceForBatch() updater.AddOrUpdate(new TestItem(i + 1, _rand.String2(_rand.Number(3, 8)))); }); - sub.ParentCallCount.Should().Be(1, "single batch = single ParentOnNext"); - sub.EmitCallCount.Should().Be(1, "single batch = single EmitChanges"); + await Assert.That(sub.ParentCallCount).IsEqualTo(1); + await Assert.That(sub.EmitCallCount).IsEqualTo(1); } - [Fact] - public void Batching_ChildUpdatesSettleBeforeEmit() + [Test] + public async Task Batching_ChildUpdatesSettleBeforeEmit() { var batchSize = _rand.Number(BatchSizeMin, BatchSizeMax); using var source = new SourceCache(x => x.Key); @@ -110,7 +97,7 @@ public void Batching_ChildUpdatesSettleBeforeEmit() using var sub = new TestSubscription(observer, key => { Interlocked.Increment(ref childCount); - return new BehaviorSubject($"sync-{key}"); + return new ReactiveUI.Primitives.Signals.StateSignal($"sync-{key}"); }); sub.ExposeCreateParent(source.Connect()); @@ -120,37 +107,36 @@ public void Batching_ChildUpdatesSettleBeforeEmit() updater.AddOrUpdate(new TestItem(i + 1, _rand.String2(_rand.Number(3, 8)))); }); - childCount.Should().Be(batchSize, "each item should create a child"); - sub.EmitCallCount.Should().BeGreaterThanOrEqualTo(1, - "EmitChanges fires after parent + children settle"); + await Assert.That(childCount).IsEqualTo(batchSize); + await Assert.That(sub.EmitCallCount).IsGreaterThanOrEqualTo(1); } - [Fact] - public void Completion_RequiresParentAndAllChildren() + [Test] + public async Task Completion_RequiresParentAndAllChildren() { using var source = new TestSourceCache(x => x.Key); - var childSubjects = new List>(); + var childSubjects = new List>(); var observer = new TestObserver(); using var sub = new TestSubscription(observer, key => { - var subj = new Subject(); + var subj = new ReactiveUI.Primitives.Signals.Signal(); childSubjects.Add(subj); return subj; }); sub.ExposeCreateParent(source.Connect()); source.AddOrUpdate(new TestItem(_rand.Number(SeedMin, SeedMax), "item")); - childSubjects.Should().HaveCount(1); + await Assert.That(childSubjects).HasCount(1); source.Complete(); - observer.IsCompleted.Should().BeFalse("parent complete but child still active"); + await Assert.That(observer.IsCompleted).IsFalse(); childSubjects[0].OnCompleted(); - observer.IsCompleted.Should().BeTrue("OnCompleted fires when parent + all children complete"); + await Assert.That(observer.IsCompleted).IsTrue(); } - [Fact] - public void Completion_ParentOnly_NoChildren() + [Test] + public async Task Completion_ParentOnly_NoChildren() { using var source = new TestSourceCache(x => x.Key); var observer = new TestObserver(); @@ -158,18 +144,18 @@ public void Completion_ParentOnly_NoChildren() sub.ExposeCreateParent(source.Connect()); source.Complete(); - observer.IsCompleted.Should().BeTrue("immediate OnCompleted when no children"); + await Assert.That(observer.IsCompleted).IsTrue(); } - [Fact] - public void Disposal_StopsAllEmissions() + [Test] + public async Task Disposal_StopsAllEmissions() { using var source = new SourceCache(x => x.Key); - var childSubjects = new List>(); + var childSubjects = new List>(); var observer = new TestObserver(); var sub = new TestSubscription(observer, key => { - var subj = new Subject(); + var subj = new ReactiveUI.Primitives.Signals.Signal(); childSubjects.Add(subj); return subj; }); @@ -184,11 +170,11 @@ public void Disposal_StopsAllEmissions() if (childSubjects.Count > 0) childSubjects[0].OnNext("after-dispose"); - observer.EmitCount.Should().Be(emitsBefore, "no emissions after disposal"); + await Assert.That(observer.EmitCount).IsEqualTo(emitsBefore); } - [Fact] - public void Error_Propagates() + [Test] + public async Task Error_Propagates() { using var source = new TestSourceCache(x => x.Key); var observer = new TestObserver(); @@ -198,11 +184,11 @@ public void Error_Propagates() var error = new InvalidOperationException("test error"); source.SetError(error); - observer.Error.Should().BeSameAs(error); + await Assert.That(observer.Error).IsSameReferenceAs(error); } - [Fact] - public void Serialization_ParentAndChildDoNotInterleave() + [Test] + public async Task Serialization_ParentAndChildDoNotInterleave() { using var source = new SourceCache(x => x.Key); var callLog = new List(); @@ -211,7 +197,7 @@ public void Serialization_ParentAndChildDoNotInterleave() observer, key => { - var subj = new Subject(); + var subj = new ReactiveUI.Primitives.Signals.Signal(); return subj; }, onParent: () => { lock (callLog) callLog.Add("P-start"); Thread.Sleep(1); lock (callLog) callLog.Add("P-end"); }, @@ -224,7 +210,7 @@ public void Serialization_ParentAndChildDoNotInterleave() for (var i = 0; i + 1 < callLog.Count; i += 2) { var prefix = callLog[i].Split('-')[0]; - callLog[i + 1].Should().StartWith(prefix, "operations should not interleave"); + await Assert.That(callLog[i + 1]).StartsWith(prefix); } } @@ -233,8 +219,7 @@ public void Serialization_ParentAndChildDoNotInterleave() /// whose EmitChanges callbacks write into each other's source cache — creating a /// cross-cache cycle. Deadlocks on unfixed code, passes after the fix. /// - [Trait("Category", "ExplicitDeadlock")] - [Fact] + [Test] public async Task DeadlockProof_CrossFeedingSubscriptions() { var iterations = _rand.Number(50, 150); @@ -271,8 +256,7 @@ public async Task DeadlockProof_CrossFeedingSubscriptions() var completed = Task.WhenAll(taskA, taskB); var finished = await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(30))); - finished.Should().BeSameAs(completed, - "cross-feeding CacheParentSubscriptions should not deadlock"); + await Assert.That(finished).IsSameReferenceAs(completed); } // ═══════════════════════════════════════════════════════════════ @@ -372,4 +356,4 @@ private sealed class TestObserver : IObserver> public void OnError(Exception error) => Error = error; public void OnCompleted() => IsCompleted = true; } -} \ No newline at end of file +} diff --git a/src/DynamicData.Tests/Internal/CacheParentSubscriptionRegressionFixture.cs b/src/DynamicData.Tests/Internal/CacheParentSubscriptionRegressionFixture.cs new file mode 100644 index 000000000..bf38b7349 --- /dev/null +++ b/src/DynamicData.Tests/Internal/CacheParentSubscriptionRegressionFixture.cs @@ -0,0 +1,171 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +namespace DynamicData.Tests.Internal; + +/// +/// Regression tests for stale child callbacks after same-key replacement in +/// . +/// +public sealed class CacheParentSubscriptionRegressionFixture +{ + [Test] + public async Task ErrorHandlerCannotReenterChildDeliveryAfterTermination() + { + var failedChild = new ManualObservable(); + var otherChild = new ManualObservable(); + var observer = new TestObserver { ErrorAction = () => otherChild.Emit("after-error") }; + using var subscription = new TestSubscription(observer); + subscription.AddRawChild(failedChild, 1); + subscription.AddRawChild(otherChild, 2); + otherChild.Emit("before-error"); + + failedChild.Fail(new InvalidOperationException("first")); + otherChild.Fail(new InvalidOperationException("second")); + + await Assert.That(observer.ErrorCount).IsEqualTo(1); + await Assert.That(observer.EmitCount).IsEqualTo(1); + await Assert.That(subscription.ChildValues).IsEquivalentTo(new[] { "before-error" }); + } + + [Test] + public async Task SameKeyReplacementIgnoresOldChildCallbacks() + { + const int ParentKey = 42; + + var observer = new TestObserver(); + using var subscription = new TestSubscription(observer); + var oldChild = new DisposalEmittingObservable("old-stale"); + var replacementChild = new ManualObservable(); + + subscription.AddRawChild(oldChild, ParentKey); + oldChild.Emit("old-active"); + + subscription.AddRawChild(replacementChild, ParentKey); + replacementChild.Emit("replacement-active"); + replacementChild.Emit("replacement-after-old-completed"); + + await Assert.That(subscription.ChildValues).IsEquivalentTo( + new[] + { + "old-active", + "replacement-active", + "replacement-after-old-completed" + }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(observer.EmitCount).IsEqualTo(3); + } + + private sealed class TestSubscription(IObserver observer) : CacheParentSubscription(observer) + { + private string _pendingChild = string.Empty; + private bool _hasPendingChild; + + public List ChildValues { get; } = []; + + public void AddRawChild(IObservable observable, int parentKey) => + AddChildSubscription(observable, parentKey); + + protected override void ParentOnNext(IChangeSet changes) + { + } + + protected override void ChildOnNext(string child, int parentKey) + { + ChildValues.Add(child); + _pendingChild = child; + _hasPendingChild = true; + } + + protected override void EmitChanges(IObserver observer) + { + if (_hasPendingChild) + { + _hasPendingChild = false; + observer.OnNext(_pendingChild); + } + } + } + + private sealed class TestObserver : IObserver + { + public int EmitCount { get; private set; } + + public int ErrorCount { get; private set; } + + public Action? ErrorAction { get; init; } + + public void OnNext(string value) => ++EmitCount; + + public void OnError(Exception error) + { + ErrorCount++; + ErrorAction?.Invoke(); + } + + public void OnCompleted() + { + } + } + + private class ManualObservable : IObservable + { + private readonly List> _observers = []; + + public virtual IDisposable Subscribe(IObserver observer) + { + _observers.Add(observer); + return new IgnoredDispose(); + } + + public void Emit(T value) + { + foreach (var observer in _observers.ToArray()) + { + observer.OnNext(value); + } + } + + public void Fail(Exception error) + { + foreach (var observer in _observers.ToArray()) + { + observer.OnError(error); + } + } + } + + private sealed class DisposalEmittingObservable(T staleValue) : ManualObservable + { + public override IDisposable Subscribe(IObserver observer) + { + base.Subscribe(observer); + return new OnDispose(() => + { + observer.OnNext(staleValue); + observer.OnCompleted(); + }); + } + } + + private sealed class IgnoredDispose : IDisposable + { + public void Dispose() + { + } + } + + private sealed class OnDispose(Action action) : IDisposable + { + private int _disposed; + + public void Dispose() + { + if (Interlocked.Exchange(ref _disposed, 1) == 0) + { + action(); + } + } + } +} diff --git a/src/DynamicData.Tests/Internal/CrossCacheDeadlockRepro.cs b/src/DynamicData.Tests/Internal/CrossCacheDeadlockRepro.cs new file mode 100644 index 000000000..24b2ae031 --- /dev/null +++ b/src/DynamicData.Tests/Internal/CrossCacheDeadlockRepro.cs @@ -0,0 +1,56 @@ +// CrossCacheDeadlockRepro.cs +// Reproduction for: Cross-cache deadlock when concurrent updates notify subscribers that modify other SourceCache instances +// Requires: DynamicData 9.x. +// +// This test deadlocks on DynamicData main. It should complete in under 10 seconds. + +namespace DynamicData.Tests.Internal; + +[NotInParallel] +public class CrossCacheDeadlockRepro : IDisposable +{ + private readonly SourceCache _cacheA = new(static x => x.GetHashCode()); + private readonly SourceCache _cacheB = new(static x => x.GetHashCode()); + + [Test] + public async Task ConcurrentPopulateIntoShouldNotDeadlock() + { + // Arrange + using var destination = new SourceCache(static x => x.GetHashCode()); + using var subA = _cacheA.Connect().PopulateInto(destination); + using var subB = _cacheB.Connect().PopulateInto(destination); + + var count = 0; + using var feedback = destination.Connect().Subscribe(_ => Interlocked.Increment(ref count)); + + // Act — concurrent updates from two threads + var completed = Task.WaitAll( + [ + Task.Run(() => + { + for (var i = 0; i < 100; i++) + { + _cacheA.AddOrUpdate($"A-{i}"); + } + }), + Task.Run(() => + { + for (var i = 0; i < 100; i++) + { + _cacheB.AddOrUpdate($"B-{i}"); + } + }), + ], + TimeSpan.FromSeconds(10)); + + // Assert + await Assert.That(completed).IsTrue(); + await Assert.That(count).IsGreaterThan(0); + } + + public void Dispose() + { + _cacheA.Dispose(); + _cacheB.Dispose(); + } +} diff --git a/src/DynamicData.Tests/Internal/DeliveryQueueFixture.cs b/src/DynamicData.Tests/Internal/DeliveryQueueFixture.cs index 3062e331f..347b7ec27 100644 --- a/src/DynamicData.Tests/Internal/DeliveryQueueFixture.cs +++ b/src/DynamicData.Tests/Internal/DeliveryQueueFixture.cs @@ -1,23 +1,10 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - -using DynamicData.Internal; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Internal; public class DeliveryQueueFixture { -#if NET9_0_OR_GREATER private readonly Lock _gate = new(); -#else - private readonly object _gate = new(); -#endif /// Helper observer that captures OnNext items into a list. private sealed class ListObserver : IObserver @@ -55,29 +42,31 @@ public void OnCompleted() { } } private static void EnqueueAndDeliver(DeliveryQueue queue, T item) + where T : notnull { using var scope = queue.AcquireLock(); scope.EnqueueNext(item); } private static void TriggerDelivery(DeliveryQueue queue) + where T : notnull { using var scope = queue.AcquireLock(); } - [Fact] - public void EnqueueAndDeliverDeliversItem() + [Test] + public async Task EnqueueAndDeliverDeliversItem() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); EnqueueAndDeliver(queue, "A"); - observer.Items.Should().Equal("A"); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void DeliverDeliversItemsInFifoOrder() + [Test] + public async Task DeliverDeliversItemsInFifoOrder() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -89,21 +78,21 @@ public void DeliverDeliversItemsInFifoOrder() scope.EnqueueNext("C"); } - observer.Items.Should().Equal("A", "B", "C"); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A", "B", "C" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void DeliverWithEmptyQueueIsNoOp() + [Test] + public async Task DeliverWithEmptyQueueIsNoOp() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); TriggerDelivery(queue); - observer.Items.Should().BeEmpty(); + await Assert.That(observer.Items).IsEmpty(); } - [Fact] + [Test] public async Task OnlyOneDelivererAtATime() { var concurrentCount = 0; @@ -163,12 +152,12 @@ public async Task OnlyOneDelivererAtATime() await Task.WhenAll(tasks.Append(firstDelivery)); - maxConcurrent.Should().Be(1, "only one thread should be delivering at a time"); - delivered.Should().HaveCount(101); + await Assert.That(maxConcurrent).IsEqualTo(1); + await Assert.That(delivered).HasCount(101); } - [Fact] - public void SecondWriterItemPickedUpByFirstDeliverer() + [Test] + public async Task SecondWriterItemPickedUpByFirstDeliverer() { var observer = new ListObserver(); DeliveryQueue? q = null; @@ -188,11 +177,11 @@ public void SecondWriterItemPickedUpByFirstDeliverer() EnqueueAndDeliver(queue, "A"); - observer.Items.Should().Equal("A", "B"); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A", "B" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void ReentrantEnqueueDoesNotRecurse() + [Test] + public async Task ReentrantEnqueueDoesNotRecurse() { var callDepth = 0; var maxDepth = 0; @@ -220,12 +209,12 @@ public void ReentrantEnqueueDoesNotRecurse() EnqueueAndDeliver(queue, "A"); - delivered.Should().Equal("A", "B"); - maxDepth.Should().Be(1, "delivery callback should not recurse"); + await Assert.That(delivered).IsEquivalentTo(new[] { "A", "B" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(maxDepth).IsEqualTo(1); } - [Fact] - public void ExceptionInDeliveryResetsDeliveryToken() + [Test] + public async Task ExceptionInDeliveryResetsDeliveryToken() { var callCount = 0; var observer = new DelegateObserver(_ => @@ -237,15 +226,15 @@ public void ExceptionInDeliveryResetsDeliveryToken() var queue = new DeliveryQueue(_gate, observer); var act = () => EnqueueAndDeliver(queue, "A"); - act.Should().Throw(); + await Assert.That(act).Throws(); EnqueueAndDeliver(queue, "B"); - callCount.Should().Be(2, "delivery should work after exception recovery"); + await Assert.That(callCount).IsEqualTo(2); } - [Fact] - public void RemainingItemsDeliveredAfterExceptionRecovery() + [Test] + public async Task RemainingItemsDeliveredAfterExceptionRecovery() { var delivered = new List(); var shouldThrow = true; @@ -265,16 +254,16 @@ public void RemainingItemsDeliveredAfterExceptionRecovery() scope.EnqueueNext("B"); }; - act.Should().Throw(); + await Assert.That(act).Throws(); shouldThrow = false; TriggerDelivery(queue); - delivered.Should().Equal("B"); + await Assert.That(delivered).IsEquivalentTo(new[] { "B" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void TerminalCompletedStopsDelivery() + [Test] + public async Task TerminalCompletedStopsDelivery() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -286,13 +275,13 @@ public void TerminalCompletedStopsDelivery() scope.EnqueueNext("B"); // should be ignored after terminal } - observer.Items.Should().Equal("A"); - observer.IsCompleted.Should().BeTrue(); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(observer.IsCompleted).IsTrue(); + await Assert.That(queue.IsTerminated).IsTrue(); } - [Fact] - public void TerminalErrorStopsDelivery() + [Test] + public async Task TerminalErrorStopsDelivery() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -305,13 +294,13 @@ public void TerminalErrorStopsDelivery() scope.EnqueueNext("B"); // should be ignored after terminal } - observer.Items.Should().Equal("A"); - observer.Error.Should().BeSameAs(error); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(observer.Error).IsSameReferenceAs(error); + await Assert.That(queue.IsTerminated).IsTrue(); } - [Fact] - public void EnqueueAfterTerminationIsIgnored() + [Test] + public async Task EnqueueAfterTerminationIsIgnored() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -323,18 +312,18 @@ public void EnqueueAfterTerminationIsIgnored() EnqueueAndDeliver(queue, "AFTER"); - observer.Items.Should().BeEmpty(); + await Assert.That(observer.Items).IsEmpty(); } - [Fact] - public void IsTerminatedIsFalseInitially() + [Test] + public async Task IsTerminatedIsFalseInitially() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); - queue.IsTerminated.Should().BeFalse(); + await Assert.That(queue.IsTerminated).IsFalse(); } - [Fact] + [Test] public async Task ConcurrentEnqueueAllItemsDelivered() { const int threadCount = 8; @@ -351,10 +340,10 @@ public async Task ConcurrentEnqueueAllItemsDelivered() await Task.WhenAll(tasks); TriggerDelivery(queue); - observer.Items.Count.Should().Be(threadCount * itemsPerThread); + await Assert.That(observer.Items.Count).IsEqualTo(threadCount * itemsPerThread); } - [Fact] + [Test] public async Task ConcurrentEnqueueNoDuplicates() { const int threadCount = 8; @@ -371,10 +360,10 @@ public async Task ConcurrentEnqueueNoDuplicates() await Task.WhenAll(tasks); TriggerDelivery(queue); - observer.Items.Distinct().Count().Should().Be(threadCount * itemsPerThread); + await Assert.That(observer.Items.Distinct().Count()).IsEqualTo(threadCount * itemsPerThread); } - [Fact] + [Test] public async Task ConcurrentEnqueuePreservesPerThreadOrdering() { const int threadCount = 4; @@ -395,7 +384,7 @@ public async Task ConcurrentEnqueuePreservesPerThreadOrdering() .ToDictionary(g => g.Key, g => g.Select(x => x.Seq).ToList()); foreach (var (thread, sequences) in itemsByThread) - sequences.Should().BeInAscendingOrder($"items from thread {thread} should preserve enqueue order"); + await Assert.That(sequences).IsInOrder(); } /// Observer that delegates OnNext to an action. @@ -414,8 +403,8 @@ public void OnError(Exception error) { } public void OnCompleted() { } } - [Fact] - public void DisposeTerminatesQueue() + [Test] + public async Task DisposeTerminatesQueue() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -423,15 +412,15 @@ public void DisposeTerminatesQueue() EnqueueAndDeliver(queue, "A"); queue.Dispose(); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(queue.IsTerminated).IsTrue(); // Further enqueues should be ignored EnqueueAndDeliver(queue, "B"); - observer.Items.Should().Equal("A"); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void DisposeClearsPendingItems() + [Test] + public async Task DisposeClearsPendingItems() { var observer = new ListObserver(); var deliveryCount = 0; @@ -459,12 +448,12 @@ public void DisposeClearsPendingItems() EnqueueAndDeliver(queue, "A"); // Only "A" should be delivered — "B" and "C" were cleared by Dispose - observer.Items.Should().Equal("A"); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(queue.IsTerminated).IsTrue(); } - [Fact] - public void DisposeFromDrainThreadDoesNotDeadlock() + [Test] + public async Task DisposeFromDrainThreadDoesNotDeadlock() { var observer = new ListObserver(); DeliveryQueue? q = null; @@ -482,10 +471,10 @@ public void DisposeFromDrainThreadDoesNotDeadlock() // This should NOT deadlock var completed = Task.Run(() => EnqueueAndDeliver(queue, "A")); var finished = Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(5))).Result; - finished.Should().BeSameAs(completed, "Dispose from drain thread should not deadlock"); + await Assert.That(finished).IsSameReferenceAs(completed); } - [Fact] + [Test] public async Task DisposeWaitsForInFlightDelivery() { var observer = new ListObserver(); @@ -510,18 +499,18 @@ public async Task DisposeWaitsForInFlightDelivery() // Give terminate a moment to enter spin-wait await Task.Delay(100); - terminateTask.IsCompleted.Should().BeFalse("should be spinning waiting for delivery"); + await Assert.That(terminateTask.IsCompleted).IsFalse(); // Release the delivery allowDeliveryToFinish.Set(); await Task.WhenAll(deliverTask, terminateTask); - queue.IsTerminated.Should().BeTrue(); - observer.Items.Should().Equal(42); + await Assert.That(queue.IsTerminated).IsTrue(); + await Assert.That(observer.Items).IsEquivalentTo(new[] { 42 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void TerminalItemsDeliveredBeforeTermination() + [Test] + public async Task TerminalItemsDeliveredBeforeTermination() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -534,13 +523,13 @@ public void TerminalItemsDeliveredBeforeTermination() scope.EnqueueNext("C"); // should be ignored — after terminal } - observer.Items.Should().Equal("A", "B"); - observer.IsCompleted.Should().BeTrue(); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A", "B" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(observer.IsCompleted).IsTrue(); + await Assert.That(queue.IsTerminated).IsTrue(); } - [Fact] - public void ErrorTerminatesAndClearsPending() + [Test] + public async Task ErrorTerminatesAndClearsPending() { var observer = new ListObserver(); var queue = new DeliveryQueue(_gate, observer); @@ -553,8 +542,8 @@ public void ErrorTerminatesAndClearsPending() scope.EnqueueNext("B"); // should be ignored } - observer.Items.Should().Equal("A"); - observer.Error.Should().BeSameAs(error); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(observer.Items).IsEquivalentTo(new[] { "A" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(observer.Error).IsSameReferenceAs(error); + await Assert.That(queue.IsTerminated).IsTrue(); } -} \ No newline at end of file +} diff --git a/src/DynamicData.Tests/Internal/KeyedDisposableFixture.cs b/src/DynamicData.Tests/Internal/KeyedDisposableFixture.cs index 2296564ef..a81e23395 100644 --- a/src/DynamicData.Tests/Internal/KeyedDisposableFixture.cs +++ b/src/DynamicData.Tests/Internal/KeyedDisposableFixture.cs @@ -1,20 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; - -using DynamicData.Internal; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Internal; public class KeyedDisposableFixture { - [Fact] - public void AddTracksDisposable() + [Test] + public async Task AddTracksDisposable() { var tracker = new KeyedDisposable(); var disposed = false; @@ -22,12 +15,12 @@ public void AddTracksDisposable() tracker.Add("key", item); - tracker.ContainsKey("key").Should().BeTrue(); - disposed.Should().BeFalse(); + await Assert.That(tracker.ContainsKey("key")).IsTrue(); + await Assert.That(disposed).IsFalse(); } - [Fact] - public void RemoveDisposesItem() + [Test] + public async Task RemoveDisposesItem() { var tracker = new KeyedDisposable(); var disposed = false; @@ -35,12 +28,12 @@ public void RemoveDisposesItem() tracker.Remove("key"); - disposed.Should().BeTrue(); - tracker.ContainsKey("key").Should().BeFalse(); + await Assert.That(disposed).IsTrue(); + await Assert.That(tracker.ContainsKey("key")).IsFalse(); } - [Fact] - public void AddWithSameKeyDisposePrevious() + [Test] + public async Task AddWithSameKeyDisposePrevious() { var tracker = new KeyedDisposable(); var disposed1 = false; @@ -49,12 +42,12 @@ public void AddWithSameKeyDisposePrevious() tracker.Add("key", new TestDisposable(() => disposed2 = true)); - disposed1.Should().BeTrue("previous item should be disposed"); - disposed2.Should().BeFalse("new item should not be disposed"); + await Assert.That(disposed1).IsTrue(); + await Assert.That(disposed2).IsFalse(); } - [Fact] - public void AddWithSameReferenceDoesNotDispose() + [Test] + public async Task AddWithSameReferenceDoesNotDispose() { var tracker = new KeyedDisposable(); var disposeCount = 0; @@ -63,12 +56,12 @@ public void AddWithSameReferenceDoesNotDispose() tracker.Add("key", item); tracker.Add("key", item); // same reference - disposeCount.Should().Be(0, "same reference should not be disposed"); - tracker.ContainsKey("key").Should().BeTrue(); + await Assert.That(disposeCount).IsEqualTo(0); + await Assert.That(tracker.ContainsKey("key")).IsTrue(); } - [Fact] - public void DisposeDisposesAllItems() + [Test] + public async Task DisposeDisposesAllItems() { var tracker = new KeyedDisposable(); var disposedCount = 0; @@ -77,12 +70,12 @@ public void DisposeDisposesAllItems() tracker.Dispose(); - disposedCount.Should().Be(5); - tracker.IsDisposed.Should().BeTrue(); + await Assert.That(disposedCount).IsEqualTo(5); + await Assert.That(tracker.IsDisposed).IsTrue(); } - [Fact] - public void DisposeIsIdempotent() + [Test] + public async Task DisposeIsIdempotent() { var tracker = new KeyedDisposable(); var disposeCount = 0; @@ -91,11 +84,11 @@ public void DisposeIsIdempotent() tracker.Dispose(); tracker.Dispose(); - disposeCount.Should().Be(1); + await Assert.That(disposeCount).IsEqualTo(1); } - [Fact] - public void AddAfterDisposeDisposesImmediately() + [Test] + public async Task AddAfterDisposeDisposesImmediately() { var tracker = new KeyedDisposable(); tracker.Dispose(); @@ -103,36 +96,34 @@ public void AddAfterDisposeDisposesImmediately() var disposed = false; tracker.Add("key", new TestDisposable(() => disposed = true)); - disposed.Should().BeTrue("item added after Dispose should be disposed immediately"); + await Assert.That(disposed).IsTrue(); } - [Fact] - public void DisposeAggregatesExceptions() + [Test] + public async Task DisposeAggregatesExceptions() { var tracker = new KeyedDisposable(); tracker.Add(1, new TestDisposable(() => throw new InvalidOperationException("boom1"))); tracker.Add(2, new TestDisposable(() => { })); tracker.Add(3, new TestDisposable(() => throw new InvalidOperationException("boom3"))); - var act = () => tracker.Dispose(); - - act.Should().Throw() - .Which.InnerExceptions.Should().HaveCount(2); - tracker.Count.Should().Be(0, "all items should be cleared even after exceptions"); + var exception = await Assert.That(() => tracker.Dispose()).Throws(); + await Assert.That(exception.InnerExceptions).HasCount(2); + await Assert.That(tracker.Count).IsEqualTo(0); } - [Fact] - public void AddNonDisposableTracksNothing() + [Test] + public async Task AddNonDisposableTracksNothing() { var tracker = new KeyedDisposable(); tracker.Add("key", "not disposable"); - tracker.ContainsKey("key").Should().BeFalse(); + await Assert.That(tracker.ContainsKey("key")).IsFalse(); } - [Fact] - public void AddNonDisposableRemovesPrevious() + [Test] + public async Task AddNonDisposableRemovesPrevious() { var tracker = new KeyedDisposable(); var disposed = false; @@ -140,12 +131,12 @@ public void AddNonDisposableRemovesPrevious() tracker.Add("key", "not disposable"); - disposed.Should().BeTrue("previous disposable should be disposed"); - tracker.ContainsKey("key").Should().BeFalse(); + await Assert.That(disposed).IsTrue(); + await Assert.That(tracker.ContainsKey("key")).IsFalse(); } - [Fact] - public void RemoveNonExistentKeyIsNoOp() + [Test] + public async Task RemoveNonExistentKeyIsNoOp() { var tracker = new KeyedDisposable(); tracker.Remove("nonexistent"); // should not throw @@ -155,4 +146,4 @@ private sealed class TestDisposable(Action onDispose) : IDisposable { public void Dispose() => onDispose(); } -} \ No newline at end of file +} diff --git a/src/DynamicData.Tests/Internal/NotificationFixture.cs b/src/DynamicData.Tests/Internal/NotificationFixture.cs index d221b0044..9c468f2a8 100644 --- a/src/DynamicData.Tests/Internal/NotificationFixture.cs +++ b/src/DynamicData.Tests/Internal/NotificationFixture.cs @@ -1,131 +1,129 @@ +#if REACTIVE_TESTS +using DataInternal = DynamicData.Reactive.Internal; +#else +using DataInternal = DynamicData.Internal; +#endif // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Reactive; - -using DynamicData.Internal; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Internal; public class NotificationFixture { - [Fact] - public void CreateNext_WithReferenceType_DeliversOnNext() + [Test] + public async Task CreateNext_WithReferenceType_DeliversOnNext() { var observer = new RecordingObserver(); - var n = DynamicData.Internal.Notification.CreateNext("hello"); + var n = DataInternal.Notification.CreateNext("hello"); - n.IsTerminal.Should().BeFalse(); + await Assert.That(n.IsTerminal).IsFalse(); n.Accept(observer); - observer.NextValue.Should().Be("hello"); - observer.Error.Should().BeNull(); - observer.IsCompleted.Should().BeFalse(); + await Assert.That(observer.NextValue).IsEqualTo("hello"); + await Assert.That(observer.Error).IsNull(); + await Assert.That(observer.IsCompleted).IsFalse(); } - [Fact] - public void CreateError_WithReferenceType_DeliversOnError() + [Test] + public async Task CreateError_WithReferenceType_DeliversOnError() { var observer = new RecordingObserver(); var error = new Exception("test"); - var n = DynamicData.Internal.Notification.CreateError(error); + var n = DataInternal.Notification.CreateError(error); - n.IsTerminal.Should().BeTrue(); - n.IsError.Should().BeTrue(); + await Assert.That(n.IsTerminal).IsTrue(); + await Assert.That(n.IsError).IsTrue(); n.Accept(observer); - observer.NextValue.Should().BeNull(); - observer.Error.Should().BeSameAs(error); - observer.IsCompleted.Should().BeFalse(); + await Assert.That(observer.NextValue).IsNull(); + await Assert.That(observer.Error).IsSameReferenceAs(error); + await Assert.That(observer.IsCompleted).IsFalse(); } - [Fact] - public void CreateCompleted_WithReferenceType_DeliversOnCompleted() + [Test] + public async Task CreateCompleted_WithReferenceType_DeliversOnCompleted() { var observer = new RecordingObserver(); - var n = DynamicData.Internal.Notification.CreateCompleted(); + var n = DataInternal.Notification.CreateCompleted(); - n.IsTerminal.Should().BeTrue(); - n.IsError.Should().BeFalse(); + await Assert.That(n.IsTerminal).IsTrue(); + await Assert.That(n.IsError).IsFalse(); n.Accept(observer); - observer.NextValue.Should().BeNull(); - observer.Error.Should().BeNull(); - observer.IsCompleted.Should().BeTrue(); + await Assert.That(observer.NextValue).IsNull(); + await Assert.That(observer.Error).IsNull(); + await Assert.That(observer.IsCompleted).IsTrue(); } - [Fact] - public void CreateNext_WithValueType_DeliversOnNext() + [Test] + public async Task CreateNext_WithValueType_DeliversOnNext() { var observer = new RecordingObserver(); - var n = DynamicData.Internal.Notification.CreateNext(Unit.Default); + var n = DataInternal.Notification.CreateNext(Unit.Default); - n.IsTerminal.Should().BeFalse(); + await Assert.That(n.IsTerminal).IsFalse(); n.Accept(observer); - observer.HasNext.Should().BeTrue(); - observer.Error.Should().BeNull(); - observer.IsCompleted.Should().BeFalse(); + await Assert.That(observer.HasNext).IsTrue(); + await Assert.That(observer.Error).IsNull(); + await Assert.That(observer.IsCompleted).IsFalse(); } - [Fact] - public void CreateError_WithValueType_DeliversOnError() + [Test] + public async Task CreateError_WithValueType_DeliversOnError() { var observer = new RecordingObserver(); var error = new Exception("test"); - var n = DynamicData.Internal.Notification.CreateError(error); + var n = DataInternal.Notification.CreateError(error); - n.IsTerminal.Should().BeTrue(); - n.IsError.Should().BeTrue(); + await Assert.That(n.IsTerminal).IsTrue(); + await Assert.That(n.IsError).IsTrue(); n.Accept(observer); - observer.HasNext.Should().BeFalse(); - observer.Error.Should().BeSameAs(error); - observer.IsCompleted.Should().BeFalse(); + await Assert.That(observer.HasNext).IsFalse(); + await Assert.That(observer.Error).IsSameReferenceAs(error); + await Assert.That(observer.IsCompleted).IsFalse(); } - [Fact] - public void CreateCompleted_WithValueType_DeliversOnCompleted() + [Test] + public async Task CreateCompleted_WithValueType_DeliversOnCompleted() { var observer = new RecordingObserver(); - var n = DynamicData.Internal.Notification.CreateCompleted(); + var n = DataInternal.Notification.CreateCompleted(); - n.IsTerminal.Should().BeTrue(); - n.IsError.Should().BeFalse(); + await Assert.That(n.IsTerminal).IsTrue(); + await Assert.That(n.IsError).IsFalse(); n.Accept(observer); - observer.HasNext.Should().BeFalse(); - observer.Error.Should().BeNull(); - observer.IsCompleted.Should().BeTrue(); + await Assert.That(observer.HasNext).IsFalse(); + await Assert.That(observer.Error).IsNull(); + await Assert.That(observer.IsCompleted).IsTrue(); } - [Fact] - public void DefaultNotification_WithValueType_IsTerminal() + [Test] + public async Task DefaultNotification_WithValueType_IsTerminal() { - // default(DynamicData.Internal.Notification) should behave as OnCompleted - var n = default(DynamicData.Internal.Notification); - n.IsTerminal.Should().BeTrue(); - n.IsError.Should().BeFalse(); + // default(DataInternal.Notification) should behave as OnCompleted + var n = default(DataInternal.Notification); + await Assert.That(n.IsTerminal).IsTrue(); + await Assert.That(n.IsError).IsFalse(); var observer = new RecordingObserver(); n.Accept(observer); - observer.IsCompleted.Should().BeTrue(); + await Assert.That(observer.IsCompleted).IsTrue(); } - [Fact] - public void DefaultNotification_WithReferenceType_IsTerminal() + [Test] + public async Task DefaultNotification_WithReferenceType_IsTerminal() { - var n = default(DynamicData.Internal.Notification); - n.IsTerminal.Should().BeTrue(); - n.IsError.Should().BeFalse(); + var n = default(DataInternal.Notification); + await Assert.That(n.IsTerminal).IsTrue(); + await Assert.That(n.IsError).IsFalse(); var observer = new RecordingObserver(); n.Accept(observer); - observer.IsCompleted.Should().BeTrue(); + await Assert.That(observer.IsCompleted).IsTrue(); } private sealed class RecordingObserver : IObserver diff --git a/src/DynamicData.Tests/Internal/SharedDeliveryQueueFixture.cs b/src/DynamicData.Tests/Internal/SharedDeliveryQueueFixture.cs index 583005489..b6c293bc8 100644 --- a/src/DynamicData.Tests/Internal/SharedDeliveryQueueFixture.cs +++ b/src/DynamicData.Tests/Internal/SharedDeliveryQueueFixture.cs @@ -2,29 +2,17 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - -using DynamicData.Internal; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.Internal; +[NotInParallel] public class SharedDeliveryQueueFixture { -#if NET9_0_OR_GREATER private readonly Lock _gate = new(); -#else - private readonly object _gate = new(); -#endif - [Fact] - public void SingleSourceDeliversItems() + [Test] + public async Task SingleSourceDeliversItems() { var queue = new SharedDeliveryQueue(_gate); var delivered = new List(); @@ -38,11 +26,11 @@ public void SingleSourceDeliversItems() scope.EnqueueNext(3); } - delivered.Should().Equal(1, 2, 3); + await Assert.That(delivered).IsEquivalentTo(new[] { 1, 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void MultipleSourcesSerializeDelivery() + [Test] + public async Task MultipleSourcesSerializeDelivery() { var queue = new SharedDeliveryQueue(_gate); var delivered = new List(); @@ -61,11 +49,11 @@ public void MultipleSourcesSerializeDelivery() scope2.EnqueueNext("hello"); } - delivered.Should().Equal("int:1", "str:hello"); + await Assert.That(delivered).IsEquivalentTo(new[] { "int:1", "str:hello" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void ErrorTerminatesAllSubQueues() + [Test] + public async Task ErrorTerminatesAllSubQueues() { var queue = new SharedDeliveryQueue(_gate); var delivered1 = new List(); @@ -81,7 +69,7 @@ public void ErrorTerminatesAllSubQueues() scope1.EnqueueError(new InvalidOperationException("boom")); } - queue.IsTerminated.Should().BeTrue(); + await Assert.That(queue.IsTerminated).IsTrue(); // Further enqueues should be ignored using (var scope2 = sub2.AcquireLock()) @@ -89,13 +77,13 @@ public void ErrorTerminatesAllSubQueues() scope2.EnqueueNext("ignored"); } - delivered1.Should().Equal(1); - obs1.Error.Should().NotBeNull(); - delivered2.Should().BeEmpty(); + await Assert.That(delivered1).IsEquivalentTo(new[] { 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(obs1.Error).IsNotNull(); + await Assert.That(delivered2).IsEmpty(); } - [Fact] - public void CompletionDoesNotTerminateParent() + [Test] + public async Task CompletionDoesNotTerminateParent() { var queue = new SharedDeliveryQueue(_gate); var delivered1 = new List(); @@ -111,8 +99,8 @@ public void CompletionDoesNotTerminateParent() scope1.EnqueueCompleted(); } - queue.IsTerminated.Should().BeFalse("completion of one sub-queue should not terminate parent"); - obs1.IsCompleted.Should().BeTrue(); + await Assert.That(queue.IsTerminated).IsFalse(); + await Assert.That(obs1.IsCompleted).IsTrue(); // Other sub-queue should still work using (var scope2 = sub2.AcquireLock()) @@ -120,11 +108,11 @@ public void CompletionDoesNotTerminateParent() scope2.EnqueueNext("still alive"); } - delivered2.Should().Equal("still alive"); + await Assert.That(delivered2).IsEquivalentTo(new[] { "still alive" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void DisposeTerminatesAndWaits() + [Test] + public async Task DisposeTerminatesAndWaits() { var queue = new SharedDeliveryQueue(_gate); var observer = new TestObserver(_ => { }); @@ -137,10 +125,10 @@ public void DisposeTerminatesAndWaits() queue.Dispose(); - queue.IsTerminated.Should().BeTrue(); + await Assert.That(queue.IsTerminated).IsTrue(); } - [Fact] + [Test] public async Task ConcurrentMultiSourceDelivery() { const int threadCount = 4; @@ -165,18 +153,18 @@ public async Task ConcurrentMultiSourceDelivery() await Task.WhenAll(tasks); - delivered.Count.Should().Be(threadCount * itemsPerThread); + await Assert.That(delivered.Count).IsEqualTo(threadCount * itemsPerThread); // Each thread's items should all be present for (var t = 0; t < threadCount; t++) { var threadItems = delivered.Where(s => s.StartsWith($"{t}:")).Count(); - threadItems.Should().Be(itemsPerThread); + await Assert.That(threadItems).IsEqualTo(itemsPerThread); } } - [Fact] - public void ReceiptOrderIsPreservedAcrossSubQueues() + [Test] + public async Task ReceiptOrderIsPreservedAcrossSubQueues() { var queue = new SharedDeliveryQueue(_gate); var delivered = new List(); @@ -201,13 +189,13 @@ public void ReceiptOrderIsPreservedAcrossSubQueues() // Park a drain part-way through, so the notifications below get queued rather than // delivered inline. - var drainer = Task.Run(() => + var drainer = Task.Factory.StartNew(() => { using var scope = sub1.AcquireLock(); scope.EnqueueNext(1); - }); + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); - firstIsDelivering.Wait(TimeSpan.FromSeconds(5)); + await Assert.That(firstIsDelivering.Wait(TimeSpan.FromSeconds(5))).IsTrue(); using (var scope = sub1.AcquireLock()) { @@ -220,13 +208,13 @@ public void ReceiptOrderIsPreservedAcrossSubQueues() } blockFirst.Set(); - drainer.Wait(TimeSpan.FromSeconds(5)); + await Assert.That(drainer.Wait(TimeSpan.FromSeconds(5))).IsTrue(); - delivered.Should().Equal(new[] { "int:1", "int:2", "str:hello" }, "delivery should follow the order the notifications were received, not the order the sub-queues were created"); + await Assert.That(delivered).IsEquivalentTo(new[] { "int:1", "int:2", "str:hello" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void InterleavedSubQueuesDeliverInReceiptOrder() + [Test] + public async Task InterleavedSubQueuesDeliverInReceiptOrder() { var queue = new SharedDeliveryQueue(_gate); var delivered = new List(); @@ -249,13 +237,13 @@ public void InterleavedSubQueuesDeliverInReceiptOrder() lock (delivered) { delivered.Add($"str:{s}"); } })); - var drainer = Task.Run(() => + var drainer = Task.Factory.StartNew(() => { using var scope = sub1.AcquireLock(); scope.EnqueueNext(0); - }); + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); - parked.Wait(TimeSpan.FromSeconds(5)); + await Assert.That(parked.Wait(TimeSpan.FromSeconds(5))).IsTrue(); using (var scope = sub2.AcquireLock()) { @@ -278,13 +266,13 @@ public void InterleavedSubQueuesDeliverInReceiptOrder() } block.Set(); - drainer.Wait(TimeSpan.FromSeconds(5)); + await Assert.That(drainer.Wait(TimeSpan.FromSeconds(5))).IsTrue(); - delivered.Should().Equal("int:0", "str:a", "int:2", "str:b", "int:4"); + await Assert.That(delivered).IsEquivalentTo(new[] { "int:0", "str:a", "int:2", "str:b", "int:4" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void DisposedSubQueueDoesNotDeliverQueuedItems() + [Test] + public async Task DisposedSubQueueDoesNotDeliverQueuedItems() { var queue = new SharedDeliveryQueue(_gate); var delivered = new List(); @@ -307,13 +295,13 @@ public void DisposedSubQueueDoesNotDeliverQueuedItems() lock (delivered) { delivered.Add($"str:{s}"); } })); - var drainer = Task.Run(() => + var drainer = Task.Factory.StartNew(() => { using var scope = sub1.AcquireLock(); scope.EnqueueNext(0); - }); + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); - parked.Wait(TimeSpan.FromSeconds(5)); + await Assert.That(parked.Wait(TimeSpan.FromSeconds(5))).IsTrue(); using (var scope = sub2.AcquireLock()) { @@ -323,9 +311,9 @@ public void DisposedSubQueueDoesNotDeliverQueuedItems() sub2.Dispose(); block.Set(); - drainer.Wait(TimeSpan.FromSeconds(5)); + await Assert.That(drainer.Wait(TimeSpan.FromSeconds(5))).IsTrue(); - delivered.Should().Equal(new[] { "int:0" }, "a disposed sub-queue should not deliver what it had queued"); + await Assert.That(delivered).IsEquivalentTo(new[] { "int:0" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); } private sealed class TestObserver(Action onNext) : IObserver @@ -337,4 +325,4 @@ private sealed class TestObserver(Action onNext) : IObserver public void OnError(Exception error) => Error = error; public void OnCompleted() => IsCompleted = true; } -} \ No newline at end of file +} diff --git a/src/DynamicData.Tests/Internal/SwappableLockFixture.cs b/src/DynamicData.Tests/Internal/SwappableLockFixture.cs index 4b3bd980e..777befaaa 100644 --- a/src/DynamicData.Tests/Internal/SwappableLockFixture.cs +++ b/src/DynamicData.Tests/Internal/SwappableLockFixture.cs @@ -2,134 +2,169 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System; -using System.Threading; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.Internal; public sealed class SwappableLockFixture { #if NET9_0_OR_GREATER - [Fact] - public void CreateAndEnter_AcquiresLock() + [Test] + public async Task CreateAndEnter_AcquiresLock() { var gate = new Lock(); + bool isHeld; - using var swappable = SwappableLock.CreateAndEnter(gate); + using (SwappableLock.CreateAndEnter(gate)) + { + isHeld = gate.IsHeldByCurrentThread; + } - gate.IsHeldByCurrentThread.Should().BeTrue(); + await Assert.That(isHeld).IsTrue(); } - [Fact] - public void Dispose_ReleasesLock() + [Test] + public async Task Dispose_ReleasesLock() { var gate = new Lock(); - var swappable = SwappableLock.CreateAndEnter(gate); + bool isHeld; - swappable.Dispose(); + { + var swappable = SwappableLock.CreateAndEnter(gate); + swappable.Dispose(); + + isHeld = gate.IsHeldByCurrentThread; + } - gate.IsHeldByCurrentThread.Should().BeFalse(); + await Assert.That(isHeld).IsFalse(); } - [Fact] - public void Dispose_IsIdempotent() + [Test] + public async Task Dispose_IsIdempotent() { var gate = new Lock(); - var swappable = SwappableLock.CreateAndEnter(gate); + bool isHeld; - swappable.Dispose(); - swappable.Dispose(); + { + var swappable = SwappableLock.CreateAndEnter(gate); + swappable.Dispose(); + swappable.Dispose(); - gate.IsHeldByCurrentThread.Should().BeFalse(); + isHeld = gate.IsHeldByCurrentThread; + } + + await Assert.That(isHeld).IsFalse(); } - [Fact] - public void SwapTo_AcquiresNewAndReleasesOld() + [Test] + public async Task SwapTo_AcquiresNewAndReleasesOld() { var first = new Lock(); var second = new Lock(); + bool firstIsHeld; + bool secondIsHeld; - using var swappable = SwappableLock.CreateAndEnter(first); - swappable.SwapTo(second); + using (var swappable = SwappableLock.CreateAndEnter(first)) + { + swappable.SwapTo(second); - first.IsHeldByCurrentThread.Should().BeFalse(); - second.IsHeldByCurrentThread.Should().BeTrue(); + firstIsHeld = first.IsHeldByCurrentThread; + secondIsHeld = second.IsHeldByCurrentThread; + } + + await Assert.That(firstIsHeld).IsFalse(); + await Assert.That(secondIsHeld).IsTrue(); } - [Fact] - public void SwapTo_ChainedSwaps() + [Test] + public async Task SwapTo_ChainedSwaps() { var a = new Lock(); var b = new Lock(); var c = new Lock(); + bool aIsHeld; + bool bIsHeld; + bool cIsHeld; - using var swappable = SwappableLock.CreateAndEnter(a); - swappable.SwapTo(b); - swappable.SwapTo(c); + using (var swappable = SwappableLock.CreateAndEnter(a)) + { + swappable.SwapTo(b); + swappable.SwapTo(c); + + aIsHeld = a.IsHeldByCurrentThread; + bIsHeld = b.IsHeldByCurrentThread; + cIsHeld = c.IsHeldByCurrentThread; + } - a.IsHeldByCurrentThread.Should().BeFalse(); - b.IsHeldByCurrentThread.Should().BeFalse(); - c.IsHeldByCurrentThread.Should().BeTrue(); + await Assert.That(aIsHeld).IsFalse(); + await Assert.That(bIsHeld).IsFalse(); + await Assert.That(cIsHeld).IsTrue(); } - [Fact] - public void SwapTo_WithoutCreate_Throws() + [Test] + public async Task SwapTo_WithoutCreate_Throws() { var gate = new Lock(); - var swappable = new SwappableLock(); + var threw = false; try { + var swappable = new SwappableLock(); swappable.SwapTo(gate); - throw new Xunit.Sdk.XunitException("Expected InvalidOperationException"); } catch (InvalidOperationException) { + threw = true; } + + await Assert.That(threw).IsTrue(); } - [Fact] - public void Dispose_AfterSwap_ReleasesSwappedLock() + [Test] + public async Task Dispose_AfterSwap_ReleasesSwappedLock() { var first = new Lock(); var second = new Lock(); + bool firstIsHeld; + bool secondIsHeld; - var swappable = SwappableLock.CreateAndEnter(first); - swappable.SwapTo(second); - swappable.Dispose(); + { + var swappable = SwappableLock.CreateAndEnter(first); + swappable.SwapTo(second); + swappable.Dispose(); + + firstIsHeld = first.IsHeldByCurrentThread; + secondIsHeld = second.IsHeldByCurrentThread; + } - first.IsHeldByCurrentThread.Should().BeFalse(); - second.IsHeldByCurrentThread.Should().BeFalse(); + await Assert.That(firstIsHeld).IsFalse(); + await Assert.That(secondIsHeld).IsFalse(); } #else - [Fact] - public void CreateAndEnter_AcquiresLock() + [Test] + public async Task CreateAndEnter_AcquiresLock() { var gate = new object(); using var swappable = SwappableLock.CreateAndEnter(gate); - Monitor.IsEntered(gate).Should().BeTrue(); + await Assert.That(Monitor.IsEntered(gate)).IsTrue(); } - [Fact] - public void Dispose_ReleasesLock() + [Test] + public async Task Dispose_ReleasesLock() { var gate = new object(); var swappable = SwappableLock.CreateAndEnter(gate); swappable.Dispose(); - Monitor.IsEntered(gate).Should().BeFalse(); + await Assert.That(Monitor.IsEntered(gate)).IsFalse(); } - [Fact] - public void Dispose_IsIdempotent() + [Test] + public async Task Dispose_IsIdempotent() { var gate = new object(); var swappable = SwappableLock.CreateAndEnter(gate); @@ -137,11 +172,11 @@ public void Dispose_IsIdempotent() swappable.Dispose(); swappable.Dispose(); - Monitor.IsEntered(gate).Should().BeFalse(); + await Assert.That(Monitor.IsEntered(gate)).IsFalse(); } - [Fact] - public void SwapTo_AcquiresNewAndReleasesOld() + [Test] + public async Task SwapTo_AcquiresNewAndReleasesOld() { var first = new object(); var second = new object(); @@ -149,12 +184,12 @@ public void SwapTo_AcquiresNewAndReleasesOld() using var swappable = SwappableLock.CreateAndEnter(first); swappable.SwapTo(second); - Monitor.IsEntered(first).Should().BeFalse(); - Monitor.IsEntered(second).Should().BeTrue(); + await Assert.That(Monitor.IsEntered(first)).IsFalse(); + await Assert.That(Monitor.IsEntered(second)).IsTrue(); } - [Fact] - public void SwapTo_ChainedSwaps() + [Test] + public async Task SwapTo_ChainedSwaps() { var a = new object(); var b = new object(); @@ -164,29 +199,22 @@ public void SwapTo_ChainedSwaps() swappable.SwapTo(b); swappable.SwapTo(c); - Monitor.IsEntered(a).Should().BeFalse(); - Monitor.IsEntered(b).Should().BeFalse(); - Monitor.IsEntered(c).Should().BeTrue(); + await Assert.That(Monitor.IsEntered(a)).IsFalse(); + await Assert.That(Monitor.IsEntered(b)).IsFalse(); + await Assert.That(Monitor.IsEntered(c)).IsTrue(); } - [Fact] - public void SwapTo_WithoutCreate_Throws() + [Test] + public async Task SwapTo_WithoutCreate_Throws() { var gate = new object(); var swappable = new SwappableLock(); - try - { - swappable.SwapTo(gate); - throw new Xunit.Sdk.XunitException("Expected InvalidOperationException"); - } - catch (InvalidOperationException) - { - } + await Assert.That(() => swappable.SwapTo(gate)).Throws(); } - [Fact] - public void Dispose_AfterSwap_ReleasesSwappedLock() + [Test] + public async Task Dispose_AfterSwap_ReleasesSwappedLock() { var first = new object(); var second = new object(); @@ -195,19 +223,19 @@ public void Dispose_AfterSwap_ReleasesSwappedLock() swappable.SwapTo(second); swappable.Dispose(); - Monitor.IsEntered(first).Should().BeFalse(); - Monitor.IsEntered(second).Should().BeFalse(); + await Assert.That(Monitor.IsEntered(first)).IsFalse(); + await Assert.That(Monitor.IsEntered(second)).IsFalse(); } - [Fact] - public void SwapTo_SameLock_WorksWithReentrantMonitor() + [Test] + public async Task SwapTo_SameLock_WorksWithReentrantMonitor() { var gate = new object(); using var swappable = SwappableLock.CreateAndEnter(gate); swappable.SwapTo(gate); - Monitor.IsEntered(gate).Should().BeTrue(); + await Assert.That(Monitor.IsEntered(gate)).IsTrue(); } #endif diff --git a/src/DynamicData.Tests/Issues/EmptyToChangeSetIssue.cs b/src/DynamicData.Tests/Issues/EmptyToChangeSetIssue.cs index 1044f5cd2..d3b4873bb 100644 --- a/src/DynamicData.Tests/Issues/EmptyToChangeSetIssue.cs +++ b/src/DynamicData.Tests/Issues/EmptyToChangeSetIssue.cs @@ -1,21 +1,20 @@ -using System.Collections.ObjectModel; -using System.Reactive; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using FluentAssertions; -using Xunit; +#endif namespace DynamicData.Tests.Issues { public class EmptyToChangeSetIssue { - [Fact] - public void EmptyCollectionToChangeSetBehaviour() + [Test] + public async Task EmptyCollectionToChangeSetBehaviour() { var collection = new ObservableCollection(); var results = collection.ToObservableChangeSet().AsAggregator(); - results.Messages.Count.Should() - .BeGreaterThan(0, "An empty collection should still have an update, even if empty."); + await Assert.That(results.Messages.Count).IsGreaterThan(0).Because("An empty collection should still have an update, even if empty."); } } } diff --git a/src/DynamicData.Tests/Issues/OnItemRemovedIssue.cs b/src/DynamicData.Tests/Issues/OnItemRemovedIssue.cs index d257b8abb..4bf085700 100644 --- a/src/DynamicData.Tests/Issues/OnItemRemovedIssue.cs +++ b/src/DynamicData.Tests/Issues/OnItemRemovedIssue.cs @@ -1,8 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using Xunit; +#endif namespace DynamicData.Tests.Issues { @@ -11,8 +11,8 @@ public class OnItemRemovedIssue //Fix for https://github.com/reactivemarbles/DynamicData/issues/268 - [Fact] - public void ListAndCacheShouldHaveEquivalentBehaviour() + [Test] + public async Task ListAndCacheShouldHaveEquivalentBehaviour() { var source = new ObservableCollection { @@ -34,12 +34,12 @@ public void ListAndCacheShouldHaveEquivalentBehaviour() .Bind(out var cacheOutput) .Subscribe(); - Assert.Equal(listOutput, cacheOutput, new ProxyEqualityComparer()); + await Assert.That(cacheOutput).IsEquivalentTo(listOutput, new ProxyEqualityComparer(), TUnit.Assertions.Enums.CollectionOrdering.Matching); list.Dispose(); cache.Dispose(); - Assert.Equal(listOutput, cacheOutput, new ProxyEqualityComparer()); + await Assert.That(cacheOutput).IsEquivalentTo(listOutput, new ProxyEqualityComparer(), TUnit.Assertions.Enums.CollectionOrdering.Matching); } public class Item @@ -53,7 +53,6 @@ public class Proxy public bool? Active { get; set; } - } public class ProxyEqualityComparer : IEqualityComparer diff --git a/src/DynamicData.Tests/Kernal/CacheUpdaterFixture.cs b/src/DynamicData.Tests/Kernal/CacheUpdaterFixture.cs index 438e1bd5f..944ec8c27 100644 --- a/src/DynamicData.Tests/Kernal/CacheUpdaterFixture.cs +++ b/src/DynamicData.Tests/Kernal/CacheUpdaterFixture.cs @@ -1,12 +1,10 @@ -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Kernal; public class CacheUpdaterFixture @@ -21,33 +19,33 @@ public CacheUpdaterFixture() _updater = new CacheUpdater(_cache); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Adult1", 50); _updater.AddOrUpdate(person, "Adult1"); IChangeSet updates = _cache.CaptureChanges(); - _cache.Lookup("Adult1").Value.Should().Be(person); - _cache.Count.Should().Be(1); - updates.Count.Should().Be(1); - updates.First().Should().Be(new Change(ChangeReason.Add, person.Name, person), "Should be 1 updates"); + await Assert.That(_cache.Lookup("Adult1").Value).IsEqualTo(person); + await Assert.That(_cache.Count).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(1); + await Assert.That(updates.First()).IsEqualTo(new Change(ChangeReason.Add, person.Name, person)).Because("Should be 1 updates"); } - [Fact] - public void AttemptedRemovalOfANonExistentKeyWillBeIgnored() + [Test] + public async Task AttemptedRemovalOfANonExistentKeyWillBeIgnored() { const string key = "Adult1"; _updater.Remove(key); IChangeSet updates = _cache.CaptureChanges(); - _cache.Count.Should().Be(0); - updates.Count.Should().Be(0, "Should be 0 updates"); + await Assert.That(_cache.Count).IsEqualTo(0); + await Assert.That(updates.Count).IsEqualTo(0).Because("Should be 0 updates"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; @@ -56,14 +54,14 @@ public void Remove() _updater.Remove(key); IChangeSet updates = _cache.CaptureChanges(); - _cache.Count.Should().Be(0); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(1); - updates.Count(update => update.Reason == ChangeReason.Remove).Should().Be(1); - updates.Count.Should().Be(2); + await Assert.That(_cache.Count).IsEqualTo(0); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(1); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Remove)).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(2); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; @@ -73,10 +71,10 @@ public void Update() _updater.AddOrUpdate(updated, key); IChangeSet updates = _cache.CaptureChanges(); - _cache.Lookup(key).Value.Should().Be(updated); - _cache.Count.Should().Be(1); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(1); - updates.Count(update => update.Reason == ChangeReason.Update).Should().Be(1); - updates.Count.Should().Be(2); + await Assert.That(_cache.Lookup(key).Value).IsEqualTo(updated); + await Assert.That(_cache.Count).IsEqualTo(1); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(1); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Update)).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(2); } } diff --git a/src/DynamicData.Tests/Kernal/DistinctUpdateFixture.cs b/src/DynamicData.Tests/Kernal/DistinctUpdateFixture.cs index e7850ce8b..d2c15dd8d 100644 --- a/src/DynamicData.Tests/Kernal/DistinctUpdateFixture.cs +++ b/src/DynamicData.Tests/Kernal/DistinctUpdateFixture.cs @@ -1,59 +1,52 @@ -using System; - -using DynamicData.Kernel; using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Kernal; public class DistinctUpdateFixture { - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Person", 10); var update = new Change(ChangeReason.Add, person, person); - update.Key.Should().Be(person); - update.Reason.Should().Be(ChangeReason.Add); - update.Current.Should().Be(person); - update.Previous.Should().Be(Optional.None()); + await Assert.That(update.Key).IsEqualTo(person); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(update.Current).IsEqualTo(person); + await Assert.That(update.Previous).IsEqualTo(ReactiveUI.Primitives.Optional.None); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var person = new Person("Person", 10); var update = new Change(ChangeReason.Remove, person, person); - update.Key.Should().Be(person); - update.Reason.Should().Be(ChangeReason.Remove); - update.Current.Should().Be(person); - update.Previous.Should().Be(Optional.None()); + await Assert.That(update.Key).IsEqualTo(person); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(update.Current).IsEqualTo(person); + await Assert.That(update.Previous).IsEqualTo(ReactiveUI.Primitives.Optional.None); } - [Fact] - public void Update() + [Test] + public async Task Update() { var current = new Person("Person", 10); var previous = new Person("Person", 9); var update = new Change(ChangeReason.Update, current, current, previous); - update.Key.Should().Be(current); - update.Reason.Should().Be(ChangeReason.Update); - update.Current.Should().Be(current); - update.Previous.HasValue.Should().BeTrue(); - update.Previous.Value.Should().Be(previous); + await Assert.That(update.Key).IsEqualTo(current); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Update); + await Assert.That(update.Current).IsEqualTo(current); + await Assert.That(update.Previous.HasValue).IsTrue(); + await Assert.That(update.Previous.Value).IsEqualTo(previous); } - [Fact] - public void UpdateWillThrowIfNoPreviousValueIsSupplied() + [Test] + public async Task UpdateWillThrowIfNoPreviousValueIsSupplied() { var current = new Person("Person", 10); - Assert.Throws(() => new Change(ChangeReason.Update, current, current)); + await Assert.That(() => new Change(ChangeReason.Update, current, current)).Throws(); } } diff --git a/src/DynamicData.Tests/Kernal/EnumerableEx.cs b/src/DynamicData.Tests/Kernal/EnumerableEx.cs index 315c392bb..1c837bf55 100644 --- a/src/DynamicData.Tests/Kernal/EnumerableEx.cs +++ b/src/DynamicData.Tests/Kernal/EnumerableEx.cs @@ -1,21 +1,11 @@ -using System; -using System.Collections.Generic; - namespace DynamicData.Tests.Cache; public static class EnumerableEx { public static IEnumerable CurrentNextZip(this IEnumerable source, Func selector) { - if (source is null) - { - throw new ArgumentNullException(nameof(source)); - } - - if (selector is null) - { - throw new ArgumentNullException(nameof(selector)); - } + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(selector); var enumerator = source.GetEnumerator(); if (enumerator.MoveNext()) @@ -35,15 +25,8 @@ public static IEnumerable CurrentNextZip(this IEnumerable PrevCurrentNextZip(this IEnumerable source, Func selector) { - if (source is null) - { - throw new ArgumentNullException(nameof(source)); - } - - if (selector is null) - { - throw new ArgumentNullException(nameof(selector)); - } + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(selector); var enumerator = source.GetEnumerator(); if (enumerator.MoveNext()) @@ -65,15 +48,8 @@ public static IEnumerable PrevCurrentNextZip(this IEnumerab public static IEnumerable PrevCurrentZip(this IEnumerable source, Func selector) { - if (source is null) - { - throw new ArgumentNullException(nameof(source)); - } - - if (selector is null) - { - throw new ArgumentNullException(nameof(selector)); - } + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(selector); var enumerator = source.GetEnumerator(); if (enumerator.MoveNext()) diff --git a/src/DynamicData.Tests/Kernal/KeyValueFixture.cs b/src/DynamicData.Tests/Kernal/KeyValueFixture.cs index ead9fb9da..5ec5d21e2 100644 --- a/src/DynamicData.Tests/Kernal/KeyValueFixture.cs +++ b/src/DynamicData.Tests/Kernal/KeyValueFixture.cs @@ -1,22 +1,16 @@ -using System.Collections.Generic; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Kernal; public class KeyValueFixture { - [Fact] - public void Create() + [Test] + public async Task Create() { var person = new Person("Person", 10); var kv = new KeyValuePair("Person", person); - kv.Key.Should().Be("Person"); - kv.Value.Should().Be(person); + await Assert.That(kv.Key).IsEqualTo("Person"); + await Assert.That(kv.Value).IsEqualTo(person); } } diff --git a/src/DynamicData.Tests/Kernal/OptionFixture.cs b/src/DynamicData.Tests/Kernal/OptionFixture.cs index e93c17e0b..a749bd58e 100644 --- a/src/DynamicData.Tests/Kernal/OptionFixture.cs +++ b/src/DynamicData.Tests/Kernal/OptionFixture.cs @@ -1,88 +1,87 @@ -using System; using System.Globalization; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Kernal; public class OptionFixture { - [Fact] - public void ImplictCastHasValue() + [Test] + public async Task ImplictCastHasValue() { var person = new Person("Name", 20); - Optional option = person; + ReactiveUI.Primitives.Optional option = person; - option.HasValue.Should().BeTrue(); - ReferenceEquals(person, option.Value).Should().BeTrue(); + await Assert.That(option.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(person, option.Value)).IsTrue(); } - [Fact] - public void OptionElseInvokedIfOptionHasNoValue() + [Test] + public async Task OptionElseInvokedIfOptionHasNoValue() { - Optional? source = null; + ReactiveUI.Primitives.Optional? source = null; var ifactioninvoked = false; var elseactioninvoked = false; source.IfHasValue(p => ifactioninvoked = true).Else(() => elseactioninvoked = true); - ifactioninvoked.Should().BeFalse(); - elseactioninvoked.Should().BeTrue(); + await Assert.That(ifactioninvoked).IsFalse(); + await Assert.That(elseactioninvoked).IsTrue(); } - [Fact] - public void OptionIfHasValueInvokedIfOptionHasValue() + [Test] + public async Task OptionIfHasValueInvokedIfOptionHasValue() { - Optional source = new Person("A", 1); + ReactiveUI.Primitives.Optional source = new Person("A", 1); var ifactioninvoked = false; var elseactioninvoked = false; source.IfHasValue(p => ifactioninvoked = true).Else(() => elseactioninvoked = true); - ifactioninvoked.Should().BeTrue(); - elseactioninvoked.Should().BeFalse(); + await Assert.That(ifactioninvoked).IsTrue(); + await Assert.That(elseactioninvoked).IsFalse(); } - [Fact] - public void OptionNoneHasNoValue() + [Test] + public async Task OptionNoneHasNoValue() { - var option = Optional.None>(); - option.HasValue.Should().BeFalse(); + var option = ReactiveUI.Primitives.Optional>.None; + await Assert.That(option.HasValue).IsFalse(); } - [Fact] - public void OptionSetToNullHasNoValue1() + [Test] + public async Task OptionSetToNullHasNoValue1() { - Person? person = null; - var option = Optional.Some(person); - option.HasValue.Should().BeFalse(); + Person person = default!; + var option = ReactiveUI.Primitives.Optional.Some(person); + await Assert.That(option.HasValue).IsFalse(); } - [Fact] - public void OptionSetToNullHasNoValue2() + [Test] + public async Task OptionSetToNullHasNoValue2() { - Person? person = null; - Optional option = person; - option.HasValue.Should().BeFalse(); + Person person = default!; + ReactiveUI.Primitives.Optional option = person; + await Assert.That(option.HasValue).IsFalse(); } - [Fact] - public void OptionSomeHasValue() + [Test] + public async Task OptionSomeHasValue() { var person = new Person("Name", 20); - var option = Optional.Some(person); - option.HasValue.Should().BeTrue(); - ReferenceEquals(person, option.Value).Should().BeTrue(); + var option = ReactiveUI.Primitives.Optional.Some(person); + await Assert.That(option.HasValue).IsTrue(); + await Assert.That(ReferenceEquals(person, option.Value)).IsTrue(); } - [Fact] - public void OptionConvertThrowsIfConverterIsNull() + [Test] + public async Task OptionConvertThrowsIfConverterIsNull() { var caught = false; @@ -90,183 +89,183 @@ public void OptionConvertThrowsIfConverterIsNull() try { - Optional.None().Convert(converter!); + ReactiveUI.Primitives.Optional.None.Convert(converter!); } catch (ArgumentNullException) { caught = true; } - caught.Should().BeTrue(); + await Assert.That(caught).IsTrue(); } - [Fact] - public void OptionConvertToOptionalInvokesConverterWithValue() + [Test] + public async Task OptionConvertToOptionalInvokesConverterWithValue() { - var option = Optional.Some(string.Empty); + var option = ReactiveUI.Primitives.Optional.Some(string.Empty); var invoked = false; - Optional Converter(string input) + ReactiveUI.Primitives.Optional Converter(string input) { invoked = true; - return Optional.Some(input); + return ReactiveUI.Primitives.Optional.Some(input); } var result = option.Convert(Converter); - invoked.Should().BeTrue(); - result.HasValue.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); + await Assert.That(result.HasValue).IsTrue(); } - [Fact] - public void OptionConvertToOptionalInvokesConverterOnlyWithValue() + [Test] + public async Task OptionConvertToOptionalInvokesConverterOnlyWithValue() { - var option = Optional.None(); + var option = ReactiveUI.Primitives.Optional.None; var invoked = false; - Optional Converter(string input) + ReactiveUI.Primitives.Optional Converter(string input) { invoked = true; - return Optional.Some(input); + return ReactiveUI.Primitives.Optional.Some(input); } var result = option.Convert(Converter); - invoked.Should().BeFalse(); - result.HasValue.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); + await Assert.That(result.HasValue).IsFalse(); } - [Fact] - public void OptionConvertToOptionalCanReturnValue() + [Test] + public async Task OptionConvertToOptionalCanReturnValue() { const int TestData = 37; - var option = Optional.Some(TestData.ToString()); + var option = ReactiveUI.Primitives.Optional.Some(TestData.ToString()); var result = option.Convert(ParseInt); - result.HasValue.Should().BeTrue(); - result.Value.Should().Be(TestData); + await Assert.That(result.HasValue).IsTrue(); + await Assert.That(result.Value).IsEqualTo(TestData); } - [Fact] - public void OptionConvertToOptionalCanReturnNone() + [Test] + public async Task OptionConvertToOptionalCanReturnNone() { - var option = Optional.Some("Not An Int"); + var option = ReactiveUI.Primitives.Optional.Some("Not An Int"); var result = option.Convert(ParseInt); - result.HasValue.Should().BeFalse(); + await Assert.That(result.HasValue).IsFalse(); } - [Fact] - public void OptionConvertToOptionalThrowsIfConverterIsNull() + [Test] + public async Task OptionConvertToOptionalThrowsIfConverterIsNull() { var caught = false; - Func>? converter = null; + Func>? converter = null; try { - Optional.None().Convert(converter!); + ReactiveUI.Primitives.Optional.None.Convert(converter!); } catch (ArgumentNullException) { caught = true; } - caught.Should().BeTrue(); + await Assert.That(caught).IsTrue(); } - [Fact] - public void OptionOrElseInvokesWithoutValue() + [Test] + public async Task OptionOrElseInvokesWithoutValue() { - var option = Optional.None(); + var option = ReactiveUI.Primitives.Optional.None; var invoked = false; - Optional Fallback() + ReactiveUI.Primitives.Optional Fallback() { invoked = true; - return Optional.None(); + return ReactiveUI.Primitives.Optional.None; } var result = option.OrElse(Fallback); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); } - [Fact] - public void OptionOrElseInvokesOnlyWithoutValue() + [Test] + public async Task OptionOrElseInvokesOnlyWithoutValue() { - var option = Optional.Some(string.Empty); + var option = ReactiveUI.Primitives.Optional.Some(string.Empty); var invoked = false; - Optional Fallback() + ReactiveUI.Primitives.Optional Fallback() { invoked = true; - return Optional.None(); + return ReactiveUI.Primitives.Optional.None; } var result = option.OrElse(Fallback); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); } - [Fact] - public void OptionOrElseCanReturnValue() + [Test] + public async Task OptionOrElseCanReturnValue() { const string TestString = nameof(TestString); - var option = Optional.None(); + var option = ReactiveUI.Primitives.Optional.None; var result = option.OrElse(() => TestString); - result.HasValue.Should().BeTrue(); - result.Value.Should().Be(TestString); + await Assert.That(result.HasValue).IsTrue(); + await Assert.That(result.Value).IsEqualTo(TestString); } - [Fact] - public void OptionOrElseCanReturnNone() + [Test] + public async Task OptionOrElseCanReturnNone() { - var option = Optional.None(); - var result = option.OrElse(Optional.None); + var option = ReactiveUI.Primitives.Optional.None; + var result = option.OrElse(() => ReactiveUI.Primitives.Optional.None); - result.HasValue.Should().BeFalse(); + await Assert.That(result.HasValue).IsFalse(); } - [Fact] - public void OptionOrElseCanBeChained() + [Test] + public async Task OptionOrElseCanBeChained() { const int Expected = unchecked((int)0xc001d00d); - var option = Optional.None(); - var result = option.OrElse(Optional.None) - .OrElse(() => Optional.Some(Expected.ToString("x"))) + var option = ReactiveUI.Primitives.Optional.None; + var result = option.OrElse(() => ReactiveUI.Primitives.Optional.None) + .OrElse(() => ReactiveUI.Primitives.Optional.Some(Expected.ToString("x"))) .Convert(s => ParseInt(s).OrElse(() => ParseHex(s))); - result.HasValue.Should().BeTrue(); - result.Value.Should().Be(Expected); + await Assert.That(result.HasValue).IsTrue(); + await Assert.That(result.Value).IsEqualTo(Expected); } - [Fact] - public void OptionOrElseThrowsIfFallbackIsNull() + [Test] + public async Task OptionOrElseThrowsIfFallbackIsNull() { var caught = false; try { - Optional.None().OrElse(null!); + ReactiveUI.Primitives.Optional.None.OrElse(null!); } - catch(ArgumentNullException) + catch (ArgumentNullException) { caught = true; } - caught.Should().BeTrue(); + await Assert.That(caught).IsTrue(); } - private static Optional ParseInt(string input) => - int.TryParse(input, out var result) ? Optional.Some(result) : Optional.None(); + private static ReactiveUI.Primitives.Optional ParseInt(string input) => + int.TryParse(input, out var result) ? ReactiveUI.Primitives.Optional.Some(result) : ReactiveUI.Primitives.Optional.None; - private static Optional ParseHex(string input) => - int.TryParse(input, NumberStyles.HexNumber, null, out var result) ? Optional.Some(result) : Optional.None(); + private static ReactiveUI.Primitives.Optional ParseHex(string input) => + int.TryParse(input, NumberStyles.HexNumber, null, out var result) ? ReactiveUI.Primitives.Optional.Some(result) : ReactiveUI.Primitives.Optional.None; } diff --git a/src/DynamicData.Tests/Kernal/OptionObservableFixture.cs b/src/DynamicData.Tests/Kernal/OptionObservableFixture.cs index 06095bc20..c4c5cb098 100644 --- a/src/DynamicData.Tests/Kernal/OptionObservableFixture.cs +++ b/src/DynamicData.Tests/Kernal/OptionObservableFixture.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.Kernal; @@ -15,29 +11,29 @@ public class OptionObservableFixture private const int NoneCount = 5; private const int SomeCount = 10; - private static Optional NotConvertableToInt { get; } = Optional.Some("NOT AN INT"); + private static ReactiveUI.Primitives.Optional NotConvertableToInt { get; } = ReactiveUI.Primitives.Optional.Some("NOT AN INT"); private static IEnumerable IntEnum { get; } = Enumerable.Range(0, SomeCount); private static IEnumerable StringEnum { get; } = IntEnum.Select(n => n.ToString()); - private static IEnumerable> OptIntEnum { get; } = IntEnum.Select(i => Optional.Some(i)); - private static IEnumerable> OptNoneIntEnum { get; } = Enumerable.Repeat(Optional.None(), NoneCount); - private static IEnumerable> OptNoneStringEnum { get; } = Enumerable.Repeat(Optional.None(), NoneCount); - private static IEnumerable> OptStringEnum { get; } = StringEnum.Select(str => Optional.Some(str)); - private static IEnumerable> OptStringWithNoneEnum { get; } = OptNoneStringEnum.Concat(OptStringEnum); - private static IEnumerable> OptStringWithBadEnum { get; } = OptStringEnum.Prepend(NotConvertableToInt); - private static IEnumerable> OptStringWithBadAndNoneEnum { get; } = OptStringWithNoneEnum.Prepend(NotConvertableToInt); - - [Fact] - public void NullChecks() + private static IEnumerable> OptIntEnum { get; } = IntEnum.Select(i => ReactiveUI.Primitives.Optional.Some(i)); + private static IEnumerable> OptNoneIntEnum { get; } = Enumerable.Repeat(ReactiveUI.Primitives.Optional.None, NoneCount); + private static IEnumerable> OptNoneStringEnum { get; } = Enumerable.Repeat(ReactiveUI.Primitives.Optional.None, NoneCount); + private static IEnumerable> OptStringEnum { get; } = StringEnum.Select(str => ReactiveUI.Primitives.Optional.Some(str)); + private static IEnumerable> OptStringWithNoneEnum { get; } = OptNoneStringEnum.Concat(OptStringEnum); + private static IEnumerable> OptStringWithBadEnum { get; } = OptStringEnum.Prepend(NotConvertableToInt); + private static IEnumerable> OptStringWithBadAndNoneEnum { get; } = OptStringWithNoneEnum.Prepend(NotConvertableToInt); + + [Test] + public async Task NullChecks() { // having - var neverObservable = Observable.Never>(); - var nullObservable = (IObservable>)null!; + var neverObservable = Observable.Never>(); + var nullObservable = (IObservable>)null!; var nullConverter = (Func)null!; - var nullOptionalConverter = (Func>)null!; + var nullOptionalConverter = (Func>)null!; var converter = (Func)(i => i); var nullFallback = (Func)null!; var nullConvertFallback = (Func)null!; - var nullOptionalFallback = (Func>)null!; + var nullOptionalFallback = (Func>)null!; var action = (Action)null!; var actionVal = (Action)null!; var nullExceptionGenerator = (Func)null!; @@ -63,28 +59,28 @@ public void NullChecks() var valueOrThrow2 = () => neverObservable.ValueOrThrow(nullExceptionGenerator); // then - convert1.Should().Throw(); - convert2.Should().Throw(); - convertOpt1.Should().Throw(); - convertOpt2.Should().Throw(); - convertOr1.Should().Throw(); - convertOr2.Should().Throw(); - convertOr3.Should().Throw(); - orElse1.Should().Throw(); - orElse2.Should().Throw(); - onHasValue.Should().Throw(); - onHasValue2.Should().Throw(); - onHasNoValue.Should().Throw(); - onHasNoValue2.Should().Throw(); - selectValues.Should().Throw(); - valueOr.Should().Throw(); - valueOrDefault.Should().Throw(); - valueOrThrow1.Should().Throw(); - valueOrThrow2.Should().Throw(); + await Assert.That(convert1).Throws(); + await Assert.That(convert2).Throws(); + await Assert.That(convertOpt1).Throws(); + await Assert.That(convertOpt2).Throws(); + await Assert.That(convertOr1).Throws(); + await Assert.That(convertOr2).Throws(); + await Assert.That(convertOr3).Throws(); + await Assert.That(orElse1).Throws(); + await Assert.That(orElse2).Throws(); + await Assert.That(onHasValue).Throws(); + await Assert.That(onHasValue2).Throws(); + await Assert.That(onHasNoValue).Throws(); + await Assert.That(onHasNoValue2).Throws(); + await Assert.That(selectValues).Throws(); + await Assert.That(valueOr).Throws(); + await Assert.That(valueOrDefault).Throws(); + await Assert.That(valueOrThrow1).Throws(); + await Assert.That(valueOrThrow2).Throws(); } - [Fact] - public void ConvertWillConvertValues() + [Test] + public async Task ConvertWillConvertValues() { // having var observable = OptStringEnum.ToObservable(); @@ -94,12 +90,12 @@ public void ConvertWillConvertValues() var intList = OptIntEnum.ToList(); // then - results.Should().BeSubsetOf(intList); - intList.Should().BeSubsetOf(results); + await Assert.That(new HashSet>(results).IsSubsetOf(intList)).IsTrue(); + await Assert.That(new HashSet>(intList).IsSubsetOf(results)).IsTrue(); } - [Fact] - public void ConvertPreservesNone() + [Test] + public async Task ConvertPreservesNone() { // having var enumerable = OptStringWithNoneEnum; @@ -110,12 +106,12 @@ public void ConvertPreservesNone() var expected = enumerable.Where(opt => !opt.HasValue).Count(); // then - results.Should().Be(expected); - results.Should().Be(NoneCount); + await Assert.That(results).IsEqualTo(expected); + await Assert.That(results).IsEqualTo(NoneCount); } - [Fact] - public void ConvertOptionalWillConvertValues() + [Test] + public async Task ConvertOptionalWillConvertValues() { // having var observable = OptStringWithBadEnum.ToObservable(); @@ -125,12 +121,12 @@ public void ConvertOptionalWillConvertValues() var intList = OptIntEnum.ToList(); // then - intList.Should().BeSubsetOf(results); - results.Should().Contain(Optional.None()); + await Assert.That(new HashSet>(intList).IsSubsetOf(results)).IsTrue(); + await Assert.That(results).Contains(ReactiveUI.Primitives.Optional.None); } - [Fact] - public void ConvertOptionalPreservesNone() + [Test] + public async Task ConvertOptionalPreservesNone() { // having var enumerable = OptStringWithBadAndNoneEnum; @@ -141,12 +137,12 @@ public void ConvertOptionalPreservesNone() var expected = OptStringWithNoneEnum.Where(opt => !opt.HasValue).Count() + 1; // then - results.Should().Be(expected); - results.Should().BeGreaterThan(1); + await Assert.That(results).IsEqualTo(expected); + await Assert.That(results).IsGreaterThan(1); } - [Fact] - public void ConvertOrConvertsOrFallsback() + [Test] + public async Task ConvertOrConvertsOrFallsback() { // having var observable = OptStringWithNoneEnum.ToObservable(); @@ -156,27 +152,27 @@ public void ConvertOrConvertsOrFallsback() var intList = IntEnum.Prepend(-1); // then - results.Should().BeSubsetOf(intList); - intList.Should().BeSubsetOf(results); + await Assert.That(new HashSet(results).IsSubsetOf(intList)).IsTrue(); + await Assert.That(new HashSet(intList).IsSubsetOf(results)).IsTrue(); } - [Fact] - public void OrElseFallsback() + [Test] + public async Task OrElseFallsback() { // having - var observable = OptIntEnum.ToObservable().StartWith(Optional.None()); + var observable = OptIntEnum.ToObservable().StartWith(ReactiveUI.Primitives.Optional.None); // when var results = observable.OrElse(() => -1).ToEnumerable(); var intList = OptIntEnum.Prepend(-1); // then - results.Should().BeSubsetOf(intList); - intList.Should().BeSubsetOf(results); + await Assert.That(new HashSet>(results).IsSubsetOf(intList)).IsTrue(); + await Assert.That(new HashSet>(intList).IsSubsetOf(results)).IsTrue(); } - [Fact] - public void OnHasValueInvokesCorrectAction() + [Test] + public async Task OnHasValueInvokesCorrectAction() { // having int value = 0; @@ -189,12 +185,12 @@ public void OnHasValueInvokesCorrectAction() var results = observable.ToEnumerable().ToList(); // then - value.Should().Be(SomeCount); - noValue.Should().Be(NoneCount); + await Assert.That(value).IsEqualTo(SomeCount); + await Assert.That(noValue).IsEqualTo(NoneCount); } - [Fact] - public void OnHasNoValueInvokesCorrectAction() + [Test] + public async Task OnHasNoValueInvokesCorrectAction() { // having int value = 0; @@ -207,12 +203,12 @@ public void OnHasNoValueInvokesCorrectAction() var results = observable.ToEnumerable().ToList(); // then - value.Should().Be(SomeCount); - noValue.Should().Be(NoneCount); + await Assert.That(value).IsEqualTo(SomeCount); + await Assert.That(noValue).IsEqualTo(NoneCount); } - [Fact] - public void SelectValuesReturnsTheValues() + [Test] + public async Task SelectValuesReturnsTheValues() { // having var enumerable = OptIntEnum.Concat(OptNoneIntEnum); @@ -223,12 +219,12 @@ public void SelectValuesReturnsTheValues() var results = observable.ToEnumerable().Count(); // then - expected.Should().Be(results); - results.Should().Be(SomeCount); + await Assert.That(expected).IsEqualTo(results); + await Assert.That(results).IsEqualTo(SomeCount); } - [Fact] - public void ValueOrInvokesSelector() + [Test] + public async Task ValueOrInvokesSelector() { // having int invokeCount = 0; @@ -241,13 +237,13 @@ public void ValueOrInvokesSelector() var results = observable.ToEnumerable().Where(i => i.Equals(-1)).Count(); // then - expected.Should().Be(results); - results.Should().Be(NoneCount); - invokeCount.Should().Be(NoneCount); + await Assert.That(expected).IsEqualTo(results); + await Assert.That(results).IsEqualTo(NoneCount); + await Assert.That(invokeCount).IsEqualTo(NoneCount); } - [Fact] - public void ValueOrDefaultReturnsDefaultValues() + [Test] + public async Task ValueOrDefaultReturnsDefaultValues() { // having var enumerable = OptStringWithNoneEnum; @@ -258,12 +254,12 @@ public void ValueOrDefaultReturnsDefaultValues() var results = observable.ToEnumerable().Where(str => str == default).Count(); // then - expected.Should().Be(results); - results.Should().Be(NoneCount); + await Assert.That(expected).IsEqualTo(results); + await Assert.That(results).IsEqualTo(NoneCount); } - [Fact] - public void ValueOrThrowFailsWithGeneratedError() + [Test] + public async Task ValueOrThrowFailsWithGeneratedError() { // having var expectedError = new Exception("Nope"); @@ -276,11 +272,11 @@ public void ValueOrThrowFailsWithGeneratedError() using var cleanup = observable.Subscribe(_ => { }, err => receivedError = err); // then - receivedError.Should().Be(expectedError); + await Assert.That(receivedError).IsEqualTo(expectedError); } - private static Optional ParseIntOpt(string input) => - int.TryParse(input, out var result) ? Optional.Some(result) : Optional.None(); + private static ReactiveUI.Primitives.Optional ParseIntOpt(string input) => + int.TryParse(input, out var result) ? ReactiveUI.Primitives.Optional.Some(result) : ReactiveUI.Primitives.Optional.None; private static int ParseInt(string input) => int.Parse(input); } diff --git a/src/DynamicData.Tests/Kernal/SourceUpdaterFixture.cs b/src/DynamicData.Tests/Kernal/SourceUpdaterFixture.cs index 45c6f965e..cb2b1cd63 100644 --- a/src/DynamicData.Tests/Kernal/SourceUpdaterFixture.cs +++ b/src/DynamicData.Tests/Kernal/SourceUpdaterFixture.cs @@ -1,12 +1,10 @@ -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Kernal; public class SourceUpdaterFixture @@ -21,75 +19,75 @@ public SourceUpdaterFixture() _updater = new CacheUpdater(_cache, p => p.Name); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Adult1", 50); _updater.AddOrUpdate(person); IChangeSet updates = _cache.CaptureChanges(); - _cache.Lookup("Adult1").Value.Should().Be(person); - _cache.Count.Should().Be(1); - updates.Count.Should().Be(1); - updates.First().Should().Be(new Change(ChangeReason.Add, person.Name, person), "Should be 1 updates"); + await Assert.That(_cache.Lookup("Adult1").Value).IsEqualTo(person); + await Assert.That(_cache.Count).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(1); + await Assert.That(updates.First()).IsEqualTo(new Change(ChangeReason.Add, person.Name, person)).Because("Should be 1 updates"); } - [Fact] - public void AttemptedRemovalOfANonExistentKeyWillBeIgnored() + [Test] + public async Task AttemptedRemovalOfANonExistentKeyWillBeIgnored() { const string key = "Adult1"; _updater.Remove(key); IChangeSet updates = _cache.CaptureChanges(); - _cache.Count.Should().Be(0); - updates.Count.Should().Be(0, "Should be 0 updates"); + await Assert.That(_cache.Count).IsEqualTo(0); + await Assert.That(updates.Count).IsEqualTo(0).Because("Should be 0 updates"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _updater.AddOrUpdate(people); var updates = _cache.CaptureChanges(); - _cache.Items.ToArray().Should().BeEquivalentTo(people); - _cache.Count.Should().Be(100); - updates.Adds.Should().Be(100); - updates.Count.Should().Be(100); + await Assert.That(_cache.Items.ToArray()).IsEquivalentTo(people); + await Assert.That(_cache.Count).IsEqualTo(100); + await Assert.That(updates.Adds).IsEqualTo(100); + await Assert.That(updates.Count).IsEqualTo(100); } - [Fact] - public void BatchRemoves() + [Test] + public async Task BatchRemoves() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _updater.AddOrUpdate(people); _updater.Remove(people); IChangeSet updates = _cache.CaptureChanges(); - _cache.Count.Should().Be(0, "Everything should be removed"); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(100); - updates.Count(update => update.Reason == ChangeReason.Remove).Should().Be(100); - updates.Count.Should().Be(200); + await Assert.That(_cache.Count).IsEqualTo(0).Because("Everything should be removed"); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(100); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Remove)).IsEqualTo(100); + await Assert.That(updates.Count).IsEqualTo(200); } - [Fact] - public void BatchSuccessiveUpdates() + [Test] + public async Task BatchSuccessiveUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name1", i)).ToArray(); _updater.AddOrUpdate(people); IChangeSet updates = _cache.CaptureChanges(); - _cache.Lookup("Name1").Value.Age.Should().Be(100); - _cache.Count.Should().Be(1, "Successive updates should replace cache value"); - updates.Count(update => update.Reason == ChangeReason.Update).Should().Be(99); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(1); - updates.Count.Should().Be(100); + await Assert.That(_cache.Lookup("Name1").Value.Age).IsEqualTo(100); + await Assert.That(_cache.Count).IsEqualTo(1).Because("Successive updates should replace cache value"); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Update)).IsEqualTo(99); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(100); } - [Fact] - public void CanRemove() + [Test] + public async Task CanRemove() { const string key = "Adult1"; @@ -98,14 +96,14 @@ public void CanRemove() _updater.Remove(person); IChangeSet updates = _cache.CaptureChanges(); - _cache.Count.Should().Be(0); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(1); - updates.Count(update => update.Reason == ChangeReason.Remove).Should().Be(1); - updates.Count.Should().Be(2); + await Assert.That(_cache.Count).IsEqualTo(0); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(1); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Remove)).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(2); } - [Fact] - public void CanUpdate() + [Test] + public async Task CanUpdate() { const string key = "Adult1"; @@ -115,29 +113,29 @@ public void CanUpdate() _updater.AddOrUpdate(updated); IChangeSet updates = _cache.CaptureChanges(); - _cache.Lookup(key).Value.Should().Be(updated); - _cache.Count.Should().Be(1); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(1); - updates.Count(update => update.Reason == ChangeReason.Update).Should().Be(1); - updates.Count.Should().Be(2); + await Assert.That(_cache.Lookup(key).Value).IsEqualTo(updated); + await Assert.That(_cache.Count).IsEqualTo(1); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(1); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Update)).IsEqualTo(1); + await Assert.That(updates.Count).IsEqualTo(2); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _updater.AddOrUpdate(people); _updater.Clear(); IChangeSet updates = _cache.CaptureChanges(); - _cache.Count.Should().Be(0, "Everything should be removed"); - updates.Count(update => update.Reason == ChangeReason.Add).Should().Be(100); - updates.Count(update => update.Reason == ChangeReason.Remove).Should().Be(100); - updates.Count.Should().Be(200); + await Assert.That(_cache.Count).IsEqualTo(0).Because("Everything should be removed"); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Add)).IsEqualTo(100); + await Assert.That(updates.Count(update => update.Reason == ChangeReason.Remove)).IsEqualTo(100); + await Assert.That(updates.Count).IsEqualTo(200); } - [Fact] - public void NullSelectorWillThrow() + [Test] + public async Task NullSelectorWillThrow() { // Assert.Throws(() => new SourceUpdater(_cache, new KeySelector(null))); } diff --git a/src/DynamicData.Tests/Kernal/UpdateFixture.cs b/src/DynamicData.Tests/Kernal/UpdateFixture.cs index 3431a2b9a..f12aea109 100644 --- a/src/DynamicData.Tests/Kernal/UpdateFixture.cs +++ b/src/DynamicData.Tests/Kernal/UpdateFixture.cs @@ -1,58 +1,51 @@ -using System; - -using DynamicData.Kernel; using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.Kernal; public class UpdateFixture { - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Person", 10); var update = new Change(ChangeReason.Add, "Person", person); - update.Key.Should().Be("Person"); - update.Reason.Should().Be(ChangeReason.Add); - update.Current.Should().Be(person); - update.Previous.Should().Be(Optional.None()); + await Assert.That(update.Key).IsEqualTo("Person"); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Add); + await Assert.That(update.Current).IsEqualTo(person); + await Assert.That(update.Previous).IsEqualTo(ReactiveUI.Primitives.Optional.None); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var person = new Person("Person", 10); var update = new Change(ChangeReason.Remove, "Person", person); - update.Key.Should().Be("Person"); - update.Reason.Should().Be(ChangeReason.Remove); - update.Current.Should().Be(person); - update.Previous.Should().Be(Optional.None()); + await Assert.That(update.Key).IsEqualTo("Person"); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Remove); + await Assert.That(update.Current).IsEqualTo(person); + await Assert.That(update.Previous).IsEqualTo(ReactiveUI.Primitives.Optional.None); } - [Fact] - public void Update() + [Test] + public async Task Update() { var current = new Person("Person", 10); var previous = new Person("Person", 9); var update = new Change(ChangeReason.Update, "Person", current, previous); - update.Key.Should().Be("Person"); - update.Reason.Should().Be(ChangeReason.Update); - update.Current.Should().Be(current); - update.Previous.HasValue.Should().BeTrue(); - update.Previous.Value.Should().Be(previous); + await Assert.That(update.Key).IsEqualTo("Person"); + await Assert.That(update.Reason).IsEqualTo(ChangeReason.Update); + await Assert.That(update.Current).IsEqualTo(current); + await Assert.That(update.Previous.HasValue).IsTrue(); + await Assert.That(update.Previous.Value).IsEqualTo(previous); } - [Fact] - public void UpdateWillThrowIfNoPreviousValueIsSupplied() + [Test] + public async Task UpdateWillThrowIfNoPreviousValueIsSupplied() { var current = new Person("Person", 10); - Assert.Throws(() => new Change(ChangeReason.Update, "Person", current)); + await Assert.That(() => new Change(ChangeReason.Update, "Person", current)).Throws(); } } diff --git a/src/DynamicData.Tests/List/AndFixture.cs b/src/DynamicData.Tests/List/AndFixture.cs index 1d18596ad..0087f74c1 100644 --- a/src/DynamicData.Tests/List/AndFixture.cs +++ b/src/DynamicData.Tests/List/AndFixture.cs @@ -1,18 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; +[InheritsTests] public class AndFixture : AndFixtureBase { - protected override IObservable> CreateObservable() => _source1.Connect().And(_source2.Connect()); + protected override IObservable> CreateObservable() => ObservableListEx.And(_source1.Connect(), _source2.Connect()); } +[InheritsTests] public class AndCollectionFixture : AndFixtureBase { protected override IObservable> CreateObservable() @@ -38,22 +32,22 @@ protected AndFixtureBase() _results = CreateObservable().AsAggregator(); } - [Fact] - public void ClearOneClearsResult() + [Test] + public async Task ClearOneClearsResult() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(1, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source1.AddRange(Enumerable.Range(1, 10)); _source2.AddRange(Enumerable.Range(6, 10)); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(6, 5)); } public void Dispose() @@ -63,37 +57,37 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void ExcludedWhenItemIsInOneSource() + [Test] + public async Task ExcludedWhenItemIsInOneSource() { _source1.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void IncludedWhenItemIsInTwoSources() + [Test] + public async Task IncludedWhenItemIsInTwoSources() { _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void RemovedWhenNoLongerInBoth() + [Test] + public async Task RemovedWhenNoLongerInBoth() { _source1.Add(1); _source2.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void StartingWithNonEmptySourceProducesNoResult() + [Test] + public async Task StartingWithNonEmptySourceProducesNoResult() { _source1.Add(1); using var result = CreateObservable().AsAggregator(); - result.Data.Count.Should().Be(0); + await Assert.That(result.Data.Count).IsEqualTo(0); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/List/AutoRefreshFixture.cs b/src/DynamicData.Tests/List/AutoRefreshFixture.cs index e6e88aa72..72303d906 100644 --- a/src/DynamicData.Tests/List/AutoRefreshFixture.cs +++ b/src/DynamicData.Tests/List/AutoRefreshFixture.cs @@ -1,22 +1,21 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class AutoRefreshFixture { - [Fact] - public void AutoRefresh() + [Test] + public async Task AutoRefresh() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, 1)).ToArray(); @@ -25,34 +24,34 @@ public void AutoRefresh() using var results = list.Connect().AutoRefresh(p => p.Age).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(1); items[0].Age = 10; - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(2); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(2); - results.Messages[1].First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(results.Messages[1].First().Reason).IsEqualTo(ListChangeReason.Refresh); //remove an item and check no change is fired var toRemove = items[1]; list.Remove(toRemove); - results.Data.Count.Should().Be(99); - results.Messages.Count.Should().Be(3); + await Assert.That(results.Data.Count).IsEqualTo(99); + await Assert.That(results.Messages.Count).IsEqualTo(3); toRemove.Age = 100; - results.Messages.Count.Should().Be(3); + await Assert.That(results.Messages.Count).IsEqualTo(3); //add it back in and check it updates list.Add(toRemove); - results.Messages.Count.Should().Be(4); + await Assert.That(results.Messages.Count).IsEqualTo(4); toRemove.Age = 101; - results.Messages.Count.Should().Be(5); + await Assert.That(results.Messages.Count).IsEqualTo(5); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Refresh); } - [Fact] - public void AutoRefreshBatched() + [Test] + public async Task AutoRefreshBatched() { var scheduler = new TestScheduler(); @@ -63,8 +62,8 @@ public void AutoRefreshBatched() using var results = list.Connect().AutoRefresh(p => p.Age, TimeSpan.FromSeconds(1), scheduler: scheduler).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(1); //update 50 records items.Skip(50).ForEach(p => p.Age += 1); @@ -72,12 +71,12 @@ public void AutoRefreshBatched() scheduler.AdvanceBy(TimeSpan.FromSeconds(1).Ticks); //should be another message with 50 refreshes - results.Messages.Count.Should().Be(2); - results.Messages[1].Refreshes.Should().Be(50); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Refreshes).IsEqualTo(50); } - [Fact] - public void AutoRefreshDistinct() + [Test] + public async Task AutoRefreshDistinct() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); @@ -86,19 +85,19 @@ public void AutoRefreshDistinct() using var results = list.Connect().AutoRefresh(p => p.Age).DistinctValues(p => p.Age / 10).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(11); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(11); + await Assert.That(results.Messages.Count).IsEqualTo(1); //update an item which did not match the filter and does so after change items[50].Age = 500; - results.Data.Count.Should().Be(12); + await Assert.That(results.Data.Count).IsEqualTo(12); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Add); - results.Messages.Last().First().Item.Current.Should().Be(50); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Add); + await Assert.That(results.Messages.Last().First().Item.Current).IsEqualTo(50); } - [Fact] - public void AutoRefreshFilter() + [Test] + public async Task AutoRefreshFilter() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); @@ -107,84 +106,84 @@ public void AutoRefreshFilter() using var results = list.Connect().AutoRefresh(p => p.Age).Filter(p => p.Age > 50).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(50); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(50); + await Assert.That(results.Messages.Count).IsEqualTo(1); //update an item which did not match the filter and does so after change items[0].Age = 60; - results.Data.Count.Should().Be(51); - results.Messages.Count.Should().Be(2); - results.Messages[1].First().Reason.Should().Be(ListChangeReason.Add); + await Assert.That(results.Data.Count).IsEqualTo(51); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].First().Reason).IsEqualTo(ListChangeReason.Add); //check for removes items[0].Age = 21; - results.Data.Count.Should().Be(50); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Remove); + await Assert.That(results.Data.Count).IsEqualTo(50); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Remove); items[0].Age = 60; //update an item which matched the filter and still does [refresh should have propagated] items[60].Age = 160; - results.Data.Count.Should().Be(51); - results.Messages.Count.Should().Be(5); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(results.Data.Count).IsEqualTo(51); + await Assert.That(results.Messages.Count).IsEqualTo(5); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Refresh); //remove an item and check no change is fired var toRemove = items[65]; list.Remove(toRemove); - results.Data.Count.Should().Be(50); - results.Messages.Count.Should().Be(6); + await Assert.That(results.Data.Count).IsEqualTo(50); + await Assert.That(results.Messages.Count).IsEqualTo(6); toRemove.Age = 100; - results.Messages.Count.Should().Be(6); + await Assert.That(results.Messages.Count).IsEqualTo(6); //add it back in and check it updates list.Add(toRemove); - results.Messages.Count.Should().Be(7); + await Assert.That(results.Messages.Count).IsEqualTo(7); toRemove.Age = 101; - results.Messages.Count.Should().Be(8); + await Assert.That(results.Messages.Count).IsEqualTo(8); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Refresh); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Refresh); } - [Fact] - public void AutoRefreshGroup() + [Test] + public async Task AutoRefreshGroup() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); //result should only be true when all items are set to true using var list = new SourceList(); using var results = list.Connect().AutoRefresh(p => p.Age).GroupOn(p => p.Age % 10).AsAggregator(); - void CheckContent() + async Task CheckContent() { foreach (var grouping in items.GroupBy(p => p.Age % 10)) { var childGroup = results.Data.Items.Single(g => g.GroupKey == grouping.Key); var expected = grouping.OrderBy(p => p.Name); var actual = childGroup.List.Items.OrderBy(p => p.Name); - actual.Should().BeEquivalentTo(expected); + await Assert.That(actual).IsEquivalentTo(expected); } } list.AddRange(items); - results.Data.Count.Should().Be(10); - results.Messages.Count.Should().Be(1); - CheckContent(); + await Assert.That(results.Data.Count).IsEqualTo(10); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await CheckContent(); //move person from group 1 to 2 items[0].Age = items[0].Age + 1; - CheckContent(); + await CheckContent(); //change the value and move to a grouping which does not yet exist items[1].Age = -1; - results.Data.Count.Should().Be(11); - results.Data.Items[^1].GroupKey.Should().Be(-1); - results.Data.Items[^1].List.Count.Should().Be(1); - results.Data.Items[0].List.Count.Should().Be(9); - CheckContent(); + await Assert.That(results.Data.Count).IsEqualTo(11); + await Assert.That(results.Data.Items[^1].GroupKey).IsEqualTo(-1); + await Assert.That(results.Data.Items[^1].List.Count).IsEqualTo(1); + await Assert.That(results.Data.Items[0].List.Count).IsEqualTo(9); + await CheckContent(); //put the value back where it was and check the group was removed items[1].Age = 1; - results.Data.Count.Should().Be(10); - CheckContent(); + await Assert.That(results.Data.Count).IsEqualTo(10); + await CheckContent(); var groupOf3 = results.Data.Items.ElementAt(2); @@ -193,63 +192,63 @@ void CheckContent() //refresh an item which makes it belong to the same group - should then propagate a refresh items[2].Age = 13; - changes.Should().NotBeNull(); - changes!.Count.Should().Be(1); - changes!.First().Reason.Should().Be(ListChangeReason.Replace); - changes!.First().Item.Current.Should().BeSameAs(items[2]); + await Assert.That(changes).IsNotNull(); + await Assert.That(changes!.Count).IsEqualTo(1); + await Assert.That(changes!.First().Reason).IsEqualTo(ListChangeReason.Replace); + await Assert.That(changes!.First().Item.Current).IsSameReferenceAs(items[2]); } - [Fact] - public void AutoRefreshGroupImmutable() + [Test] + public async Task AutoRefreshGroupImmutable() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); //result should only be true when all items are set to true using var list = new SourceList(); using var results = list.Connect().AutoRefresh(p => p.Age).GroupWithImmutableState(p => p.Age % 10).AsAggregator(); - void CheckContent() + async Task CheckContent() { foreach (var grouping in items.GroupBy(p => p.Age % 10)) { var childGroup = results.Data.Items.Single(g => g.Key == grouping.Key); var expected = grouping.OrderBy(p => p.Name); var actual = childGroup.Items.OrderBy(p => p.Name); - actual.Should().BeEquivalentTo(expected); + await Assert.That(actual).IsEquivalentTo(expected); } } list.AddRange(items); - results.Data.Count.Should().Be(10); - results.Messages.Count.Should().Be(1); - CheckContent(); + await Assert.That(results.Data.Count).IsEqualTo(10); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await CheckContent(); //move person from group 1 to 2 items[0].Age = items[0].Age + 1; - CheckContent(); + await CheckContent(); //change the value and move to a grouping which does not yet exist items[1].Age = -1; - results.Data.Count.Should().Be(11); - results.Data.Items[^1].Key.Should().Be(-1); - results.Data.Items[^1].Count.Should().Be(1); - results.Data.Items[0].Count.Should().Be(9); - CheckContent(); + await Assert.That(results.Data.Count).IsEqualTo(11); + await Assert.That(results.Data.Items[^1].Key).IsEqualTo(-1); + await Assert.That(results.Data.Items[^1].Count).IsEqualTo(1); + await Assert.That(results.Data.Items[0].Count).IsEqualTo(9); + await CheckContent(); //put the value back where it was and check the group was removed items[1].Age = 1; - results.Data.Count.Should().Be(10); - results.Messages.Count.Should().Be(4); - CheckContent(); + await Assert.That(results.Data.Count).IsEqualTo(10); + await Assert.That(results.Messages.Count).IsEqualTo(4); + await CheckContent(); //refresh an item which makes it belong to the same group - should then propagate a refresh items[2].Age = 13; - CheckContent(); + await CheckContent(); - results.Messages.Count.Should().Be(5); + await Assert.That(results.Messages.Count).IsEqualTo(5); } - [Fact] - public void AutoRefreshSelected() + [Test] + public async Task AutoRefreshSelected() { //test added as v6 broke unit test in DynamicData.Snippets var initialItems = Enumerable.Range(1, 10).Select(i => new SelectableItem(i)).ToArray(); @@ -258,21 +257,21 @@ public void AutoRefreshSelected() using var sourceList = new SourceList(); using var sut = sourceList.Connect().AutoRefresh().Filter(si => si.IsSelected).AsObservableList(); sourceList.AddRange(initialItems); - sut.Count.Should().Be(0); + await Assert.That(sut.Count).IsEqualTo(0); initialItems[0].IsSelected = true; - sut.Count.Should().Be(1); + await Assert.That(sut.Count).IsEqualTo(1); initialItems[1].IsSelected = true; - sut.Count.Should().Be(2); + await Assert.That(sut.Count).IsEqualTo(2); //remove the selected items sourceList.RemoveRange(0, 2); - sut.Count.Should().Be(0); + await Assert.That(sut.Count).IsEqualTo(0); } - [Fact] - public void AutoRefreshSort() + [Test] + public async Task AutoRefreshSort() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).OrderByDescending(p => p.Age).ToArray(); @@ -281,45 +280,45 @@ public void AutoRefreshSort() //result should only be true when all items are set to true using var list = new SourceList(); using var results = list.Connect().AutoRefresh(p => p.Age).Sort(SortExpressionComparer.Ascending(p => p.Age)).AsAggregator(); - void CheckOrder() + async Task CheckOrder() { var sorted = items.OrderBy(p => p, comparer).ToArray(); - results.Data.Items.Should().BeEquivalentTo(sorted); + await Assert.That(results.Data.Items).IsEquivalentTo(sorted); } list.AddRange(items); - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(1); - CheckOrder(); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await CheckOrder(); items[0].Age = 60; - CheckOrder(); - results.Messages.Count.Should().Be(2); - results.Messages.Last().Refreshes.Should().Be(1); - results.Messages.Last().Moves.Should().Be(1); + await CheckOrder(); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + await Assert.That(results.Messages.Last().Moves).IsEqualTo(1); items[90].Age = -1; //move to beginning - CheckOrder(); - results.Messages.Count.Should().Be(3); - results.Messages.Last().Refreshes.Should().Be(1); - results.Messages.Last().Moves.Should().Be(1); + await CheckOrder(); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + await Assert.That(results.Messages.Last().Moves).IsEqualTo(1); items[50].Age = 49; //same position so no move - CheckOrder(); - results.Messages.Count.Should().Be(4); - results.Messages.Last().Refreshes.Should().Be(1); - results.Messages.Last().Moves.Should().Be(0); + await CheckOrder(); + await Assert.That(results.Messages.Count).IsEqualTo(4); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + await Assert.That(results.Messages.Last().Moves).IsEqualTo(0); items[50].Age = 51; //same position so no move - CheckOrder(); - results.Messages.Count.Should().Be(5); - results.Messages.Last().Refreshes.Should().Be(1); - results.Messages.Last().Moves.Should().Be(1); + await CheckOrder(); + await Assert.That(results.Messages.Count).IsEqualTo(5); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + await Assert.That(results.Messages.Last().Moves).IsEqualTo(1); } - [Fact] - public void AutoRefreshTransform() + [Test] + public async Task AutoRefreshTransform() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, i)).ToArray(); @@ -328,25 +327,25 @@ public void AutoRefreshTransform() using var results = list.Connect().AutoRefresh(p => p.Age).Transform((p, idx) => new TransformedPerson(p, idx)).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(1); //update an item which did not match the filter and does so after change items[0].Age = 60; - results.Messages.Count.Should().Be(2); - results.Messages.Last().Refreshes.Should().Be(1); - results.Messages.Last().First().Item.Reason.Should().Be(ListChangeReason.Refresh); - results.Messages.Last().First().Item.Current.Index.Should().Be(0); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + await Assert.That(results.Messages.Last().First().Item.Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(results.Messages.Last().First().Item.Current.Index).IsEqualTo(0); items[60].Age = 160; - results.Messages.Count.Should().Be(3); - results.Messages.Last().Refreshes.Should().Be(1); - results.Messages.Last().First().Item.Reason.Should().Be(ListChangeReason.Refresh); - results.Messages.Last().First().Item.Current.Index.Should().Be(60); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + await Assert.That(results.Messages.Last().First().Item.Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(results.Messages.Last().First().Item.Current.Index).IsEqualTo(60); } - [Fact] - public void RefreshTransformAsList() + [Test] + public async Task RefreshTransformAsList() { var list = new SourceList(); var valueList = list.Connect().AutoRefresh(e => e.Value).Transform(e => e.Value, true).AsObservableList(); @@ -354,7 +353,7 @@ public void RefreshTransformAsList() var obj = new Example { Value = 0 }; list.Add(obj); obj.Value = 1; - valueList.Items[0].Should().Be(1); + await Assert.That(valueList.Items[0]).IsEqualTo(1); } private class Example : AbstractNotifyPropertyChanged diff --git a/src/DynamicData.Tests/List/BatchFixture.cs b/src/DynamicData.Tests/List/BatchFixture.cs index c93fe2d08..1719924a4 100644 --- a/src/DynamicData.Tests/List/BatchFixture.cs +++ b/src/DynamicData.Tests/List/BatchFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Reactive.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class BatchFixture : IDisposable @@ -32,20 +23,20 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedBeforeClosingBuffer() + [Test] + public async Task NoResultsWillBeReceivedBeforeClosingBuffer() { _source.Add(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void ResultsWillBeReceivedAfterClosingBuffer() + [Test] + public async Task ResultsWillBeReceivedAfterClosingBuffer() { _source.Add(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromSeconds(61).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } } diff --git a/src/DynamicData.Tests/List/BatchIfFixture.cs b/src/DynamicData.Tests/List/BatchIfFixture.cs index ebbb28484..3bf29f2d5 100644 --- a/src/DynamicData.Tests/List/BatchIfFixture.cs +++ b/src/DynamicData.Tests/List/BatchIfFixture.cs @@ -1,20 +1,10 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class BatchIfFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); private readonly ChangeSetAggregator _results; @@ -24,14 +14,14 @@ public class BatchIfFixture : IDisposable public BatchIfFixture() { - _pausingSubject = new Subject(); + _pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); _scheduler = new TestScheduler(); _source = new SourceList(); _results = _source.Connect().BufferIf(_pausingSubject, _scheduler).AsAggregator(); } - [Fact] - public void CanToggleSuspendResume() + [Test] + public async Task CanToggleSuspendResume() { _pausingSubject.OnNext(true); ////advance otherwise nothing happens @@ -41,20 +31,20 @@ public void CanToggleSuspendResume() //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); _pausingSubject.OnNext(false); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(10).Ticks); _source.Add(new Person("B", 1)); - _results.Messages.Count.Should().Be(2, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("There should be no messages"); } /// /// Test case to prove the issue and fix to DynamicData GitHub issue #275 - BufferIf race condition /// - [Fact] - public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() + [Test] + public async Task ChangesNotLostIfConsumerIsRunningOnDifferentThread() { var producerScheduler = new TestScheduler(); var consumerScheduler = new TestScheduler(); @@ -67,7 +57,7 @@ public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() producerScheduler.AdvanceBy(1); consumerScheduler.AdvanceBy(1); - target.Count.Should().Be(1, "There should be 1 message"); + await Assert.That(target.Count).IsEqualTo(1).Because("There should be 1 message"); _pausingSubject.OnNext(true); @@ -79,7 +69,7 @@ public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() producerScheduler.AdvanceBy(1); consumerScheduler.AdvanceBy(1); - target.Count.Should().Be(1, "There should be 1 message"); + await Assert.That(target.Count).IsEqualTo(1).Because("There should be 1 message"); _pausingSubject.OnNext(false); @@ -87,21 +77,22 @@ public void ChangesNotLostIfConsumerIsRunningOnDifferentThread() //Target doesnt get the messages until its scheduler runs, but the //messages shouldnt be lost - target.Count.Should().Be(1, "There should be 1 message"); + await Assert.That(target.Count).IsEqualTo(1).Because("There should be 1 message"); consumerScheduler.AdvanceBy(1); - target.Count.Should().Be(2, "There should be 2 message"); + await Assert.That(target.Count).IsEqualTo(2).Because("There should be 2 message"); } public void Dispose() { _results.Dispose(); _source.Dispose(); + _pausingSubject.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedIfPaused() + [Test] + public async Task NoResultsWillBeReceivedIfPaused() { _pausingSubject.OnNext(true); //advance otherwise nothing happens @@ -111,16 +102,16 @@ public void NoResultsWillBeReceivedIfPaused() //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void ResultsWillBeReceivedIfNotPaused() + [Test] + public async Task ResultsWillBeReceivedIfNotPaused() { _source.Add(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } } diff --git a/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs b/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs index f192a17ca..79fc84a21 100644 --- a/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs +++ b/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs @@ -1,19 +1,10 @@ -using System; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class BatchIfWithTimeOutFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); private readonly ChangeSetAggregator _results; @@ -23,14 +14,14 @@ public class BatchIfWithTimeOutFixture : IDisposable public BatchIfWithTimeOutFixture() { - _pausingSubject = new Subject(); + _pausingSubject = new ReactiveUI.Primitives.Signals.Signal(); _scheduler = new TestScheduler(); _source = new SourceList(); _results = _source.Connect().BufferIf(_pausingSubject, TimeSpan.FromMinutes(1), _scheduler).AsAggregator(); } - [Fact] - public void CanToggleSuspendResume() + [Test] + public async Task CanToggleSuspendResume() { _pausingSubject.OnNext(true); ////advance otherwise nothing happens @@ -39,14 +30,14 @@ public void CanToggleSuspendResume() _source.Add(new Person("A", 1)); //go forward an arbitary amount of time - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); _pausingSubject.OnNext(false); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(10).Ticks); _source.Add(new Person("B", 1)); - _results.Messages.Count.Should().Be(2, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("There should be no messages"); } public void Dispose() @@ -54,10 +45,11 @@ public void Dispose() _results.Dispose(); _source.Dispose(); _pausingSubject.OnCompleted(); + _pausingSubject?.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedIfPaused() + [Test] + public async Task NoResultsWillBeReceivedIfPaused() { _pausingSubject.OnNext(true); //advance otherwise nothing happens @@ -65,31 +57,31 @@ public void NoResultsWillBeReceivedIfPaused() _source.Add(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void ResultsWillBeReceivedIfNotPaused() + [Test] + public async Task ResultsWillBeReceivedIfNotPaused() { _source.Add(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void WillApplyTimeout() + [Test] + public async Task WillApplyTimeout() { _pausingSubject.OnNext(true); - //should timeout + //should timeout _scheduler.AdvanceBy(TimeSpan.FromSeconds(61).Ticks); _source.Add(new Person("A", 1)); //go forward an arbitary amount of time // _scheduler.AdvanceBy(TimeSpan.FromMinutes(1).Ticks); - _results.Messages.Count.Should().Be(1, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("There should be no messages"); } } diff --git a/src/DynamicData.Tests/List/BufferFixture.cs b/src/DynamicData.Tests/List/BufferFixture.cs index e02330f98..f7f232a4a 100644 --- a/src/DynamicData.Tests/List/BufferFixture.cs +++ b/src/DynamicData.Tests/List/BufferFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Reactive.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class BufferFixture : IDisposable @@ -32,20 +23,20 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void NoResultsWillBeReceivedBeforeClosingBuffer() + [Test] + public async Task NoResultsWillBeReceivedBeforeClosingBuffer() { _source.Add(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "There should be no messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("There should be no messages"); } - [Fact] - public void ResultsWillBeReceivedAfterClosingBuffer() + [Test] + public async Task ResultsWillBeReceivedAfterClosingBuffer() { _source.Add(new Person("A", 1)); //go forward an arbitary amount of time _scheduler.AdvanceBy(TimeSpan.FromSeconds(61).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update"); } } diff --git a/src/DynamicData.Tests/List/BufferInitialFixture.cs b/src/DynamicData.Tests/List/BufferInitialFixture.cs index cd32c1b23..97dabc431 100644 --- a/src/DynamicData.Tests/List/BufferInitialFixture.cs +++ b/src/DynamicData.Tests/List/BufferInitialFixture.cs @@ -1,23 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class BufferInitialFixture { private static readonly ICollection People = Enumerable.Range(1, 10_000).Select(i => new Person(i.ToString(), i)).ToList(); - [Fact] - public void BufferInitial() + [Test] + public async Task BufferInitial() { var scheduler = new TestScheduler(); @@ -28,17 +18,17 @@ public void BufferInitial() cache.Add(item); } - aggregator.Data.Count.Should().Be(0); - aggregator.Messages.Count.Should().Be(0); + await Assert.That(aggregator.Data.Count).IsEqualTo(0); + await Assert.That(aggregator.Messages.Count).IsEqualTo(0); scheduler.Start(); - aggregator.Data.Count.Should().Be(10_000); - aggregator.Messages.Count.Should().Be(1); + await Assert.That(aggregator.Data.Count).IsEqualTo(10_000); + await Assert.That(aggregator.Messages.Count).IsEqualTo(1); cache.Add(new Person("_New", 1)); - aggregator.Data.Count.Should().Be(10_001); - aggregator.Messages.Count.Should().Be(2); + await Assert.That(aggregator.Data.Count).IsEqualTo(10_001); + await Assert.That(aggregator.Messages.Count).IsEqualTo(2); } } diff --git a/src/DynamicData.Tests/List/CastFixture.cs b/src/DynamicData.Tests/List/CastFixture.cs index f6a5ac9f9..981e90fb4 100644 --- a/src/DynamicData.Tests/List/CastFixture.cs +++ b/src/DynamicData.Tests/List/CastFixture.cs @@ -1,10 +1,3 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class CastFixture : IDisposable @@ -19,14 +12,14 @@ public CastFixture() _results = _source.Cast(i => (decimal)i).AsAggregator(); } - [Fact] - public void CanCast() + [Test] + public async Task CanCast() { _source.AddRange(Enumerable.Range(1, 10)); - _results.Data.Count.Should().Be(10); + await Assert.That(_results.Data.Count).IsEqualTo(10); _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() diff --git a/src/DynamicData.Tests/List/ChangeAwareListFixture.cs b/src/DynamicData.Tests/List/ChangeAwareListFixture.cs index c8b65086c..117220e50 100644 --- a/src/DynamicData.Tests/List/ChangeAwareListFixture.cs +++ b/src/DynamicData.Tests/List/ChangeAwareListFixture.cs @@ -1,11 +1,8 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.List; @@ -15,52 +12,52 @@ public class ChangeAwareListFixture public ChangeAwareListFixture() => _list = new ChangeAwareList(); - [Fact] - public void Add() + [Test] + public async Task Add() { _list.Add(1); //assert changes var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Adds.Should().Be(1); - changes.First().Item.Current.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Adds).IsEqualTo(1); + await Assert.That(changes.First().Item.Current).IsEqualTo(1); //assert collection - _list.Should().BeEquivalentTo(Enumerable.Range(1, 1)); + await Assert.That(_list).IsEquivalentTo(Enumerable.Range(1, 1)); } - [Fact] - public void AddManyInSuccession() + [Test] + public async Task AddManyInSuccession() { Enumerable.Range(1, 10).ForEach(_list.Add); //assert changes var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Adds.Should().Be(10); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Adds).IsEqualTo(10); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); //assert collection - _list.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(_list).IsEquivalentTo(Enumerable.Range(1, 10)); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { _list.AddRange(Enumerable.Range(1, 10)); //assert changes var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Adds.Should().Be(10); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Adds).IsEqualTo(10); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); //assert collection - _list.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(_list).IsEquivalentTo(Enumerable.Range(1, 10)); } - [Fact] - public void AddSecond() + [Test] + public async Task AddSecond() { _list.Add(1); _list.ClearChanges(); @@ -69,50 +66,50 @@ public void AddSecond() //assert changes var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Adds.Should().Be(1); - changes.First().Item.Current.Should().Be(2); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Adds).IsEqualTo(1); + await Assert.That(changes.First().Item.Current).IsEqualTo(2); //assert collection - _list.Should().BeEquivalentTo(Enumerable.Range(1, 2)); + await Assert.That(_list).IsEquivalentTo(Enumerable.Range(1, 2)); } - [Fact] - public void AddSecondRange() + [Test] + public async Task AddSecondRange() { _list.AddRange(Enumerable.Range(1, 10)); _list.AddRange(Enumerable.Range(11, 10)); var changes = _list.CaptureChanges(); //assert changes - changes.Count.Should().Be(2); - changes.Adds.Should().Be(20); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); - changes.Skip(1).First().Range.Should().BeEquivalentTo(Enumerable.Range(11, 10)); + await Assert.That(changes.Count).IsEqualTo(2); + await Assert.That(changes.Adds).IsEqualTo(20); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Skip(1).First().Range).IsEquivalentTo(Enumerable.Range(11, 10)); //assert collection - _list.Should().BeEquivalentTo(Enumerable.Range(1, 20)); + await Assert.That(_list).IsEquivalentTo(Enumerable.Range(1, 20)); } - [Fact] - public void InsertRangeInCentre() + [Test] + public async Task InsertRangeInCentre() { _list.AddRange(Enumerable.Range(1, 10)); _list.InsertRange(Enumerable.Range(11, 10), 5); var changes = _list.CaptureChanges(); //assert changes - changes.Count.Should().Be(2); - changes.Adds.Should().Be(20); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); - changes.Skip(1).First().Range.Should().BeEquivalentTo(Enumerable.Range(11, 10)); + await Assert.That(changes.Count).IsEqualTo(2); + await Assert.That(changes.Adds).IsEqualTo(20); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Skip(1).First().Range).IsEquivalentTo(Enumerable.Range(11, 10)); var shouldBe = Enumerable.Range(1, 5).Union(Enumerable.Range(11, 10)).Union(Enumerable.Range(6, 5)); //assert collection - _list.Should().BeEquivalentTo(shouldBe); + await Assert.That(_list).IsEquivalentTo(shouldBe); } - [Fact] - public void Refresh() + [Test] + public async Task Refresh() { _list.AddRange(Enumerable.Range(0, 9)); _list.ClearChanges(); @@ -121,18 +118,18 @@ public void Refresh() //assert changes (should batch) var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Refreshes.Should().Be(1); - changes.First().Reason.Should().Be(ListChangeReason.Refresh); - changes.First().Item.Current.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Refreshes).IsEqualTo(1); + await Assert.That(changes.First().Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(changes.First().Item.Current).IsEqualTo(1); - _list.Refresh(5).Should().Be(true); - _list.Refresh(-1).Should().Be(false); - _list.Refresh(1000).Should().Be(false); + await Assert.That(_list.Refresh(5)).IsTrue(); + await Assert.That(_list.Refresh(-1)).IsFalse(); + await Assert.That(_list.Refresh(1000)).IsFalse(); } - [Fact] - public void RefreshAt() + [Test] + public async Task RefreshAt() { _list.AddRange(Enumerable.Range(0, 9)); _list.ClearChanges(); @@ -141,17 +138,17 @@ public void RefreshAt() //assert changes (should batch) var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Refreshes.Should().Be(1); - changes.First().Reason.Should().Be(ListChangeReason.Refresh); - changes.First().Item.Current.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Refreshes).IsEqualTo(1); + await Assert.That(changes.First().Reason).IsEqualTo(ListChangeReason.Refresh); + await Assert.That(changes.First().Item.Current).IsEqualTo(1); - Assert.Throws(() => _list.RefreshAt(-1)); - Assert.Throws(() => _list.RefreshAt(1000)); + await Assert.That(() => _list.RefreshAt(-1)).ThrowsExactly(); + await Assert.That(() => _list.RefreshAt(1000)).ThrowsExactly(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _list.Add(1); _list.ClearChanges(); @@ -160,15 +157,15 @@ public void Remove() //assert changes var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Removes.Should().Be(1); - changes.First().Item.Current.Should().Be(1); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Removes).IsEqualTo(1); + await Assert.That(changes.First().Item.Current).IsEqualTo(1); //assert collection - _list.Count.Should().Be(0); + await Assert.That(_list.Count).IsEqualTo(0); } - [Fact] - public void RemoveMany() + [Test] + public async Task RemoveMany() { _list.AddRange(Enumerable.Range(1, 10)); _list.ClearChanges(); @@ -177,16 +174,16 @@ public void RemoveMany() //assert changes (should batch)s var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Removes.Should().Be(10); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Removes).IsEqualTo(10); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); //assert collection - _list.Count.Should().Be(0); + await Assert.That(_list.Count).IsEqualTo(0); } - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { _list.AddRange(Enumerable.Range(1, 10)); _list.ClearChanges(); @@ -195,18 +192,18 @@ public void RemoveRange() //assert changes var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Removes.Should().Be(3); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(6, 3)); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Removes).IsEqualTo(3); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(6, 3)); //assert collection var shouldBe = Enumerable.Range(1, 5).Union(Enumerable.Range(9, 2)); //assert collection - _list.Should().BeEquivalentTo(shouldBe); + await Assert.That(_list).IsEquivalentTo(shouldBe); } - [Fact] - public void RemoveSucession() + [Test] + public async Task RemoveSucession() { _list.AddRange(Enumerable.Range(1, 10)); _list.ClearChanges(); @@ -215,16 +212,16 @@ public void RemoveSucession() //assert changes (should batch)s var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Removes.Should().Be(10); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Removes).IsEqualTo(10); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); //assert collection - _list.Count.Should().Be(0); + await Assert.That(_list.Count).IsEqualTo(0); } - [Fact] - public void RemoveSucessionReversed() + [Test] + public async Task RemoveSucessionReversed() { _list.AddRange(Enumerable.Range(1, 10)); _list.ClearChanges(); @@ -233,23 +230,23 @@ public void RemoveSucessionReversed() //assert changes (should batch) var changes = _list.CaptureChanges(); - changes.Count.Should().Be(1); - changes.Removes.Should().Be(10); - changes.First().Range.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(changes.Count).IsEqualTo(1); + await Assert.That(changes.Removes).IsEqualTo(10); + await Assert.That(changes.First().Range).IsEquivalentTo(Enumerable.Range(1, 10)); //assert collection - _list.Count.Should().Be(0); + await Assert.That(_list.Count).IsEqualTo(0); } - [Fact] - public void ThrowWhenRemovingItemOutsideOfBoundaries() => Assert.Throws(() => _list.RemoveAt(0)); + [Test] + public async Task ThrowWhenRemovingItemOutsideOfBoundaries() => await Assert.That(() => _list.RemoveAt(0)).ThrowsExactly(); - [Fact] - public void ThrowWhenRemovingRangeThatBeginsOutsideOfBoundaries() => Assert.Throws(() => _list.RemoveRange(0, 1)); + [Test] + public async Task ThrowWhenRemovingRangeThatBeginsOutsideOfBoundaries() => await Assert.That(() => _list.RemoveRange(0, 1)).ThrowsExactly(); - [Fact] - public void ThrowWhenRemovingRangeThatFinishesOutsideOfBoundaries() + [Test] + public async Task ThrowWhenRemovingRangeThatFinishesOutsideOfBoundaries() { _list.Add(0); - Assert.Throws(() => _list.RemoveRange(0, 2)); + await Assert.That(() => _list.RemoveRange(0, 2)).ThrowsExactly(); } } diff --git a/src/DynamicData.Tests/List/ChangeSetFixture.cs b/src/DynamicData.Tests/List/ChangeSetFixture.cs index 28027926d..f0b493109 100644 --- a/src/DynamicData.Tests/List/ChangeSetFixture.cs +++ b/src/DynamicData.Tests/List/ChangeSetFixture.cs @@ -1,25 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Management; -using System.Reflection; -using System.Threading.Channels; - -using Argon; - using Bogus; -using FluentAssertions; - -using Xunit; -using Xunit.Abstractions; -using Xunit.Sdk; - namespace DynamicData.Tests.List; public class ChangeSetFixture { - public static IEnumerable EnumerateCountsAreCorrectTestCases() + public static IEnumerable EnumerateCountsAreCorrectTestCases() => Enumerable.Empty() .Append(new() { @@ -27,133 +12,132 @@ public static IEnumerable EnumerateCountsAreCorrectTestCases() }) .Append(new() { - Name = "Single Add", - AddCount = 1, - ChangeCount = 1, - TotalItemCount = 1 + Name = "Single Add", + AddCount = 1, + ChangeCount = 1, + TotalItemCount = 1 }) .Append(new() { - Name = "Multiple Adds", - AddCount = 5, - ChangeCount = 5, - TotalItemCount = 5 + Name = "Multiple Adds", + AddCount = 5, + ChangeCount = 5, + TotalItemCount = 5 }) .Append(new() { - Name = "Range Add", - AddRangeCount = 1, - AddRangeSize = 5, - ChangeCount = 1, - TotalItemCount = 5 + Name = "Range Add", + AddRangeCount = 1, + AddRangeSize = 5, + ChangeCount = 1, + TotalItemCount = 5 }) .Append(new() { - Name = "Single Move", - MoveCount = 1, - ChangeCount = 1, - TotalItemCount = 1 + Name = "Single Move", + MoveCount = 1, + ChangeCount = 1, + TotalItemCount = 1 }) .Append(new() { - Name = "Multiple Moves", - MoveCount = 5, - ChangeCount = 5, - TotalItemCount = 5 + Name = "Multiple Moves", + MoveCount = 5, + ChangeCount = 5, + TotalItemCount = 5 }) .Append(new() { - Name = "Single Refresh", - RefreshCount = 1, - ChangeCount = 1, - TotalItemCount = 1 + Name = "Single Refresh", + RefreshCount = 1, + ChangeCount = 1, + TotalItemCount = 1 }) .Append(new() { - Name = "Multiple Refreshes", - RefreshCount = 5, - ChangeCount = 5, - TotalItemCount = 5 + Name = "Multiple Refreshes", + RefreshCount = 5, + ChangeCount = 5, + TotalItemCount = 5 }) .Append(new() { - Name = "Single Remove", - RemoveCount = 1, - ChangeCount = 1, - TotalItemCount = 1 + Name = "Single Remove", + RemoveCount = 1, + ChangeCount = 1, + TotalItemCount = 1 }) .Append(new() { - Name = "Multiple Removes", - RemoveCount = 5, - ChangeCount = 5, - TotalItemCount = 5 + Name = "Multiple Removes", + RemoveCount = 5, + ChangeCount = 5, + TotalItemCount = 5 }) .Append(new() { - Name = "Range Remove", - RemoveRangeCount = 1, - RemoveRangeSize = 5, - ChangeCount = 1, - TotalItemCount = 5 + Name = "Range Remove", + RemoveRangeCount = 1, + RemoveRangeSize = 5, + ChangeCount = 1, + TotalItemCount = 5 }) .Append(new() { - Name = "Single Replace", - ReplaceCount = 1, - ChangeCount = 1, - TotalItemCount = 1 + Name = "Single Replace", + ReplaceCount = 1, + ChangeCount = 1, + TotalItemCount = 1 }) .Append(new() { - Name = "Multiple Replaces", - ReplaceCount = 5, - ChangeCount = 5, - TotalItemCount = 5 + Name = "Multiple Replaces", + ReplaceCount = 5, + ChangeCount = 5, + TotalItemCount = 5 }) .Append(new() { - Name = "Various Changes", - AddCount = 1, - AddRangeCount = 2, - AddRangeSize = 3, - MoveCount = 4, - RefreshCount = 5, - RemoveCount = 6, - RemoveRangeCount = 7, - RemoveRangeSize = 8, - ReplaceCount = 9, - ChangeCount = 34, - TotalItemCount = 87 + Name = "Various Changes", + AddCount = 1, + AddRangeCount = 2, + AddRangeSize = 3, + MoveCount = 4, + RefreshCount = 5, + RemoveCount = 6, + RemoveRangeCount = 7, + RemoveRangeSize = 8, + ReplaceCount = 9, + ChangeCount = 34, + TotalItemCount = 87 }) - .Select(testCase => new object[] { testCase }); + ; - [Theory] - [MemberData(nameof(EnumerateCountsAreCorrectTestCases))] - public void CountsAreCorrect(CountsAreCorrectTestCase testCase) + [Test] + [MethodDataSource(nameof(EnumerateCountsAreCorrectTestCases))] + public async Task CountsAreCorrect(CountsAreCorrectTestCase testCase) { var uut = new ChangeSet(testCase.EnumerateChanges()); - uut.Count.Should().Be(testCase.ChangeCount); - uut.Adds.Should().Be(testCase.AddCount + (testCase.AddRangeCount * testCase.AddRangeSize)); - uut.Moves.Should().Be(testCase.MoveCount); - uut.Refreshes.Should().Be(testCase.RefreshCount); - uut.Removes.Should().Be(testCase.RemoveCount + (testCase.RemoveRangeCount * testCase.RemoveRangeSize)); - uut.Replaced.Should().Be(testCase.ReplaceCount); - uut.TotalChanges.Should().Be(testCase.TotalItemCount); + await Assert.That(uut.Count).IsEqualTo(testCase.ChangeCount); + await Assert.That(uut.Adds).IsEqualTo(testCase.AddCount + (testCase.AddRangeCount * testCase.AddRangeSize)); + await Assert.That(uut.Moves).IsEqualTo(testCase.MoveCount); + await Assert.That(uut.Refreshes).IsEqualTo(testCase.RefreshCount); + await Assert.That(uut.Removes).IsEqualTo(testCase.RemoveCount + (testCase.RemoveRangeCount * testCase.RemoveRangeSize)); + await Assert.That(uut.Replaced).IsEqualTo(testCase.ReplaceCount); + await Assert.That(uut.TotalChanges).IsEqualTo(testCase.TotalItemCount); } public record struct CountsAreCorrectTestCase - : IXunitSerializable { public required string Name { get; set; } public int ChangeCount { get; set; } - + public int AddCount { get; set; } public int AddRangeCount { get; set; } - + public int AddRangeSize { get; set; } public int MoveCount { get; set; } @@ -161,9 +145,9 @@ public record struct CountsAreCorrectTestCase public int RefreshCount { get; set; } public int RemoveCount { get; set; } - + public int RemoveRangeCount { get; set; } - + public int RemoveRangeSize { get; set; } public int ReplaceCount { get; set; } @@ -176,85 +160,53 @@ public IEnumerable> EnumerateChanges() for (var i = 0; i < AddCount; ++i) yield return new Change( - reason: ListChangeReason.Add, - current: randomizer.Int(), - index: randomizer.Int(min: 0)); + reason: ListChangeReason.Add, + current: randomizer.Int(), + index: randomizer.Int(min: 0)); for (var i = 0; i < AddRangeCount; ++i) yield return new Change( - reason: ListChangeReason.AddRange, - items: Enumerable.Repeat(0, AddRangeSize) + reason: ListChangeReason.AddRange, + items: Enumerable.Repeat(0, AddRangeSize) .Select(_ => randomizer.Int()) .ToArray(), - index: randomizer.Int(min: 0)); + index: randomizer.Int(min: 0)); for (var i = 0; i < MoveCount; ++i) yield return new Change( - current: randomizer.Int(), - currentIndex: randomizer.Int(min: 0), - previousIndex: randomizer.Int(min: 0)); + current: randomizer.Int(), + currentIndex: randomizer.Int(min: 0), + previousIndex: randomizer.Int(min: 0)); for (var i = 0; i < RefreshCount; ++i) yield return new Change( - reason: ListChangeReason.Refresh, - current: randomizer.Int(), - index: randomizer.Int(min: 0)); + reason: ListChangeReason.Refresh, + current: randomizer.Int(), + index: randomizer.Int(min: 0)); for (var i = 0; i < RemoveCount; ++i) yield return new Change( - reason: ListChangeReason.Remove, - current: randomizer.Int(), - index: randomizer.Int(min: 0)); + reason: ListChangeReason.Remove, + current: randomizer.Int(), + index: randomizer.Int(min: 0)); for (var i = 0; i < RemoveRangeCount; ++i) yield return new Change( - reason: ListChangeReason.RemoveRange, - items: Enumerable.Repeat(0, RemoveRangeSize) + reason: ListChangeReason.RemoveRange, + items: Enumerable.Repeat(0, RemoveRangeSize) .Select(_ => randomizer.Int()) .ToArray(), - index: randomizer.Int(min: 0)); + index: randomizer.Int(min: 0)); for (var i = 0; i < ReplaceCount; ++i) yield return new Change( - reason: ListChangeReason.Replace, - current: randomizer.Int(), - previous: randomizer.Int(), - currentIndex: randomizer.Int(min: 0), - previousIndex: randomizer.Int(min: 0)); + reason: ListChangeReason.Replace, + current: randomizer.Int(), + previous: randomizer.Int(), + currentIndex: randomizer.Int(min: 0), + previousIndex: randomizer.Int(min: 0)); } - void IXunitSerializable.Deserialize(IXunitSerializationInfo info) - { - Name = info.GetValue(nameof(Name)); - ChangeCount = info.GetValue(nameof(ChangeCount)); - AddCount = info.GetValue(nameof(AddCount)); - AddRangeCount = info.GetValue(nameof(AddRangeCount)); - AddRangeSize = info.GetValue(nameof(AddRangeSize)); - MoveCount = info.GetValue(nameof(MoveCount)); - RefreshCount = info.GetValue(nameof(RefreshCount)); - RemoveCount = info.GetValue(nameof(RemoveCount)); - RemoveRangeCount = info.GetValue(nameof(RemoveRangeCount)); - RemoveRangeSize = info.GetValue(nameof(RemoveRangeSize)); - ReplaceCount = info.GetValue(nameof(ReplaceCount)); - TotalItemCount = info.GetValue(nameof(TotalItemCount)); - } - - void IXunitSerializable.Serialize(IXunitSerializationInfo info) - { - info.AddValue(nameof(Name), Name); - info.AddValue(nameof(ChangeCount), ChangeCount); - info.AddValue(nameof(AddCount), AddCount); - info.AddValue(nameof(AddRangeCount), AddRangeCount); - info.AddValue(nameof(AddRangeSize), AddRangeSize); - info.AddValue(nameof(MoveCount), MoveCount); - info.AddValue(nameof(RefreshCount), RefreshCount); - info.AddValue(nameof(RemoveCount), RemoveCount); - info.AddValue(nameof(RemoveRangeCount), RemoveRangeCount); - info.AddValue(nameof(RemoveRangeSize), RemoveRangeSize); - info.AddValue(nameof(ReplaceCount), ReplaceCount); - info.AddValue(nameof(TotalItemCount), TotalItemCount); - } - public override string ToString() => Name; } diff --git a/src/DynamicData.Tests/List/CloneChangesFixture.cs b/src/DynamicData.Tests/List/CloneChangesFixture.cs index b043cf78f..a17537ef9 100644 --- a/src/DynamicData.Tests/List/CloneChangesFixture.cs +++ b/src/DynamicData.Tests/List/CloneChangesFixture.cs @@ -1,12 +1,8 @@ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.List; @@ -22,8 +18,8 @@ public CloneChangesFixture() _clone = new List(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _source.Add(1); @@ -31,63 +27,63 @@ public void Add() _clone.Clone(changes); //assert collection - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void AddManyInSuccession() + [Test] + public async Task AddManyInSuccession() { Enumerable.Range(1, 10).ForEach(_source.Add); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { _source.AddRange(Enumerable.Range(1, 10)); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void AddSecond() + [Test] + public async Task AddSecond() { _source.Add(1); _source.Add(2); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void AddSecondRange() + [Test] + public async Task AddSecondRange() { _source.AddRange(Enumerable.Range(1, 10)); _source.AddRange(Enumerable.Range(11, 10)); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void InsertRangeInCentre() + [Test] + public async Task InsertRangeInCentre() { _source.AddRange(Enumerable.Range(1, 10)); _source.InsertRange(Enumerable.Range(11, 10), 5); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void MovedItemInListHigherToLowerIsMoved() + [Test] + public async Task MovedItemInListHigherToLowerIsMoved() { _source.AddRange(Enumerable.Range(1, 10)); _source.Move(2, 1); @@ -96,11 +92,11 @@ public void MovedItemInListHigherToLowerIsMoved() _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void MovedItemInListLowerToHigherIsMoved() + [Test] + public async Task MovedItemInListLowerToHigherIsMoved() { _source.AddRange(Enumerable.Range(1, 10)); _source.Move(1, 2); @@ -109,11 +105,11 @@ public void MovedItemInListLowerToHigherIsMoved() _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void MovedItemInObservableCollectionIsMoved() + [Test] + public async Task MovedItemInObservableCollectionIsMoved() { _source.AddRange(Enumerable.Range(1, 10)); _source.Move(1, 2); @@ -132,66 +128,66 @@ public void MovedItemInObservableCollectionIsMoved() clone.Clone(changes); - itemMoved.Should().BeTrue(); + await Assert.That(itemMoved).IsTrue(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { _source.Add(1); _source.Remove(1); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void RemoveInnerRange() + [Test] + public async Task RemoveInnerRange() { _source.AddRange(Enumerable.Range(1, 10)); _source.RemoveRange(5, 3); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void RemoveMany() + [Test] + public async Task RemoveMany() { _source.AddRange(Enumerable.Range(1, 10)); _source.RemoveMany(Enumerable.Range(1, 10)); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void RemoveManyPartial() + [Test] + public async Task RemoveManyPartial() { _source.AddRange(Enumerable.Range(1, 10)); _source.RemoveMany(Enumerable.Range(3, 5)); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { _source.AddRange(Enumerable.Range(1, 10)); _source.RemoveRange(5, 3); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void RemoveSucession() + [Test] + public async Task RemoveSucession() { _source.AddRange(Enumerable.Range(1, 10)); _source.ClearChanges(); @@ -199,11 +195,11 @@ public void RemoveSucession() _source.ToArray().ForEach(i => _source.Remove(i)); var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } - [Fact] - public void RemoveSucessionReversed() + [Test] + public async Task RemoveSucessionReversed() { _source.AddRange(Enumerable.Range(1, 10)); _source.ClearChanges(); @@ -212,6 +208,6 @@ public void RemoveSucessionReversed() var changes = _source.CaptureChanges(); _clone.Clone(changes); - _clone.Should().BeEquivalentTo(_source); + await Assert.That(_clone).IsEquivalentTo(_source); } } diff --git a/src/DynamicData.Tests/List/CloneFixture.cs b/src/DynamicData.Tests/List/CloneFixture.cs index 4e050e305..b1e87d461 100644 --- a/src/DynamicData.Tests/List/CloneFixture.cs +++ b/src/DynamicData.Tests/List/CloneFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class CloneFixture : IDisposable @@ -28,33 +19,33 @@ public CloneFixture() _cloner = _source.Connect().Clone(_collection).Subscribe(); } - [Fact] - public void AddToSourceAddsToDestination() + [Test] + public async Task AddToSourceAddsToDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(person, "Should be same person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BatchAdd() + [Test] + public async Task BatchAdd() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); - _collection.Count.Should().Be(100, "Should be 100 items in the collection"); - _collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent"); + await Assert.That(_collection.Count).IsEqualTo(100).Because("Should be 100 items in the collection"); + await Assert.That(_collection).IsEquivalentTo(_collection).Because("Collections should be equivalent"); } - [Fact] - public void BatchRemove() + [Test] + public async Task BatchRemove() { var people = _generator.Take(100).ToList(); _source.AddOrUpdate(people); _source.Clear(); - _collection.Count.Should().Be(0, "Should be 100 items in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 100 items in the collection"); } public void Dispose() @@ -63,25 +54,25 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void RemoveSourceRemovesFromTheDestination() + [Test] + public async Task RemoveSourceRemovesFromTheDestination() { var person = new Person("Adult1", 50); _source.AddOrUpdate(person); _source.Remove(person); - _collection.Count.Should().Be(0, "Should be 1 item in the collection"); + await Assert.That(_collection.Count).IsEqualTo(0).Because("Should be 1 item in the collection"); } - [Fact] - public void UpdateToSourceUpdatesTheDestination() + [Test] + public async Task UpdateToSourceUpdatesTheDestination() { var person = new Person("Adult1", 50); var personUpdated = new Person("Adult1", 51); _source.AddOrUpdate(person); _source.AddOrUpdate(personUpdated); - _collection.Count.Should().Be(1, "Should be 1 item in the collection"); - _collection.First().Should().Be(personUpdated, "Should be updated person"); + await Assert.That(_collection.Count).IsEqualTo(1).Because("Should be 1 item in the collection"); + await Assert.That(_collection.First()).IsEqualTo(personUpdated).Because("Should be updated person"); } } diff --git a/src/DynamicData.Tests/List/CreationFixtures.cs b/src/DynamicData.Tests/List/CreationFixtures.cs index ae7ca0d0b..54ddf12c3 100644 --- a/src/DynamicData.Tests/List/CreationFixtures.cs +++ b/src/DynamicData.Tests/List/CreationFixtures.cs @@ -1,32 +1,24 @@ -using System; -using System.Reactive.Linq; -using System.Threading.Tasks; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class ListCreationFixtures { - [Fact] - public void Create() + [Test] + public async Task Create() { static Task CreateTask(T value) => Task.FromResult(value); - SubscribeAndAssert( + await SubscribeAndAssert( ObservableChangeSet.Create( async list => { - var value = await CreateTask(10); + var value = await CreateTask(10); list.Add(value); return () => { }; })); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Accetable for test.")] - private void SubscribeAndAssert(IObservable> observableChangeset, bool expectsError = false) + private async Task SubscribeAndAssert(IObservable> observableChangeset, bool expectsError = false) where T : notnull { Exception? error = null; @@ -38,14 +30,14 @@ private void SubscribeAndAssert(IObservable> observableChangese { if (!expectsError) { - error.Should().BeNull(); + await Assert.That(error).IsNull(); } else { - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } } - complete.Should().BeTrue(); + await Assert.That(complete).IsTrue(); } } diff --git a/src/DynamicData.Tests/List/DeadlockTortureTest.cs b/src/DynamicData.Tests/List/DeadlockTortureTest.cs new file mode 100644 index 000000000..78cbf13c5 --- /dev/null +++ b/src/DynamicData.Tests/List/DeadlockTortureTest.cs @@ -0,0 +1,137 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +using DynamicData.Tests; +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.List; + +/// +/// Deadlock torture test for list operators. Every operator that previously used +/// Synchronize(locker) (holding the lock during downstream delivery) is wired into a +/// bidirectional cross-list pipeline. Two threads write simultaneously, creating the ABBA +/// lock cycle: +/// Thread A: sourceA._locker -> operator lock -> PopulateInto -> sourceB._locker +/// Thread B: sourceB._locker -> operator lock -> PopulateInto -> sourceA._locker +/// +/// On origin/main (Synchronize(lock)): deadlocks reliably within seconds. +/// On the PR branch (SynchronizeSafe queue-drain): no deadlock possible. +/// +[NotInParallel] +public sealed class DeadlockTortureTest +{ + private const int ItemCount = 200; + private const int Iterations = 50; + private const int TimeoutSeconds = 15; + + private static async Task RunBidirectionalDeadlockTest( + Func>, IObservable>> pipeline, + int iterations = Iterations) + { + for (var iter = 0; iter < iterations; iter++) + { + using var sourceA = new SourceList(); + using var sourceB = new SourceList(); + + // Filter prefixes prevent the feedback loop: items from A flowing into B keep their + // "A" prefix, so the B-to-A filter rejects them. Likewise for the reverse direction. + using var aToB = pipeline(sourceA.Connect().Filter(p => p.Name.StartsWith("A"))).PopulateInto(sourceB); + using var bToA = pipeline(sourceB.Connect().Filter(p => p.Name.StartsWith("B"))).PopulateInto(sourceA); + + using var barrier = new Barrier(2); + var taskA = Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) sourceA.Add(new Person("A-" + iter + "-" + i, i)); }); + var taskB = Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) sourceB.Add(new Person("B-" + iter + "-" + i, i)); }); + + var completed = Task.WhenAll(taskA, taskB); + if (await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds))) != completed) + return false; + } + return true; + } + + [Test] + public async Task Sort_DoesNotDeadlock() => + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age))))).IsTrue(); + + [Test] + public async Task AutoRefresh_DoesNotDeadlock() => + await Assert.That((await RunBidirectionalDeadlockTest(s => s.AutoRefresh(p => p.Age)))).IsTrue(); + + [Test] + public async Task Page_DoesNotDeadlock() + { + using var req = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 50)); + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Page(req)))).IsTrue(); + } + + [Test] + public async Task Virtualise_DoesNotDeadlock() + { + using var req = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 50)); + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Sort(SortExpressionComparer.Ascending(p => p.Age)).Virtualise(req)))).IsTrue(); + } + + [Test] + public async Task FilterDynamic_DoesNotDeadlock() + { + using var pred = new ReactiveUI.Primitives.Signals.StateSignal>(_ => true); + await Assert.That((await RunBidirectionalDeadlockTest(s => s.Filter(pred)))).IsTrue(); + } + + [Test] + public async Task BufferIf_DoesNotDeadlock() => + await Assert.That((await RunBidirectionalDeadlockTest(s => s.BufferIf(new ReactiveUI.Primitives.Signals.StateSignal(false), false, (TimeSpan?)null)))).IsTrue(); + + [Test] + public async Task DisposeMany_DoesNotDeadlock() => + await Assert.That((await RunBidirectionalDeadlockTest(s => s.DisposeMany()))).IsTrue(); + + [Test] + public async Task GroupOn_DoesNotDeadlock() => + await Assert.That((await RunBidirectionalDeadlockTest(s => s.GroupOn(p => p.Age % 3).MergeMany(g => g.List.Connect())))).IsTrue(); + + [Test] + public async Task TransformMany_DoesNotDeadlock() => + await Assert.That((await RunBidirectionalDeadlockTest(s => s.TransformMany(p => new[] { p })))).IsTrue(); + + [Test] + public async Task AllDangerous_Stacked_DoNotDeadlock() + { + using var pageReq = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 100)); + using var pred = new ReactiveUI.Primitives.Signals.StateSignal>(_ => true); + await Assert.That(await RunBidirectionalDeadlockTest( + s => s.AutoRefresh(p => p.Age) + .Filter(pred) + .DisposeMany() + .Sort(SortExpressionComparer.Ascending(p => p.Age)) + .Page(pageReq), + iterations: Iterations * 2)).IsTrue(); + } + + [Test] + public async Task ThreeWayCircular_DoesNotDeadlock() + { + for (var iter = 0; iter < Iterations; iter++) + { + using var a = new SourceList(); + using var b = new SourceList(); + using var c = new SourceList(); + + using var ab = a.Connect().Filter(p => p.Name.StartsWith("A")).Sort(SortExpressionComparer.Ascending(p => p.Age)).PopulateInto(b); + using var bc = b.Connect().Filter(p => p.Name.StartsWith("A")).AutoRefresh(p => p.Age).PopulateInto(c); + using var ca = c.Connect().Filter(p => p.Name.StartsWith("A")).Transform(p => new Person("C-" + p.Name, p.Age)).Filter(p => p.Name.StartsWith("C")).PopulateInto(a); + + using var barrier = new Barrier(3); + var tasks = new[] + { + Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) a.Add(new Person("A-" + iter + "-" + i, i)); }), + Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) b.Add(new Person("B-" + iter + "-" + i, i)); }), + Task.Run(() => { barrier.SignalAndWait(); for (var i = 0; i < ItemCount; i++) c.Add(new Person("CC-" + iter + "-" + i, i)); }), + }; + var completed = Task.WhenAll(tasks); + await Assert.That((await Task.WhenAny(completed, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds))))).IsSameReferenceAs(completed).Because("iteration " + iter); + } + } +} diff --git a/src/DynamicData.Tests/List/DeferUntilLoadedFixture.cs b/src/DynamicData.Tests/List/DeferUntilLoadedFixture.cs index 1f8f725b3..e47ac8fbf 100644 --- a/src/DynamicData.Tests/List/DeferUntilLoadedFixture.cs +++ b/src/DynamicData.Tests/List/DeferUntilLoadedFixture.cs @@ -1,18 +1,11 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class DeferAnsdSkipFixture { - [Fact] - public void DeferUntilLoadedDoesNothingUntilDataHasBeenReceived() + [Test] + public async Task DeferUntilLoadedDoesNothingUntilDataHasBeenReceived() { var updateReceived = false; IChangeSet? result = null; @@ -28,23 +21,23 @@ public void DeferUntilLoadedDoesNothingUntilDataHasBeenReceived() var person = new Person("Test", 1); - updateReceived.Should().BeFalse(); + await Assert.That(updateReceived).IsFalse(); cache.Add(person); - updateReceived.Should().BeTrue(); + await Assert.That(updateReceived).IsTrue(); if (result is null) { throw new InvalidOperationException(nameof(result)); } - result.Adds.Should().Be(1); - result.Unified().First().Current.Should().Be(person); + await Assert.That(result.Adds).IsEqualTo(1); + await Assert.That(result.Unified().First().Current).IsEqualTo(person); deferStream.Dispose(); } - [Fact] - public void SkipInitialDoesNotReturnTheFirstBatchOfData() + [Test] + public async Task SkipInitialDoesNotReturnTheFirstBatchOfData() { var updateReceived = false; @@ -52,14 +45,14 @@ public void SkipInitialDoesNotReturnTheFirstBatchOfData() var deferStream = cache.Connect().SkipInitial().Subscribe(changes => updateReceived = true); - updateReceived.Should().BeFalse(); + await Assert.That(updateReceived).IsFalse(); cache.Add(new Person("P1", 1)); - updateReceived.Should().BeFalse(); + await Assert.That(updateReceived).IsFalse(); cache.Add(new Person("P2", 2)); - updateReceived.Should().BeTrue(); + await Assert.That(updateReceived).IsTrue(); deferStream.Dispose(); } } diff --git a/src/DynamicData.Tests/List/DisposeManyFixture.cs b/src/DynamicData.Tests/List/DisposeManyFixture.cs index 2d06a1122..bde0d4ba2 100644 --- a/src/DynamicData.Tests/List/DisposeManyFixture.cs +++ b/src/DynamicData.Tests/List/DisposeManyFixture.cs @@ -1,23 +1,15 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public sealed class DisposeManyFixture : IDisposable { - private readonly Subject> _changeSetsSource; + private readonly ReactiveUI.Primitives.Signals.Signal> _changeSetsSource; private readonly SourceList _itemsSource; private readonly ChangeSetAggregator _results; + private readonly List _itemsDisposedBeforeDownstreamNotification = []; + public DisposeManyFixture() { _changeSetsSource = new(); @@ -29,28 +21,36 @@ public DisposeManyFixture() foreach (var change in changeSet) { if (change.Item.Current is not null) - change.Item.Current.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + TrackIfDisposed(change.Item.Current); if (change.Item.Previous.HasValue) - change.Item.Previous.Value.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + TrackIfDisposed(change.Item.Previous.Value); if (change.Range is not null) foreach (var item in change.Range) - item.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + TrackIfDisposed(item); } }, onError: _ => { - foreach(var item in _itemsSource.Items) - item.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + foreach (var item in _itemsSource.Items) + TrackIfDisposed(item); }, onCompleted: () => { - foreach(var item in _itemsSource.Items) - item.IsDisposed.Should().BeFalse("items should not be disposed until after downstream notifications are processed"); + foreach (var item in _itemsSource.Items) + TrackIfDisposed(item); })); } + private void TrackIfDisposed(DisposableObject item) + { + if (item.IsDisposed) + { + _itemsDisposedBeforeDownstreamNotification.Add(item); + } + } + public void Dispose() { _changeSetsSource.Dispose(); @@ -58,26 +58,27 @@ public void Dispose() _results.Dispose(); } - [Fact] + [Test] // Verifies https://github.com/reactivemarbles/DynamicData/issues/668 - public void ErrorsArePropagated() + public async Task ErrorsArePropagated() { var error = new Exception("Test Exception"); var source = Observable.Throw>(error) .DisposeMany(); - FluentActions.Invoking(() => source.Subscribe()).Should().Throw().Which.Should().BeSameAs(error); + var exception = await Assert.That(() => source.Subscribe()).Throws(); + await Assert.That(exception).IsSameReferenceAs(error); var receivedError = null as Exception; source.Subscribe( onNext: static _ => { }, onError: error => receivedError = error); - receivedError.Should().BeSameAs(error); + await Assert.That(receivedError).IsSameReferenceAs(error); } - [Fact] - public void ItemsAreDisposedAfterRemovalOrReplacement() + [Test] + public async Task ItemsAreDisposedAfterRemovalOrReplacement() { var items = Enumerable.Range(1, 10) .Select(id => new DisposableObject(id)) @@ -99,15 +100,16 @@ public void ItemsAreDisposedAfterRemovalOrReplacement() new(ListChangeReason.Refresh, current: _itemsSource.Items[0], index: 0) }); - _results.Exception.Should().BeNull(); - _results.Messages.Count.Should().Be(11, "11 updates were made to the source"); - _results.Data.Count.Should().Be(3, "3 items were not removed from the list"); - _results.Data.Items.All(item => item.IsDisposed).Should().BeFalse("items remaining in the list should not be disposed"); - items.Except(_results.Data.Items).All(item => item.IsDisposed).Should().BeTrue("items removed from the list should be disposed"); + await Assert.That(_results.Exception).IsNull(); + await Assert.That(_itemsDisposedBeforeDownstreamNotification).IsEmpty().Because("items should not be disposed until after downstream notifications are processed"); + await Assert.That(_results.Messages.Count).IsEqualTo(11).Because("11 updates were made to the source"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("3 items were not removed from the list"); + await Assert.That(_results.Data.Items.All(item => item.IsDisposed)).IsFalse().Because("items remaining in the list should not be disposed"); + await Assert.That(items.Except(_results.Data.Items).All(item => item.IsDisposed)).IsTrue().Because("items removed from the list should be disposed"); } - [Fact] - public void RemainingItemsAreDisposedAfterCompleted() + [Test] + public async Task RemainingItemsAreDisposedAfterCompleted() { _itemsSource.AddRange(new[] { @@ -118,30 +120,32 @@ public void RemainingItemsAreDisposedAfterCompleted() _itemsSource.Dispose(); _changeSetsSource.OnCompleted(); - _results.Exception.Should().BeNull(); - _results.Messages.Count.Should().Be(1, "1 update was made to the list"); - _results.Data.Count.Should().Be(3, "3 items were not removed from the list"); - _results.Data.Items.All(item => item.IsDisposed).Should().BeTrue("items remaining in the list should be disposed"); + await Assert.That(_results.Exception).IsNull(); + await Assert.That(_itemsDisposedBeforeDownstreamNotification).IsEmpty().Because("items should not be disposed until after downstream notifications are processed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("1 update was made to the list"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("3 items were not removed from the list"); + await Assert.That(_results.Data.Items.All(item => item.IsDisposed)).IsTrue().Because("items remaining in the list should be disposed"); } - [Fact] - public void RemainingItemsAreDisposedAfterError() + [Test] + public async Task RemainingItemsAreDisposedAfterError() { _itemsSource.Add(new(1)); - + var error = new Exception("Test Exception"); _changeSetsSource.OnError(error); _itemsSource.Add(new(2)); - _results.Exception.Should().Be(error); - _results.Messages.Count.Should().Be(1, "1 update was made to the list"); - _results.Data.Count.Should().Be(1, "1 item was not removed from the list"); - _results.Data.Items.All(item => item.IsDisposed).Should().BeTrue("Items remaining in the list should be disposed"); + await Assert.That(_results.Exception).IsEqualTo(error); + await Assert.That(_itemsDisposedBeforeDownstreamNotification).IsEmpty().Because("items should not be disposed until after downstream notifications are processed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("1 update was made to the list"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("1 item was not removed from the list"); + await Assert.That(_results.Data.Items.All(item => item.IsDisposed)).IsTrue().Because("Items remaining in the list should be disposed"); } - [Fact] - public void RemainingItemsAreDisposedAfterUnsubscription() + [Test] + public async Task RemainingItemsAreDisposedAfterUnsubscription() { var items = new[] { @@ -154,7 +158,7 @@ public void RemainingItemsAreDisposedAfterUnsubscription() _results.Dispose(); - items.All(item => item.IsDisposed).Should().BeTrue("Items remaining in the list should be disposed"); + await Assert.That(items.All(item => item.IsDisposed)).IsTrue().Because("Items remaining in the list should be disposed"); } private class DisposableObject(int id) : IDisposable diff --git a/src/DynamicData.Tests/List/DistinctValuesFixture.cs b/src/DynamicData.Tests/List/DistinctValuesFixture.cs index 1a7bcf214..42c486dd5 100644 --- a/src/DynamicData.Tests/List/DistinctValuesFixture.cs +++ b/src/DynamicData.Tests/List/DistinctValuesFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class DistinctValuesFixture : IDisposable @@ -21,8 +14,8 @@ public DistinctValuesFixture() _results = _source.Connect().DistinctValues(p => p.Age).AsAggregator(); } - [Fact] - public void AddingRemovedItem() + [Test] + public async Task AddingRemovedItem() { var person = new Person("A", 20); @@ -30,13 +23,13 @@ public void AddingRemovedItem() _source.Remove(person); _source.Add(person); - _results.Messages.Count.Should().Be(3, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); - _results.Data.Items.Should().BeEquivalentTo(new[] { 20 }); - _results.Messages.ElementAt(0).Adds.Should().Be(1, "First message should be an add"); - _results.Messages.ElementAt(1).Removes.Should().Be(1, "Second message should be a remove"); - _results.Messages.ElementAt(2).Adds.Should().Be(1, "Third message should be an add"); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 20 }); + await Assert.That(_results.Messages.ElementAt(0).Adds).IsEqualTo(1).Because("First message should be an add"); + await Assert.That(_results.Messages.ElementAt(1).Removes).IsEqualTo(1).Because("Second message should be a remove"); + await Assert.That(_results.Messages.ElementAt(2).Adds).IsEqualTo(1).Because("Third message should be an add"); } public void Dispose() @@ -45,8 +38,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void DuplicatedResultsResultInNoAdditionalMessage() + [Test] + public async Task DuplicatedResultsResultInNoAdditionalMessage() { _source.Edit( list => @@ -56,23 +49,23 @@ public void DuplicatedResultsResultInNoAdditionalMessage() list.Add(new Person("Person1", 20)); }); - _results.Messages.Count.Should().Be(1, "Should be 1 update message"); - _results.Data.Count.Should().Be(1, "Should be 1 items in the cache"); - _results.Data.Items[0].Should().Be(20, "Should 20"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 update message"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 items in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(20).Because("Should 20"); } - [Fact] - public void FiresAddWhenaNewItemIsAdded() + [Test] + public async Task FiresAddWhenaNewItemIsAdded() { _source.Add(new Person("Person1", 20)); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(20, "Should 20"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(20).Because("Should 20"); } - [Fact] - public void FiresBatchResultOnce() + [Test] + public async Task FiresBatchResultOnce() { _source.Edit( list => @@ -82,39 +75,39 @@ public void FiresBatchResultOnce() list.Add(new Person("Person3", 22)); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(3, "Should be 3 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(3).Because("Should be 3 items in the cache"); - _results.Data.Items.Should().BeEquivalentTo(new[] { 20, 21, 22 }); - _results.Data.Items[0].Should().Be(20, "Should 20"); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 20, 21, 22 }); + await Assert.That(_results.Data.Items[0]).IsEqualTo(20).Because("Should 20"); } - [Fact] - public void RemovingAnItemRemovesTheDistinct() + [Test] + public async Task RemovingAnItemRemovesTheDistinct() { var person = new Person("Person1", 20); _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 1 update message"); - _results.Data.Count.Should().Be(0, "Should be 1 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 1 update message"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 1 items in the cache"); - _results.Messages.First().Adds.Should().Be(1, "First message should be an add"); - _results.Messages.Skip(1).First().Removes.Should().Be(1, "Second messsage should be a remove"); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1).Because("First message should be an add"); + await Assert.That(_results.Messages.Skip(1).First().Removes).IsEqualTo(1).Because("Second messsage should be a remove"); } - [Fact] - public void Replacing() + [Test] + public async Task Replacing() { var person = new Person("A", 20); var replaceWith = new Person("A", 21); _source.Add(person); _source.Replace(person, replaceWith); - _results.Messages.Count.Should().Be(2, "Should be 1 update message"); - _results.Data.Count.Should().Be(1, "Should be 1 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 1 update message"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 items in the cache"); - _results.Messages.First().Adds.Should().Be(1, "First message should be an add"); - _results.Messages.Skip(1).First().Count.Should().Be(2, "Second messsage should be an add an a remove"); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1).Because("First message should be an add"); + await Assert.That(_results.Messages.Skip(1).First().Count).IsEqualTo(2).Because("Second messsage should be an add an a remove"); } } diff --git a/src/DynamicData.Tests/List/DynamicAndFixture.cs b/src/DynamicData.Tests/List/DynamicAndFixture.cs index 7ae39e813..66821e4ed 100644 --- a/src/DynamicData.Tests/List/DynamicAndFixture.cs +++ b/src/DynamicData.Tests/List/DynamicAndFixture.cs @@ -1,10 +1,3 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class DynamicAndFixture : IDisposable @@ -28,8 +21,8 @@ public DynamicAndFixture() _results = _source.And().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { _source1.AddRange(Enumerable.Range(1, 5)); _source3.AddRange(Enumerable.Range(1, 5)); @@ -39,40 +32,40 @@ public void AddAndRemoveLists() var result = Enumerable.Range(1, 5).ToArray(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source2.AddRange(Enumerable.Range(6, 5)); - _results.Data.Count.Should().Be(5); + await Assert.That(_results.Data.Count).IsEqualTo(5); _source.Add(_source2.Connect()); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); _source.RemoveAt(2); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); } - [Fact] - public void ClearOneClearsResult() + [Test] + public async Task ClearOneClearsResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(1, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 10)); _source2.AddRange(Enumerable.Range(6, 10)); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(6, 5)); } public void Dispose() @@ -84,33 +77,33 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void ExcludedWhenItemIsInOneSource() + [Test] + public async Task ExcludedWhenItemIsInOneSource() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void IncludedWhenItemIsInTwoSources() + [Test] + public async Task IncludedWhenItemIsInTwoSources() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void RemovedWhenNoLongerInBoth() + [Test] + public async Task RemovedWhenNoLongerInBoth() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } } diff --git a/src/DynamicData.Tests/List/DynamicExceptFixture.cs b/src/DynamicData.Tests/List/DynamicExceptFixture.cs index 3fbf868ef..8f6158655 100644 --- a/src/DynamicData.Tests/List/DynamicExceptFixture.cs +++ b/src/DynamicData.Tests/List/DynamicExceptFixture.cs @@ -1,10 +1,3 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class DynamicExceptFixture : IDisposable @@ -28,8 +21,8 @@ public DynamicExceptFixture() _results = _source.Except().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); @@ -40,8 +33,8 @@ public void AddAndRemoveLists() _source.Add(_source3.Connect()); var result = Enumerable.Range(1, 5); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source2.Edit( innerList => @@ -51,71 +44,71 @@ public void AddAndRemoveLists() }); result = Enumerable.Range(1, 2); - _results.Data.Count.Should().Be(2); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(2); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source.RemoveAt(1); result = Enumerable.Range(1, 5); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source.Add(_source2.Connect()); result = Enumerable.Range(1, 2); - _results.Data.Count.Should().Be(2); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(2); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); //remove root except _source.RemoveAt(0); result = Enumerable.Range(100, 5); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); } - [Fact] - public void AddedWhenNoLongerInSecond() + [Test] + public async Task AddedWhenNoLongerInSecond() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); _source2.Remove(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void ClearFirstClearsResult() + [Test] + public async Task ClearFirstClearsResult() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(1, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void ClearSecondEnsuresFirstIsIncluded() + [Test] + public async Task ClearSecondEnsuresFirstIsIncluded() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(1, 5)); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); _source2.Clear(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 5)); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 10)); _source2.AddRange(Enumerable.Range(6, 10)); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 5)); } public void Dispose() @@ -127,31 +120,31 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void ExcludedWhenItemIsInTwoSources() + [Test] + public async Task ExcludedWhenItemIsInTwoSources() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void IncludedWhenItemIsInOneSource() + [Test] + public async Task IncludedWhenItemIsInOneSource() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void NothingFromOther() + [Test] + public async Task NothingFromOther() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source2.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } } diff --git a/src/DynamicData.Tests/List/DynamicOrFixture.cs b/src/DynamicData.Tests/List/DynamicOrFixture.cs index 415c37330..242e87d72 100644 --- a/src/DynamicData.Tests/List/DynamicOrFixture.cs +++ b/src/DynamicData.Tests/List/DynamicOrFixture.cs @@ -1,16 +1,9 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class DynamicOrRefreshFixture { - [Fact] - public void RefreshPassesThrough() + [Test] + public async Task RefreshPassesThrough() { var source1 = new SourceList(); var source2 = new SourceList(); @@ -23,10 +16,10 @@ public void RefreshPassesThrough() source1.Items.ElementAt(0).Name = "Test"; - results.Data.Count.Should().Be(2); - results.Messages.Count.Should().Be(3); - results.Messages[2].Refreshes.Should().Be(1); - results.Messages[2].First().Item.Current.Should().Be(source1.Items[0]); + await Assert.That(results.Data.Count).IsEqualTo(2); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[2].Refreshes).IsEqualTo(1); + await Assert.That(results.Messages[2].First().Item.Current).IsEqualTo(source1.Items[0]); } } @@ -51,8 +44,8 @@ public DynamicOrFixture() _results = _source.Or().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); @@ -64,30 +57,30 @@ public void AddAndRemoveLists() var result = Enumerable.Range(1, 5).Union(Enumerable.Range(6, 5)).Union(Enumerable.Range(100, 5)); - _results.Data.Count.Should().Be(15); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(15); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source.RemoveAt(1); - _results.Data.Count.Should().Be(10); + await Assert.That(_results.Data.Count).IsEqualTo(10); result = Enumerable.Range(1, 5).Union(Enumerable.Range(100, 5)); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); } - [Fact] - public void ClearOnlyClearsOneSource() + [Test] + public async Task ClearOnlyClearsOneSource() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(6, 5)); } - [Fact] - public void ClearSource() + [Test] + public async Task ClearSource() { _source1.Add(0); _source2.Add(1); @@ -95,18 +88,18 @@ public void ClearSource() _source.Add(_source2.Connect()); _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 10)); } public void Dispose() @@ -118,30 +111,30 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void IncludedWhenItemIsInOneSource() + [Test] + public async Task IncludedWhenItemIsInOneSource() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } - [Fact] - public void IncludedWhenItemIsInTwoSources() + [Test] + public async Task IncludedWhenItemIsInTwoSources() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } - [Fact] - public void ItemIsReplaced() + [Test] + public async Task ItemIsReplaced() { _source1.Add(0); _source2.Add(1); @@ -149,13 +142,13 @@ public void ItemIsReplaced() _source.Add(_source2.Connect()); _source1.ReplaceAt(0, 9); - _results.Data.Count.Should().Be(2); - _results.Messages.Count.Should().Be(3); - _results.Data.Items.Should().BeEquivalentTo(new[] { 9, 1}); + await Assert.That(_results.Data.Count).IsEqualTo(2); + await Assert.That(_results.Messages.Count).IsEqualTo(3); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 9, 1 }); } - [Fact] - public void RemoveAllLists() + [Test] + public async Task RemoveAllLists() { _source1.AddRange(Enumerable.Range(1, 5)); @@ -168,16 +161,16 @@ public void RemoveAllLists() _source2.AddRange(Enumerable.Range(6, 5)); _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void RemovedWhenNoLongerInEither() + [Test] + public async Task RemovedWhenNoLongerInEither() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } } diff --git a/src/DynamicData.Tests/List/DynamicXOrFixture.cs b/src/DynamicData.Tests/List/DynamicXOrFixture.cs index ef6326976..12d5408c7 100644 --- a/src/DynamicData.Tests/List/DynamicXOrFixture.cs +++ b/src/DynamicData.Tests/List/DynamicXOrFixture.cs @@ -1,10 +1,3 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class DynamicXOrFixture : IDisposable @@ -28,8 +21,8 @@ public DynamicXOrFixture() _results = _source.Xor().AsAggregator(); } - [Fact] - public void AddAndRemoveLists() + [Test] + public async Task AddAndRemoveLists() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); @@ -40,41 +33,41 @@ public void AddAndRemoveLists() _source.Add(_source3.Connect()); var result = Enumerable.Range(6, 5); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source.RemoveAt(0); result = Enumerable.Range(1, 5).Union(Enumerable.Range(6, 5)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); _source.Add(_source1.Connect()); result = Enumerable.Range(6, 5); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(result); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(result); } - [Fact] - public void ClearOnlyClearsOneSource() + [Test] + public async Task ClearOnlyClearsOneSource() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(6, 5)); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 10)); } public void Dispose() @@ -86,57 +79,57 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void IncludedWhenItemIsInOneSource() + [Test] + public async Task IncludedWhenItemIsInOneSource() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } - [Fact] - public void NotIncludedWhenItemIsInTwoSources() + [Test] + public async Task NotIncludedWhenItemIsInTwoSources() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void OverlappingRangeExcludesIntersect() + [Test] + public async Task OverlappingRangeExcludesIntersect() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.AddRange(Enumerable.Range(1, 10)); _source2.AddRange(Enumerable.Range(6, 10)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5).Union(Enumerable.Range(11, 5))); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 5).Union(Enumerable.Range(11, 5))); } - [Fact] - public void RemovedWhenNoLongerInBoth() + [Test] + public async Task RemovedWhenNoLongerInBoth() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source2.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void RemovedWhenNoLongerInEither() + [Test] + public async Task RemovedWhenNoLongerInEither() { _source.Add(_source1.Connect()); _source.Add(_source2.Connect()); _source1.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } } diff --git a/src/DynamicData.Tests/List/EditDiffFixture.cs b/src/DynamicData.Tests/List/EditDiffFixture.cs index 3a96e6195..a0863ebd3 100644 --- a/src/DynamicData.Tests/List/EditDiffFixture.cs +++ b/src/DynamicData.Tests/List/EditDiffFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class EditDiffFixture : IDisposable @@ -22,19 +15,19 @@ public EditDiffFixture() _cache.AddRange(Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray()); } - [Fact] - public void Amends() + [Test] + public async Task Amends() { var newList = Enumerable.Range(5, 3).Select(i => new Person("Name" + i, i + 10)).ToArray(); _cache.EditDiff(newList, Person.NameAgeGenderComparer); - _cache.Count.Should().Be(3); + await Assert.That(_cache.Count).IsEqualTo(3); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(3); - lastChange.Removes.Should().Be(10); + await Assert.That(lastChange.Adds).IsEqualTo(3); + await Assert.That(lastChange.Removes).IsEqualTo(10); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } public void Dispose() @@ -43,59 +36,59 @@ public void Dispose() _result.Dispose(); } - [Fact] - public void EditWithSameData() + [Test] + public async Task EditWithSameData() { var newPeople = Enumerable.Range(1, 10).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newPeople, Person.NameAgeGenderComparer); - _cache.Count.Should().Be(10); - _cache.Items.Should().BeEquivalentTo(newPeople); - _result.Messages.Count.Should().Be(1); + await Assert.That(_cache.Count).IsEqualTo(10); + await Assert.That(_cache.Items).IsEquivalentTo(newPeople, Person.NameAgeGenderComparer); + await Assert.That(_result.Messages.Count).IsEqualTo(1); } - [Fact] - public void New() + [Test] + public async Task New() { var newPeople = Enumerable.Range(1, 15).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newPeople, Person.NameAgeGenderComparer); - _cache.Count.Should().Be(15); - _cache.Items.Should().BeEquivalentTo(newPeople); + await Assert.That(_cache.Count).IsEqualTo(15); + await Assert.That(_cache.Items).IsEquivalentTo(newPeople, Person.NameAgeGenderComparer); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(5); + await Assert.That(lastChange.Adds).IsEqualTo(5); } - [Fact] - public void Removes() + [Test] + public async Task Removes() { var newList = Enumerable.Range(1, 7).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newList, Person.NameAgeGenderComparer); - _cache.Count.Should().Be(7); + await Assert.That(_cache.Count).IsEqualTo(7); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(0); - lastChange.Removes.Should().Be(3); + await Assert.That(lastChange.Adds).IsEqualTo(0); + await Assert.That(lastChange.Removes).IsEqualTo(3); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } - [Fact] - public void VariousChanges() + [Test] + public async Task VariousChanges() { var newList = Enumerable.Range(6, 10).Select(i => new Person("Name" + i, i)).ToArray(); _cache.EditDiff(newList, Person.NameAgeGenderComparer); - _cache.Count.Should().Be(10); + await Assert.That(_cache.Count).IsEqualTo(10); var lastChange = _result.Messages.Last(); - lastChange.Adds.Should().Be(5); - lastChange.Removes.Should().Be(5); + await Assert.That(lastChange.Adds).IsEqualTo(5); + await Assert.That(lastChange.Removes).IsEqualTo(5); - _cache.Items.Should().BeEquivalentTo(newList); + await Assert.That(_cache.Items).IsEquivalentTo(newList, Person.NameAgeGenderComparer); } } diff --git a/src/DynamicData.Tests/List/ExceptFixture.cs b/src/DynamicData.Tests/List/ExceptFixture.cs index d74eff07b..238844502 100644 --- a/src/DynamicData.Tests/List/ExceptFixture.cs +++ b/src/DynamicData.Tests/List/ExceptFixture.cs @@ -1,18 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; +[InheritsTests] public class ExceptFixture : ExceptFixtureBase { protected override IObservable> CreateObservable() => Source1.Connect().Except(Source2.Connect()); } +[InheritsTests] public class ExceptCollectionFixture : ExceptFixtureBase { protected override IObservable> CreateObservable() @@ -38,42 +32,42 @@ protected ExceptFixtureBase() _results = CreateObservable().AsAggregator(); } - [Fact] - public void AddedWhenNoLongerInSecond() + [Test] + public async Task AddedWhenNoLongerInSecond() { Source1.Add(1); Source2.Add(1); Source2.Remove(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void ClearFirstClearsResult() + [Test] + public async Task ClearFirstClearsResult() { Source1.AddRange(Enumerable.Range(1, 5)); Source2.AddRange(Enumerable.Range(1, 5)); Source1.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void ClearSecondEnsuresFirstIsIncluded() + [Test] + public async Task ClearSecondEnsuresFirstIsIncluded() { Source1.AddRange(Enumerable.Range(1, 5)); Source2.AddRange(Enumerable.Range(1, 5)); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); Source2.Clear(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 5)); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { Source1.AddRange(Enumerable.Range(1, 10)); Source2.AddRange(Enumerable.Range(6, 10)); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 5)); } public void Dispose() @@ -83,26 +77,26 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void ExcludedWhenItemIsInTwoSources() + [Test] + public async Task ExcludedWhenItemIsInTwoSources() { Source1.Add(1); Source2.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void IncludedWhenItemIsInOneSource() + [Test] + public async Task IncludedWhenItemIsInOneSource() { Source1.Add(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void NothingFromOther() + [Test] + public async Task NothingFromOther() { Source2.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/List/ExpireAfterFixture.cs b/src/DynamicData.Tests/List/ExpireAfterFixture.cs index 9ad68eb16..190878890 100644 --- a/src/DynamicData.Tests/List/ExpireAfterFixture.cs +++ b/src/DynamicData.Tests/List/ExpireAfterFixture.cs @@ -1,31 +1,13 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; - -using Microsoft.Reactive.Testing; using Bogus; -using FluentAssertions; -using Xunit; -using Xunit.Abstractions; - -using DynamicData.Tests.Utilities; namespace DynamicData.Tests.List; public sealed class ExpireAfterFixture { - private readonly ITestOutputHelper _output; - - public ExpireAfterFixture(ITestOutputHelper output) - => _output = output; - - [Fact] - public void ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() + [Test] + public async Task ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() { using var source = new TestSourceList(); @@ -58,22 +40,22 @@ public void ItemIsRemovedBeforeExpiration_ExpirationIsCancelled() source.RemoveRange(index: 2, count: 2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no items should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item1, item3, item6, item7 }, "7 items were added, and 3 were removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no items should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item3, item6, item7 }).Because("7 items were added, and 3 were removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.ElementAt(0).Should().BeEquivalentTo(new[] { item1, item3, item6 }, "items #1, #3, and #6 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item7 }, "items #1 and #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.ElementAt(0)).IsEquivalentTo(new[] { item1, item3, item6 }).Because("items #1, #3, and #6 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item7 }).Because("items #1 and #3 should have been removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() + [Test] + public async Task NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() { using var source = new TestSourceList(); @@ -95,52 +77,52 @@ public void NextItemToExpireIsReplaced_ExpirationIsRescheduledIfNeeded() source.Replace(item1, item2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item2 }, "item #1 was added, and then replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2 }).Because("item #1 was added, and then replaced"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item2 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2 }).Because("no changes should have occurred"); // Shorten the expiration to an earlier time var item3 = new TestItem() { Id = 3, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.Replace(item2, item3); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item3 }, "item #2 was replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item3 }).Because("item #2 was replaced"); // One more update with no changes to the expiration var item4 = new TestItem() { Id = 4, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.Replace(item3, item4); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item4 }, "item #3 was replaced"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item4 }).Because("item #3 was replaced"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.ElementAt(0).Should().BeEquivalentTo(new[] { item4 }, "item #4 should have expired"); - source.Items.Should().BeEmpty("item #4 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.ElementAt(0)).IsEquivalentTo(new[] { item4 }).Because("item #4 should have expired"); + await Assert.That(source.Items).IsEmpty().Because("item #4 should have expired"); scheduler.AdvanceTo(DateTimeOffset.MaxValue.Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEmpty("no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEmpty().Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() + [Test] + public async Task PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() { using var source = new TestSourceList(); @@ -163,13 +145,13 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() scheduler.AdvanceBy(1); // Additional expirations at 20ms. - var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; - var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; + var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; + var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; source.AddRange(new[] { item6, item7 }); scheduler.AdvanceBy(1); // Out-of-order expiration - var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15)}; + var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.Add(item8); scheduler.AdvanceBy(1); @@ -195,91 +177,90 @@ public void PollingIntervalIsGiven_RemovalsAreScheduledAtInterval() // Not testing Refresh changes, since ISourceList doesn't actually provide an API to generate them. - // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, options => options.WithStrictOrdering(), "9 items were added, 2 were replaced, and 1 was refreshed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("9 items were added, 2 were replaced, and 1 was refreshed"); // Item scheduled to expire at 10ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); // Item scheduled to expire at 15ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.ElementAt(0).Should().BeEquivalentTo(new[] { item1, item2, item6, item7, item8 }, "items #1, #2, #6, #7, and #8 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item10, item3, item11, item9 }, options => options.WithStrictOrdering(), "items #1, #2, #6, #7, and #8 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.ElementAt(0)).IsEquivalentTo(new[] { item1, item2, item6, item7, item8 }).Because("items #1, #2, #6, #7, and #8 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item3, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("items #1, #2, #6, #7, and #8 should have been removed"); // Item scheduled to expire at 30ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(30).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item10, item3, item11, item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item3, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); // Expired items should be polled, but should exclude the one that was changed from 40ms to 45ms. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(40).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(1).ElementAt(0).Should().BeEquivalentTo(new[] { item3 }, "item #3 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item10, item11, item9 }, options => options.WithStrictOrdering(), "item #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(1).ElementAt(0)).IsEquivalentTo(new[] { item3 }).Because("item #3 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #3 should have been removed"); // Item scheduled to expire at 45ms, but won't be picked up yet scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(45).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(2).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item10, item11, item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(2)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(60).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(2).ElementAt(0).Should().BeEquivalentTo(new[] { item10 }, "item #10 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item11, item9 }, "item #10 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(2).ElementAt(0)).IsEquivalentTo(new[] { item10 }).Because("item #10 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item11, item9 }).Because("item #10 should have been removed"); // Expired items should be polled, but none should be found scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(80).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(3).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item11, item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(3)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); // Expired items should be polled scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(100).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(3).ElementAt(0).Should().BeEquivalentTo(new[] { item11 }, "item #11 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, options => options.WithStrictOrdering(), "item #11 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(3).ElementAt(0)).IsEquivalentTo(new[] { item11 }).Because("item #11 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #11 should have been removed"); // Next poll should not find anything to expire. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(120).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(4).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() + [Test] + public async Task PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() { using var source = new TestSourceList(); @@ -301,13 +282,13 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() scheduler.AdvanceBy(1); // Additional expirations at 20ms. - var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; - var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20)}; + var item6 = new TestItem() { Id = 6, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; + var item7 = new TestItem() { Id = 7, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(20) }; source.AddRange(new[] { item6, item7 }); scheduler.AdvanceBy(1); // Out-of-order expiration - var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15)}; + var item8 = new TestItem() { Id = 8, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(15) }; source.Add(item8); scheduler.AdvanceBy(1); @@ -331,72 +312,71 @@ public void PollingIntervalIsNotGiven_RemovalsAreScheduledImmediately() source.Move(2, 3); scheduler.AdvanceBy(1); - // Verify initial state, after all emissions - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, options => options.WithStrictOrdering(), "9 items were added, 2 were replaced, and 1 was moved"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1, item2, item10, item3, item11, item6, item7, item8, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("9 items were added, 2 were replaced, and 1 was moved"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.ElementAt(0).Should().BeEquivalentTo(new[] { item1 }, "item #1 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item2, item10, item3, item11, item6, item7, item8, item9 }, options => options.WithStrictOrdering(), "item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.ElementAt(0)).IsEquivalentTo(new[] { item1 }).Because("item #1 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2, item10, item3, item11, item6, item7, item8, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #1 should have been removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(15).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(1).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(1).ElementAt(0).Should().BeEquivalentTo(new[] { item8 }, "item #8 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item2, item10, item3, item11, item6, item7, item9 }, options => options.WithStrictOrdering(), "item #8 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(1).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(1).ElementAt(0)).IsEquivalentTo(new[] { item8 }).Because("item #8 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item2, item10, item3, item11, item6, item7, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #8 should have expired"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(20).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(2).ElementAt(0).Should().BeEquivalentTo(new[] { item2, item6, item7 }, "items #2, #6, and #7 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item10, item3, item11, item9 }, options => options.WithStrictOrdering(), "items #2, #6, and #7 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(2).ElementAt(0)).IsEquivalentTo(new[] { item2, item6, item7 }).Because("items #2, #6, and #7 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item3, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("items #2, #6, and #7 should have been removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(30).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(3).ElementAt(0).Should().BeEquivalentTo(new[] { item3 }, "item #3 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item10, item11, item9 }, options => options.WithStrictOrdering(), "item #3 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(3).ElementAt(0)).IsEquivalentTo(new[] { item3 }).Because("item #3 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #3 should have been removed"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(40).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(4).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item10, item11, item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item10, item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(45).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(4).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(4).ElementAt(0).Should().BeEquivalentTo(new[] { item10 }, "item #10 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item11, item9 }, options => options.WithStrictOrdering(), "item #10 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(4).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(4).ElementAt(0)).IsEquivalentTo(new[] { item10 }).Because("item #10 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item11, item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #10 should have expired"); scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(50).Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(5).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.Skip(5).ElementAt(0).Should().BeEquivalentTo(new[] { item11 }, "item #11 should have expired"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, options => options.WithStrictOrdering(), "item #11 should have expired"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(5).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.Skip(5).ElementAt(0)).IsEquivalentTo(new[] { item11 }).Because("item #11 should have expired"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("item #11 should have expired"); scheduler.AdvanceTo(DateTimeOffset.MaxValue.Ticks); - results.Error.Should().BeNull(); - results.RecordedValues.Skip(6).Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item9 }, options => options.WithStrictOrdering(), "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Skip(6)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item9 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } // Covers https://github.com/reactivemarbles/DynamicData/issues/716 - [Fact] - public void SchedulerIsInaccurate_RemovalsAreNotSkipped() + [Test] + public async Task SchedulerIsInaccurate_RemovalsAreNotSkipped() { using var source = new TestSourceList(); @@ -415,23 +395,22 @@ public void SchedulerIsInaccurate_RemovalsAreNotSkipped() var item1 = new TestItem() { Id = 1, Expiration = DateTimeOffset.FromUnixTimeMilliseconds(10) }; source.Add(item1); - - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - source.Items.Should().BeEquivalentTo(new[] { item1 }, "1 item was added"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1 }).Because("1 item was added"); scheduler.SimulateUntilIdle(inaccuracyOffset: TimeSpan.FromMilliseconds(-1)); - results.Error.Should().BeNull(); - results.RecordedValues.Count.Should().Be(1, "1 expiration should have occurred"); - results.RecordedValues.ElementAt(0).Should().BeEquivalentTo(new[] { item1 }, "item #1 should have expired"); - source.Items.Should().BeEmpty("item #1 should have been removed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.Count).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedValues.ElementAt(0)).IsEquivalentTo(new[] { item1 }).Because("item #1 should have expired"); + await Assert.That(source.Items).IsEmpty().Because("item #1 should have been removed"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.HasCompleted).IsFalse(); } - [Fact] - public void SourceCompletes_CompletionIsPropagated() + [Test] + public async Task SourceCompletes_CompletionIsPropagated() { using var source = new TestSourceList(); @@ -449,16 +428,16 @@ public void SourceCompletes_CompletionIsPropagated() source.Complete(); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeTrue(); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsTrue(); // Ensure that the operator does not attept to continue removing items. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); } - [Fact] - public void SourceCompletesImmediately_CompletionIsPropagated() + [Test] + public async Task SourceCompletesImmediately_CompletionIsPropagated() { using var source = new TestSourceList(); @@ -477,14 +456,14 @@ public void SourceCompletesImmediately_CompletionIsPropagated() .ValidateSynchronization() .RecordValues(out var results, scheduler); - results.Error.Should().BeNull(); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeTrue(); - source.Items.Should().BeEquivalentTo(new[] { item1 }, "no changes should have occurred"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1 }).Because("no changes should have occurred"); } - [Fact] - public void SourceErrors_ErrorIsPropagated() + [Test] + public async Task SourceErrors_ErrorIsPropagated() { using var source = new TestSourceList(); @@ -503,16 +482,16 @@ public void SourceErrors_ErrorIsPropagated() var error = new Exception("This is a test"); source.SetError(error); - results.Error.Should().Be(error, "an error was published"); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error).Because("an error was published"); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); // Ensure that the operator does not attept to continue removing items. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); } - [Fact] - public void SourceErrorsImmediately_ErrorIsPropagated() + [Test] + public async Task SourceErrorsImmediately_ErrorIsPropagated() { using var source = new TestSourceList(); @@ -532,24 +511,24 @@ public void SourceErrorsImmediately_ErrorIsPropagated() .ValidateSynchronization() .RecordValues(out var results, scheduler); - results.Error.Should().Be(error, "an error was published"); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); - source.Items.Should().BeEquivalentTo(new[] { item1 }, "no changes should have occurred"); + await Assert.That(results.Error).IsEqualTo(error).Because("an error was published"); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(source.Items).IsEquivalentTo(new[] { item1 }).Because("no changes should have occurred"); // Ensure that the operator does not attept to continue removing items. scheduler.AdvanceTo(DateTimeOffset.FromUnixTimeMilliseconds(10).Ticks); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableListEx.ExpireAfter( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableListEx.ExpireAfter( source: (null as ISourceList)!, timeSelector: static _ => default, pollingInterval: null)) - .Should().Throw(); + .Throws(); - [Fact] + [Test] public async Task ThreadPoolSchedulerIsUsedWithoutPolling_ExpirationIsThreadSafe() { using var source = new TestSourceList(); @@ -573,15 +552,15 @@ public async Task ThreadPoolSchedulerIsUsedWithoutPolling_ExpirationIsThreadSafe await WaitForCompletionAsync(source, results, TimeSpan.FromMinutes(1)); - results.Error.Should().BeNull(); - results.RecordedValues.SelectMany(static removals => removals).Should().AllSatisfy(static item => item.Lifetime.Should().NotBeNull("only items with an expiration should have expired")); - results.HasCompleted.Should().BeFalse(); - source.Items.Should().AllSatisfy(item => item.Lifetime.Should().BeNull("all items with an expiration should have expired")); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.SelectMany(static removals => removals)).All(static item => item.Lifetime is not null).Because("only items with an expiration should have expired"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(source.Items).All(static item => item.Lifetime is null).Because("all items with an expiration should have expired"); - _output.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); + TestContext.Current?.OutputWriter.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); } - [Fact] + [Test] public async Task ThreadPoolSchedulerIsUsedWithPolling_ExpirationIsThreadSafe() { using var source = new TestSourceList(); @@ -606,23 +585,23 @@ public async Task ThreadPoolSchedulerIsUsedWithPolling_ExpirationIsThreadSafe() await WaitForCompletionAsync(source, results, TimeSpan.FromMinutes(1)); - results.Error.Should().BeNull(); - results.RecordedValues.SelectMany(static removals => removals).Should().AllSatisfy(item => item.Lifetime.Should().NotBeNull("only items with an expiration should have expired")); - results.HasCompleted.Should().BeFalse(); - source.Items.Should().AllSatisfy(item => item.Lifetime.Should().BeNull("all items with an expiration should have expired")); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedValues.SelectMany(static removals => removals)).All(static item => item.Lifetime is not null).Because("only items with an expiration should have expired"); + await Assert.That(results.HasCompleted).IsFalse(); + await Assert.That(source.Items).All(static item => item.Lifetime is null).Because("all items with an expiration should have expired"); - _output.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); + TestContext.Current?.OutputWriter.WriteLine($"{results.RecordedValues.Count} Expirations occurred, for {results.RecordedValues.SelectMany(static item => item).Count()} items"); } - [Fact] - public void TimeSelectorIsNull_ThrowsException() - => FluentActions.Invoking(() => new TestSourceList().ExpireAfter( + [Test] + public async Task TimeSelectorIsNull_ThrowsException() + => await Assert.That(() => new TestSourceList().ExpireAfter( timeSelector: null!, pollingInterval: null)) - .Should().Throw(); + .Throws(); - [Fact] - public void TimeSelectorThrows_ThrowsException() + [Test] + public async Task TimeSelectorThrows_ThrowsException() { using var source = new TestSourceList(); @@ -640,9 +619,9 @@ public void TimeSelectorThrows_ThrowsException() source.Add(new TestItem() { Id = 1 }); scheduler.AdvanceBy(1); - results.Error.Should().Be(error); - results.RecordedValues.Should().BeEmpty("no expirations should have occurred"); - results.HasCompleted.Should().BeFalse(); + await Assert.That(results.Error).IsEqualTo(error); + await Assert.That(results.RecordedValues).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.HasCompleted).IsFalse(); } private static TestScheduler CreateTestScheduler() @@ -718,8 +697,8 @@ private static void PerformStressEdits( var items = Enumerable.Range(1, editCount * maxChangeCount * maxRangeSize) .Select(id => new StressItem() { - Id = id, - Lifetime = randomizer.Bool() + Id = id, + Lifetime = randomizer.Bool() ? TimeSpan.FromTicks(randomizer.Long(minItemLifetime.Ticks, maxItemLifetime.Ticks)) : null }) @@ -736,9 +715,9 @@ private static void PerformStressEdits( { var changeReason = randomizer.WeightedRandom(changeReasons, updater.Count switch { - 0 => changeReasonWeightsWhenCountIs0, - 1 => changeReasonWeightsWhenCountIs1, - _ => changeReasonWeightsOtherwise + 0 => changeReasonWeightsWhenCountIs0, + 1 => changeReasonWeightsWhenCountIs1, + _ => changeReasonWeightsOtherwise }); switch (changeReason) diff --git a/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs b/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs index 781165835..f4c79a387 100644 --- a/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs +++ b/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs @@ -1,18 +1,10 @@ -using System; -using System.Linq; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class FilterControllerFixtureWithClearAndReplace : IDisposable { - private readonly ISubject> _filter; + private readonly ReactiveUI.Primitives.Signals.ISignal> _filter; private readonly ChangeSetAggregator _results; @@ -21,35 +13,35 @@ public class FilterControllerFixtureWithClearAndReplace : IDisposable public FilterControllerFixtureWithClearAndReplace() { _source = new SourceList(); - _filter = new BehaviorSubject>(p => p.Age > 20); + _filter = new ReactiveUI.Primitives.Signals.StateSignal>(p => p.Age > 20); _results = _source.Connect().Filter(_filter, ListFilterPolicy.ClearAndReplace).AsAggregator(); } /* Should be the same as standard lambda filter */ - [Fact] - public void AddMatched() + [Test] + public async Task AddMatched() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddNotMatched() + [Test] + public async Task AddNotMatched() { var person = new Person("Adult1", 10); _source.Add(person); - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void AddNotMatchedAndUpdateMatched() + [Test] + public async Task AddNotMatchedAndUpdateMatched() { const string key = "Adult1"; var notmatched = new Person(key, 19); @@ -62,47 +54,47 @@ public void AddNotMatchedAndUpdateMatched() updater.Add(matched); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].First().Range.First().Should().Be(matched, "Should be same person"); - _results.Data.Items[0].Should().Be(matched, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].First().Range.First()).IsEqualTo(matched).Because("Should be same person"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(matched).Because("Should be same person"); } - [Fact] - public void AttemptedRemovalOfANonExistentKeyWillBeIgnored() + [Test] + public async Task AttemptedRemovalOfANonExistentKeyWillBeIgnored() { _source.Remove(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "Should be 0 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be 0 updates"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should return 80 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should return 80 adds"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void BatchRemoves() + [Test] + public async Task BatchRemoves() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void BatchSuccessiveUpdates() + [Test] + public async Task BatchSuccessiveUpdates() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); foreach (var person in people) @@ -111,54 +103,55 @@ public void BatchSuccessiveUpdates() _source.Add(person1); } - _results.Messages.Count.Should().Be(80, "Should be 80 messages"); - _results.Data.Count.Should().Be(80, "Should be 80 in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(80).Because("Should be 80 messages"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 in the cache"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void ChangeFilter() + [Test] + public async Task ChangeFilter() { var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToList(); _source.AddRange(people); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); _filter.OnNext(p => p.Age <= 50); - _results.Data.Count.Should().Be(50, "Should be 50 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(50).Because("Should be 50 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); - _results.Data.Items.All(p => p.Age <= 50).Should().BeTrue(); + await Assert.That(_results.Data.Items.All(p => p.Age <= 50)).IsTrue(); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() { _source.Dispose(); _results.Dispose(); + _filter.Dispose(); } - [Fact] - public void ReevaluateFilter() + [Test] + public async Task ReevaluateFilter() { //re-evaluate for inline changes var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); foreach (var person in people) { @@ -167,10 +160,10 @@ public void ReevaluateFilter() _filter.OnNext(p => p.Age > 20); - _results.Data.Count.Should().Be(90); - _results.Messages.Count.Should().Be(2); - _results.Messages[1].Removes.Should().Be(80); - _results.Messages[1].Adds.Should().Be(90); + await Assert.That(_results.Data.Count).IsEqualTo(90); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80); + await Assert.That(_results.Messages[1].Adds).IsEqualTo(90); foreach (var person in people) { @@ -179,12 +172,12 @@ public void ReevaluateFilter() _filter.OnNext(p => p.Age > 20); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); - _results.Messages.Count.Should().Be(3, "Should be 3 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 update messages"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -192,15 +185,15 @@ public void Remove() _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { const string key = "Adult1"; @@ -213,12 +206,12 @@ public void SameKeyChanges() // updater.Remove(key); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(3, "Should be 3 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(3).Because("Should be 3 adds"); } - [Fact] - public void UpdateMatched() + [Test] + public async Task UpdateMatched() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -227,13 +220,13 @@ public void UpdateMatched() _source.Add(newperson); _source.Replace(newperson, updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[1].Replaced.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[1].Replaced).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void UpdateNotMatched() + [Test] + public async Task UpdateNotMatched() { const string key = "Adult1"; var newperson = new Person(key, 10); @@ -242,14 +235,14 @@ public void UpdateNotMatched() _source.Add(newperson); _source.Replace(newperson, updated); - _results.Messages.Count.Should().Be(0, "Should be no updates"); - _results.Data.Count.Should().Be(0, "Should nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should nothing cached"); } - [Fact] - public void VeryLargeDataSet() + [Test] + public async Task VeryLargeDataSet() { - var filter = new BehaviorSubject>(i => false); + var filter = new ReactiveUI.Primitives.Signals.StateSignal>(i => false); var source = new SourceList(); var result = source.Connect().Filter(filter, ListFilterPolicy.ClearAndReplace).AsObservableList(); diff --git a/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs b/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs index fb3b6e855..13fa61ede 100644 --- a/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs +++ b/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs @@ -1,18 +1,10 @@ -using System; -using System.Linq; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class FilterControllerFixtureWithDiffSet : IDisposable { - private readonly ISubject> _filter; + private readonly ReactiveUI.Primitives.Signals.ISignal> _filter; private readonly ChangeSetAggregator _results; @@ -21,35 +13,35 @@ public class FilterControllerFixtureWithDiffSet : IDisposable public FilterControllerFixtureWithDiffSet() { _source = new SourceList(); - _filter = new BehaviorSubject>(p => p.Age > 20); + _filter = new ReactiveUI.Primitives.Signals.StateSignal>(p => p.Age > 20); _results = _source.Connect().Filter(_filter).AsAggregator(); } /* Should be the same as standard lambda filter */ - [Fact] - public void AddMatched() + [Test] + public async Task AddMatched() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddNotMatched() + [Test] + public async Task AddNotMatched() { var person = new Person("Adult1", 10); _source.Add(person); - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void AddNotMatchedAndUpdateMatched() + [Test] + public async Task AddNotMatchedAndUpdateMatched() { const string key = "Adult1"; var notmatched = new Person(key, 19); @@ -62,47 +54,47 @@ public void AddNotMatchedAndUpdateMatched() updater.Add(matched); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].First().Range.First().Should().Be(matched, "Should be same person"); - _results.Data.Items[0].Should().Be(matched, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].First().Range.First()).IsEqualTo(matched).Because("Should be same person"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(matched).Because("Should be same person"); } - [Fact] - public void AttemptedRemovalOfANonExistentKeyWillBeIgnored() + [Test] + public async Task AttemptedRemovalOfANonExistentKeyWillBeIgnored() { _source.Remove(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "Should be 0 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be 0 updates"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should return 80 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should return 80 adds"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void BatchRemoves() + [Test] + public async Task BatchRemoves() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void BatchSuccessiveUpdates() + [Test] + public async Task BatchSuccessiveUpdates() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); foreach (var person in people) @@ -111,54 +103,55 @@ public void BatchSuccessiveUpdates() _source.Add(person1); } - _results.Messages.Count.Should().Be(80, "Should be 80 messages"); - _results.Data.Count.Should().Be(80, "Should be 80 in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(80).Because("Should be 80 messages"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 in the cache"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void ChangeFilter() + [Test] + public async Task ChangeFilter() { var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToList(); _source.AddRange(people); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); _filter.OnNext(p => p.Age <= 50); - _results.Data.Count.Should().Be(50, "Should be 50 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(50).Because("Should be 50 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); - _results.Data.Items.All(p => p.Age <= 50).Should().BeTrue(); + await Assert.That(_results.Data.Items.All(p => p.Age <= 50)).IsTrue(); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() { _source.Dispose(); _results.Dispose(); + _filter.Dispose(); } - [Fact] - public void ReevaluateFilter() + [Test] + public async Task ReevaluateFilter() { //re-evaluate for inline changes var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); foreach (var person in people) { @@ -167,9 +160,9 @@ public void ReevaluateFilter() _filter.OnNext(p => p.Age > 20); - _results.Data.Count.Should().Be(90, "Should be 90 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); - _results.Messages[1].Adds.Should().Be(10, "Should be 10 adds in the second message"); + await Assert.That(_results.Data.Count).IsEqualTo(90).Because("Should be 90 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); + await Assert.That(_results.Messages[1].Adds).IsEqualTo(10).Because("Should be 10 adds in the second message"); foreach (var person in people) { @@ -178,12 +171,12 @@ public void ReevaluateFilter() _filter.OnNext(p => p.Age > 20); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); - _results.Messages.Count.Should().Be(3, "Should be 3 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 update messages"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -191,15 +184,15 @@ public void Remove() _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { const string key = "Adult1"; @@ -212,12 +205,12 @@ public void SameKeyChanges() // updater.Remove(key); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(3, "Should be 3 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(3).Because("Should be 3 adds"); } - [Fact] - public void UpdateMatched() + [Test] + public async Task UpdateMatched() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -226,13 +219,13 @@ public void UpdateMatched() _source.Add(newperson); _source.Replace(newperson, updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[1].Replaced.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[1].Replaced).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void UpdateNotMatched() + [Test] + public async Task UpdateNotMatched() { const string key = "Adult1"; var newperson = new Person(key, 10); @@ -241,7 +234,7 @@ public void UpdateNotMatched() _source.Add(newperson); _source.Replace(newperson, updated); - _results.Messages.Count.Should().Be(0, "Should be no updates"); - _results.Data.Count.Should().Be(0, "Should nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should nothing cached"); } } diff --git a/src/DynamicData.Tests/List/FilterFixture.Base.cs b/src/DynamicData.Tests/List/FilterFixture.Base.cs index 3282e1fe8..21d911291 100644 --- a/src/DynamicData.Tests/List/FilterFixture.Base.cs +++ b/src/DynamicData.Tests/List/FilterFixture.Base.cs @@ -1,21 +1,13 @@ -using System; -using System.Linq; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public static partial class FilterFixture { public abstract class Base { - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ExcludedItemsAreRemoved_NoChangesAreMade(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ExcludedItemsAreRemoved_NoChangesAreMade(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceList(); @@ -30,65 +22,57 @@ public void ExcludedItemsAreRemoved_NoChangesAreMade(EmptyChangesetPolicy emptyC new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.RemoveMany(source.Items.Where(static item => !item.IsIncluded).ToArray()); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) { - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "only excluded items were manipulated", - config: options => options.WithStrictOrdering()); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("only excluded items were manipulated"); } else { - results.RecordedChangeSets.Skip(1).Should().BeEmpty("empty changesets should be suppressed"); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("empty changesets should be suppressed"); } - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ItemsAreAdded_MatchingItemsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ItemsAreAdded_MatchingItemsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceList(); - // UUT Intialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEmpty("no items have been added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.AddRange(new[] @@ -101,22 +85,20 @@ public void ItemsAreAdded_MatchingItemsPropagate(EmptyChangesetPolicy emptyChang new Item() { Id = 6, IsIncluded = false } }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ItemsAreMoved_MatchingMovementsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ItemsAreMoved_MatchingMovementsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceList(); - + source.AddRange(new[] { new Item() { Id = 1, IsIncluded = true }, @@ -127,38 +109,31 @@ public void ItemsAreMoved_MatchingMovementsPropagate(EmptyChangesetPolicy emptyC new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - // UUT Action: Moves for matching items, + // UUT Action: Moves for matching items, source.Edit(items => { items.Move(2, 0); items.Move(1, 5); }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source opreation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been moved, accordingly", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source opreation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been moved, accordingly"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Moves for excluded items source.Edit(items => @@ -167,25 +142,23 @@ public void ItemsAreMoved_MatchingMovementsPropagate(EmptyChangesetPolicy emptyC items.Move(3, 5); }); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (emptyChangesetPolicy is EmptyChangesetPolicy.IncludeEmptyChangesets) { - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source opreation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "no matching items were moved", - config: options => options.WithStrictOrdering()); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source opreation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no matching items were moved"); } else { - results.RecordedChangeSets.Skip(2).Should().BeEmpty("empty changesets should be suppressed"); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("empty changesets should be suppressed"); } - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceList(); @@ -200,21 +173,19 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (add items) foreach (var item in source.Items) @@ -222,12 +193,11 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy source.Refresh(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedChangeSets.ElementAt(1).ShouldHaveRefreshed(source.Items.Take(3), "all unchanged items should have been refreshed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await results.RecordedChangeSets.ElementAt(1).ShouldHaveRefreshed(source.Items.Take(3), "all unchanged items should have been refreshed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (remove items) foreach (var item in source.Items.Take(3)) @@ -235,17 +205,17 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed(EmptyChangesetPolicy source.Refresh(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedChangeSets.ElementAt(2).ShouldHaveRefreshed(source.Items.Skip(3), "all unchanged items should have been refreshed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await results.RecordedChangeSets.ElementAt(2).ShouldHaveRefreshed(source.Items.Skip(3), "all unchanged items should have been refreshed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - public void ItemsAreReplaced_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + public async Task ItemsAreReplaced_ItemsAreReFiltered(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceList(); @@ -260,23 +230,19 @@ public void ItemsAreReplaced_ItemsAreReFiltered(EmptyChangesetPolicy emptyChange new Item() { Id = 6, IsIncluded = false } }); - // UUT Intialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have propagated", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (add and replace items) source.Edit(items => @@ -289,13 +255,10 @@ public void ItemsAreReplaced_ItemsAreReFiltered(EmptyChangesetPolicy emptyChange source.ReplaceAt(5, new Item() { Id = 6, IsIncluded = true }); }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all newly-matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all newly-matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (remove and replace items) source.Edit(items => @@ -308,18 +271,16 @@ public void ItemsAreReplaced_ItemsAreReFiltered(EmptyChangesetPolicy emptyChange source.ReplaceAt(5, new Item() { Id = 6, IsIncluded = true }); }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all newly-excluded items should have been removed", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(EmptyChangesetPolicy.IncludeEmptyChangesets)] - [InlineData(EmptyChangesetPolicy.SuppressEmptyChangesets)] - public void MatchingItemsAreRemoved_RemovalsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) + [Test] + [Arguments(EmptyChangesetPolicy.IncludeEmptyChangesets)] + [Arguments(EmptyChangesetPolicy.SuppressEmptyChangesets)] + public async Task MatchingItemsAreRemoved_RemovalsPropagate(EmptyChangesetPolicy emptyChangesetPolicy) { // Setup using var source = new TestSourceList(); @@ -334,37 +295,33 @@ public void MatchingItemsAreRemoved_RemovalsPropagate(EmptyChangesetPolicy empty new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: emptyChangesetPolicy is EmptyChangesetPolicy.SuppressEmptyChangesets) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have propagated", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.RemoveMany(source.Items.Where(Item.FilterByIsIncluded).ToArray()); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEmpty("all matching items were removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEmpty().Because("all matching items were removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceFails_ErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceFails_ErrorPropagates(SourceType sourceType) { using var source = new TestSourceList(); @@ -374,9 +331,9 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) source.SetError(error); using var subscription = BuildUut( - source: source.Connect(), - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: true) + source: source.Connect(), + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: true) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); @@ -384,30 +341,29 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) if (sourceType is SourceType.Asynchronous) source.SetError(error); - results.Error.Should().Be(error); + await Assert.That(results.Error).IsEqualTo(error); if (sourceType is SourceType.Asynchronous) { - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEmpty("no source items were added"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no source items were added"); } else { - results.RecordedChangeSets.Should().BeEmpty("an error occurred during initialization"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during initialization"); } } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => BuildUut( - source: null!, - predicate: Item.FilterByIsIncluded, - suppressEmptyChangeSets: true)) - .Should() - .Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => BuildUut( + source: null!, + predicate: Item.FilterByIsIncluded, + suppressEmptyChangeSets: true)) + .Throws(); protected abstract IObservable> BuildUut( - IObservable> source, - Func predicate, - bool suppressEmptyChangeSets); + IObservable> source, + Func predicate, + bool suppressEmptyChangeSets); } } diff --git a/src/DynamicData.Tests/List/FilterFixture.Static.cs b/src/DynamicData.Tests/List/FilterFixture.Static.cs index 927deae5d..8ef85d92e 100644 --- a/src/DynamicData.Tests/List/FilterFixture.Static.cs +++ b/src/DynamicData.Tests/List/FilterFixture.Static.cs @@ -1,21 +1,11 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public static partial class FilterFixture { public class Static { - [Fact] - public void DuplicateItemsAreAdded_ItemsAreTrackedSeparately() + [Test] + public async Task DuplicateItemsAreAdded_ItemsAreTrackedSeparately() { // Setup using var source = new TestSourceList(); @@ -30,7 +20,6 @@ public void DuplicateItemsAreAdded_ItemsAreTrackedSeparately() 2 }); - // UUT Initialization using var subscription = source.Connect() .Filter(static item => (item % 2) is 0) @@ -38,51 +27,41 @@ public void DuplicateItemsAreAdded_ItemsAreTrackedSeparately() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "there were initial items to publish"); - results.RecordedItems.Should().BeEquivalentTo(new[] { 2, 4, 2 }, - because: "all matching items should have been added", - config: options => options.WithoutStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("there were initial items to publish"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 2, 4, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Remove(2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().ContainSingle("an operation was performed upon an included item"); - results.RecordedItems.Should().BeEquivalentTo(new[] { 4, 2 }, - because: "only one of the duplicate items was removed", - config: options => options.WithoutStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).HasSingleItem().Because("an operation was performed upon an included item"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 4, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("only one of the duplicate items was removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - // UUT Action source.Remove(3); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("an operation was performed upon an excluded item"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("an operation was performed upon an excluded item"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - // UUT Action source.Remove(2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().ContainSingle("an operation was performed upon an included item"); - results.RecordedItems.Should().BeEquivalentTo(new[] { 4 }, - because: "the second duplicate item was removed", - config: options => options.WithoutStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).HasSingleItem().Because("an operation was performed upon an included item"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 4 }, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the second duplicate item was removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void ExcludedItemIsAdded_NoChangesAreMade() + + [Test] + public async Task ExcludedItemIsAdded_NoChangesAreMade() { // Setup using var source = new TestSourceList(); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -90,22 +69,21 @@ public void ExcludedItemIsAdded_NoChangesAreMade() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to publish"); - results.RecordedItems.Should().BeEmpty("no items have been added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to publish"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Add(new Item() { Id = 1, IsIncluded = false }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("empty changesets should be suppressed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("empty changesets should be suppressed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void ExcludedItemIsRemoved_NoChangesAreMade() + + [Test] + public async Task ExcludedItemIsRemoved_NoChangesAreMade() { // Setup using var source = new TestSourceList(); @@ -120,7 +98,6 @@ public void ExcludedItemIsRemoved_NoChangesAreMade() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -128,24 +105,21 @@ public void ExcludedItemIsRemoved_NoChangesAreMade() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.RemoveAt(5); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("empty changesets should be suppressed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("empty changesets should be suppressed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void ExcludedItemsAreRemoved_NoChangesAreMade() + [Test] + public async Task ExcludedItemsAreRemoved_NoChangesAreMade() { // Setup using var source = new TestSourceList(); @@ -160,7 +134,6 @@ public void ExcludedItemsAreRemoved_NoChangesAreMade() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -168,29 +141,25 @@ public void ExcludedItemsAreRemoved_NoChangesAreMade() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.RemoveMany(source.Items.Where(static item => !item.IsIncluded).ToArray()); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("empty changesets should be suppressed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("empty changesets should be suppressed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void ItemsAreAdded_MatchingItemsPropagate() + [Test] + public async Task ItemsAreAdded_MatchingItemsPropagate() { // Setup using var source = new TestSourceList(); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -198,11 +167,10 @@ public void ItemsAreAdded_MatchingItemsPropagate() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to publish"); - results.RecordedItems.Should().BeEmpty("no items have been added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to publish"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.AddRange(new[] @@ -215,20 +183,18 @@ public void ItemsAreAdded_MatchingItemsPropagate() new Item() { Id = 6, IsIncluded = false } }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void ItemsAreMoved_MatchingMovementsPropagate() + [Test] + public async Task ItemsAreMoved_MatchingMovementsPropagate() { // Setup using var source = new TestSourceList(); - + source.AddRange(new[] { new Item() { Id = 1, IsIncluded = true }, @@ -239,7 +205,6 @@ public void ItemsAreMoved_MatchingMovementsPropagate() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -247,28 +212,22 @@ public void ItemsAreMoved_MatchingMovementsPropagate() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); - // UUT Action: Moves for matching items, + // UUT Action: Moves for matching items, source.Edit(items => { items.Move(2, 0); items.Move(1, 5); }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been moved, accordingly", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been moved, accordingly"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Moves for excluded items source.Edit(items => @@ -277,13 +236,13 @@ public void ItemsAreMoved_MatchingMovementsPropagate() items.Move(3, 5); }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Should().BeEmpty("empty changesets should be suppressed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2)).IsEmpty().Because("empty changesets should be suppressed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed() + [Test] + public async Task ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed() { // Setup using var source = new TestSourceList(); @@ -298,7 +257,6 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -306,11 +264,10 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all matching items should have propagated"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (add items) foreach (var item in source.Items) @@ -318,12 +275,11 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed() source.Refresh(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedChangeSets.ElementAt(1).ShouldHaveRefreshed(source.Items.Take(3), "all unchanged items should have been refreshed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-matching items should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await results.RecordedChangeSets.ElementAt(1).ShouldHaveRefreshed(source.Items.Take(3), "all unchanged items should have been refreshed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (remove items) foreach (var item in source.Items.Take(3)) @@ -331,15 +287,15 @@ public void ItemsAreRefreshed_ItemsAreReFilteredOrRefreshed() source.Refresh(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedChangeSets.ElementAt(2).ShouldHaveRefreshed(source.Items.Skip(3), "all unchanged items should have been refreshed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), "all newly-excluded items should have been removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await results.RecordedChangeSets.ElementAt(2).ShouldHaveRefreshed(source.Items.Skip(3), "all unchanged items should have been refreshed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded)).Because("all newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void ItemsAreReplaced_ItemsAreReFiltered() + [Test] + public async Task ItemsAreReplaced_ItemsAreReFiltered() { // Setup using var source = new TestSourceList(); @@ -354,7 +310,6 @@ public void ItemsAreReplaced_ItemsAreReFiltered() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -362,13 +317,10 @@ public void ItemsAreReplaced_ItemsAreReFiltered() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have propagated", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (add and replace items) source.Edit(items => @@ -381,13 +333,10 @@ public void ItemsAreReplaced_ItemsAreReFiltered() items[5] = new Item() { Id = 6, IsIncluded = true }; }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all newly-matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all newly-matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action (remove and replace items) source.Edit(items => @@ -400,21 +349,18 @@ public void ItemsAreReplaced_ItemsAreReFiltered() items[5] = new Item() { Id = 6, IsIncluded = true }; }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all newly-excluded items should have been removed", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all newly-excluded items should have been removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void MatchingItemIsAdded_ItemPropagates() + [Test] + public async Task MatchingItemIsAdded_ItemPropagates() { // Setup using var source = new TestSourceList(); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -422,23 +368,22 @@ public void MatchingItemIsAdded_ItemPropagates() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to publish"); - results.RecordedItems.Should().BeEmpty("no items have been added to the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to publish"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been added to the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.Add(new Item() { Id = 1, IsIncluded = true }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, "the matching item should have been added"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items).Because("the matching item should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - - [Fact] - public void MatchingItemIsRemoved_RemovalPropagates() + + [Test] + public async Task MatchingItemIsRemoved_RemovalPropagates() { // Setup using var source = new TestSourceList(); @@ -453,7 +398,6 @@ public void MatchingItemIsRemoved_RemovalPropagates() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -461,28 +405,23 @@ public void MatchingItemIsRemoved_RemovalPropagates() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have been added", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have been added"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var removedItem = source.Items[2]; source.RemoveAt(2); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Should().ContainSingle("1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "a matching item was removed", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1)).HasSingleItem().Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("a matching item was removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void MatchingItemsAreRemoved_RemovalsPropagate() + [Test] + public async Task MatchingItemsAreRemoved_RemovalsPropagate() { // Setup using var source = new TestSourceList(); @@ -497,7 +436,6 @@ public void MatchingItemsAreRemoved_RemovalsPropagate() new Item() { Id = 6, IsIncluded = false } }); - // UUT Initialization using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -505,35 +443,31 @@ public void MatchingItemsAreRemoved_RemovalsPropagate() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial changeset should propagate"); - results.RecordedItems.Should().BeEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), - because: "all matching items should have propagated", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial changeset should propagate"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items.Where(Item.FilterByIsIncluded), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all matching items should have propagated"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action source.RemoveMany(source.Items.Where(Item.FilterByIsIncluded).ToArray()); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEmpty("all matching items were removed"); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEmpty().Because("all matching items were removed"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Fact] - public void PredicateIsNull_ThrowsException() - => FluentActions.Invoking(static () => ObservableListEx.Filter( - source: Observable.Empty>(), - predicate: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletes_CompletionPropagates(SourceType sourceType) + [Test] + public async Task PredicateIsNull_ThrowsException() + => await Assert.That(static () => ObservableListEx.Filter( + source: Observable.Empty>(), + predicate: null!)) + .Throws(); + + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletes_CompletionPropagates(SourceType sourceType) { // Setup using var source = new TestSourceList(); @@ -546,7 +480,6 @@ public void SourceCompletes_CompletionPropagates(SourceType sourceType) if (sourceType is SourceType.Immediate) source.Complete(); - // UUT Initialization & Action using var subscription = source.Connect() .Filter(Item.FilterByIsIncluded) @@ -557,16 +490,16 @@ public void SourceCompletes_CompletionPropagates(SourceType sourceType) if (sourceType is SourceType.Asynchronous) source.Complete(); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "the initial item should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, "the initial item should have been published"); - results.HasCompleted.Should().BeTrue("the source has completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial item should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items).Because("the initial item should have been published"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceFails_ErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceFails_ErrorPropagates(SourceType sourceType) { using var source = new TestSourceList(); @@ -589,32 +522,30 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) if (sourceType is SourceType.Asynchronous) source.SetError(error); - results.Error.Should().Be(error); + await Assert.That(results.Error).IsEqualTo(error); if (sourceType is SourceType.Asynchronous) { - results.RecordedChangeSets.Count.Should().Be(1, "the initial item should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, "the initial item should have been published"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the initial item should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items).Because("the initial item should have been published"); } else { - results.RecordedChangeSets.Should().BeEmpty("an error occurred during initialization"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during initialization"); } } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(static () => ObservableListEx.Filter( - source: null!, - predicate: Item.FilterByIsIncluded)) - .Should() - .Throw(); + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(static () => ObservableListEx.Filter( + source: null!, + predicate: Item.FilterByIsIncluded)) + .Throws(); - [Fact] - public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() + [Test] + public async Task SubscriptionIsDisposed_SubscriptionDisposalPropagates() { // Setup - using var source = new Subject>(); - + using var source = new ReactiveUI.Primitives.Signals.Signal>(); // UUT Initialization using var subscription = source @@ -623,16 +554,15 @@ public void SubscriptionIsDisposed_SubscriptionDisposalPropagates() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Should().BeEmpty("no initial changeset occurred"); - results.RecordedItems.Should().BeEmpty("the source has not initialized"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no initial changeset occurred"); + await Assert.That(results.RecordedItems).IsEmpty().Because("the source has not initialized"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action subscription.Dispose(); - source.HasObservers.Should().BeFalse("subscription disposal should propagate upstream"); + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should propagate upstream"); } } } diff --git a/src/DynamicData.Tests/List/FilterFixture.WithPredicateState.cs b/src/DynamicData.Tests/List/FilterFixture.WithPredicateState.cs index d3f28efd3..3b6d240fb 100644 --- a/src/DynamicData.Tests/List/FilterFixture.WithPredicateState.cs +++ b/src/DynamicData.Tests/List/FilterFixture.WithPredicateState.cs @@ -1,17 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading; -using System.Threading.Tasks; - using Bogus; -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; -using Xunit.Abstractions; namespace DynamicData.Tests.List; @@ -19,50 +6,41 @@ public partial class FilterFixture { public sealed class WithPredicateState { - private readonly ITestOutputHelper _output; - - public WithPredicateState(ITestOutputHelper output) - => _output = output; - - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilterPolicy filterPolicy) { - using var source = new TestSourceList(); - using var predicateState = new Subject(); + using var source = new TestSourceList(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Connect() .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - // Set initial state predicateState.OnNext(new()); - results.RecordedChangeSets.Should().BeEmpty("no source operations have been performed"); - + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations have been performed"); // Test Add, with an included item var item1 = new Item() { Id = 1, IsIncluded = true }; source.Add(item1); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed, with one included item added"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed, with one included item added"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Add, with an excluded item var item2 = new Item() { Id = 2, IsIncluded = false }; source.Add(item2); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("one source operation was performed, but no included items were affected"); - + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("one source operation was performed, but no included items were affected"); // Test AddRange, with both included and excluded items var item3 = new Item() { Id = 3, IsIncluded = false }; @@ -73,18 +51,16 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter var item8 = new Item() { Id = 8, IsIncluded = true }; source.AddRange(new[] { item3, item4, item5, item6, item7, item8 }); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed, with 3 included items added"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed, with 3 included items added"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Refresh, with no item mutations. source.Refresh(Enumerable.Range(0, source.Count)); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "one source operation was performed, with all included items affected"); - results.RecordedChangeSets.Skip(2).First().Select(static change => change.Reason).Should().AllBeEquivalentTo(ListChangeReason.Refresh, "all included items should have been refreshed"); - results.RecordedChangeSets.Skip(2).First().Select(static change => change.Item.Current).Should().BeEquivalentTo(EnumerateFilteredItems(), "all included items should have been refreshed"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("one source operation was performed, with all included items affected"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Select(static change => change.Reason)).All(static reason => reason == ListChangeReason.Refresh).Because("all included items should have been refreshed"); + await Assert.That(results.RecordedChangeSets.Skip(2).First().Select(static change => change.Item.Current)).IsEquivalentTo(EnumerateFilteredItems()).Because("all included items should have been refreshed"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Refresh, with item mutations affecting filtering. item1.IsIncluded = !item1.IsIncluded; @@ -93,30 +69,26 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter item6.IsIncluded = !item6.IsIncluded; source.Refresh(Enumerable.Range(0, source.Count)); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "one source operation was performed, with items being included and excluded"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("one source operation was performed, with items being included and excluded"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Remove, with an included item source.RemoveAt(3); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "one source operation was performed, with one included item affected"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("one source operation was performed, with one included item affected"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Remove, with an excluded item source.RemoveAt(3); - results.RecordedChangeSets.Skip(5).Should().BeEmpty("one source operation was performed, but no included items were affected"); + await Assert.That(results.RecordedChangeSets.Skip(5)).IsEmpty().Because("one source operation was performed, but no included items were affected"); - // Test Remove, with both included and excluded items source.RemoveRange(index: 2, count: 2); - results.RecordedChangeSets.Skip(5).Count().Should().Be(1, "one source operation was performed, with one included item affected"); - ShouldBeValid(results, EnumerateFilteredItems()); + await Assert.That(results.RecordedChangeSets.Skip(5).Count()).IsEqualTo(1).Because("one source operation was performed, with one included item affected"); + await ShouldBeValid(results, EnumerateFilteredItems()); - // Test Replace, not affecting filtering var item9 = new Item() { Id = 9, IsIncluded = false }; var item10 = new Item() { Id = 10, IsIncluded = true }; @@ -126,9 +98,8 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter updater.Replace(item8, item10); }); - results.RecordedChangeSets.Skip(6).Count().Should().Be(1, "one source operation was performed, with one included item affected"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(6).Count()).IsEqualTo(1).Because("one source operation was performed, with one included item affected"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Replace, affecting filtering var item11 = new Item() { Id = 11, IsIncluded = true }; @@ -139,9 +110,8 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter updater.Replace(item10, item12); }); - results.RecordedChangeSets.Skip(7).Count().Should().Be(1, "one source operation was performed, with one included item affected"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(7).Count()).IsEqualTo(1).Because("one source operation was performed, with one included item affected"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Move of an included item, relative to another included item var item13 = new Item() { Id = 13, IsIncluded = true }; @@ -151,15 +121,14 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter switch (filterPolicy) { case ListFilterPolicy.CalculateDiff: - results.RecordedChangeSets.Skip(8).Count().Should().Be(2, "two source operations were performed"); + await Assert.That(results.RecordedChangeSets.Skip(8).Count()).IsEqualTo(2).Because("two source operations were performed"); break; case ListFilterPolicy.ClearAndReplace: - results.RecordedChangeSets.Skip(8).Count().Should().Be(1, "two source operations were performed, one of which was a move, which are not propagated, as ordering is not preserved"); + await Assert.That(results.RecordedChangeSets.Skip(8).Count()).IsEqualTo(1).Because("two source operations were performed, one of which was a move, which are not propagated, as ordering is not preserved"); break; } - ShouldBeValid(results, EnumerateFilteredItems()); - + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Move of an excluded item source.Move(4, 2); @@ -167,30 +136,28 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter switch (filterPolicy) { case ListFilterPolicy.CalculateDiff: - results.RecordedChangeSets.Skip(10).Count().Should().Be(1, "one source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(10).Count()).IsEqualTo(1).Because("one source operation was performed"); break; case ListFilterPolicy.ClearAndReplace: - results.RecordedChangeSets.Skip(9).Should().BeEmpty("one source operation was performed, a move, which are not propagated, as ordering is not preserved"); + await Assert.That(results.RecordedChangeSets.Skip(9)).IsEmpty().Because("one source operation was performed, a move, which are not propagated, as ordering is not preserved"); break; } - // Test Clear, with included items source.Clear(); switch (filterPolicy) { case ListFilterPolicy.CalculateDiff: - results.RecordedChangeSets.Skip(11).Count().Should().Be(1, "one source operation was performed, with all included items affected"); + await Assert.That(results.RecordedChangeSets.Skip(11).Count()).IsEqualTo(1).Because("one source operation was performed, with all included items affected"); break; case ListFilterPolicy.ClearAndReplace: - results.RecordedChangeSets.Skip(9).Count().Should().Be(1, "one source operation was performed, with all included items affected"); + await Assert.That(results.RecordedChangeSets.Skip(9).Count()).IsEqualTo(1).Because("one source operation was performed, with all included items affected"); break; } - ShouldBeValid(results, EnumerateFilteredItems()); - + await ShouldBeValid(results, EnumerateFilteredItems()); // Test Clear, with only excluded items source.Add(new Item() { Id = 14, IsIncluded = false }); @@ -199,45 +166,42 @@ public void ChangesAreMadeAfterInitialPredicateState_ItemsAreFiltered(ListFilter switch (filterPolicy) { case ListFilterPolicy.CalculateDiff: - results.RecordedChangeSets.Skip(12).Should().BeEmpty("two source operations were performed, and neither affected included items"); + await Assert.That(results.RecordedChangeSets.Skip(12)).IsEmpty().Because("two source operations were performed, and neither affected included items"); break; case ListFilterPolicy.ClearAndReplace: - results.RecordedChangeSets.Skip(10).Should().BeEmpty("two source operations were performed, and neither affected included items"); + await Assert.That(results.RecordedChangeSets.Skip(10)).IsEmpty().Because("two source operations were performed, and neither affected included items"); break; } - ShouldBeValid(results, EnumerateFilteredItems()); - + await ShouldBeValid(results, EnumerateFilteredItems()); IEnumerable EnumerateFilteredItems() => source.Items.Where(static item => item.IsIncluded); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void ChangesAreMadeAfterMultiplePredicateStateChanges_ItemsAreFilteredWithLatestPredicateState(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task ChangesAreMadeAfterMultiplePredicateStateChanges_ItemsAreFilteredWithLatestPredicateState(ListFilterPolicy filterPolicy) { - using var source = new SourceList(); - using var predicateState = new BehaviorSubject(1); + using var source = new SourceList(); + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(1); using var subscription = source .Connect() .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.Id == predicateState, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.Id == predicateState, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - // Publish multiple state changes predicateState.OnNext(2); predicateState.OnNext(3); - results.RecordedChangeSets.Should().BeEmpty("no source operations have been performed"); - + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations have been performed"); // Test filtering of items, by state source.AddRange(new[] @@ -248,31 +212,29 @@ public void ChangesAreMadeAfterMultiplePredicateStateChanges_ItemsAreFilteredWit new Item() { Id = 4, IsIncluded = false } }); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed"); - ShouldBeValid(results, source.Items.Where(item => item.Id == predicateState.Value)); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed"); + await ShouldBeValid(results, source.Items.Where(item => item.Id == predicateState.Value)); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void ChangesAreMadeBeforeInitialPredicateState_ItemsAreFilteredOnPredicateState(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task ChangesAreMadeBeforeInitialPredicateState_ItemsAreFilteredOnPredicateState(ListFilterPolicy filterPolicy) { - using var source = new TestSourceList(); - using var predicateState = new Subject(); + using var source = new TestSourceList(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Connect() .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - - results.RecordedChangeSets.Should().BeEmpty("no source operations have been performed"); - + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations have been performed"); // Test Add, with an included item var item1 = new Item() { Id = 1, IsIncluded = true }; @@ -306,10 +268,10 @@ public void ChangesAreMadeBeforeInitialPredicateState_ItemsAreFilteredOnPredicat // Test Remove, with an excluded item source.RemoveAt(3); - + // Test Remove, with both included and excluded items source.RemoveRange(index: 2, count: 2); - + // Test Replace, not affecting filtering var item9 = new Item() { Id = 9, IsIncluded = false }; var item10 = new Item() { Id = 10, IsIncluded = true }; @@ -336,33 +298,31 @@ public void ChangesAreMadeBeforeInitialPredicateState_ItemsAreFilteredOnPredicat // Test Move of an excluded item source.Move(4, 2); - results.RecordedChangeSets.Should().BeEmpty("the predicate state has not initialized"); - + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("the predicate state has not initialized"); // Set initial state predicateState.OnNext(new()); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed"); - ShouldBeValid(results, source.Items.Where(static item => item.IsIncluded)); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed"); + await ShouldBeValid(results, source.Items.Where(static item => item.IsIncluded)); } - [Fact] - public void FilterPolicyIsClearAndReplace_ReFilteringPreservesOrder() + [Test] + public async Task FilterPolicyIsClearAndReplace_ReFilteringPreservesOrder() { - using var source = new SourceList(); - using var predicateState = new BehaviorSubject(1); + using var source = new SourceList(); + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(1); using var subscription = source .Connect() .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.Id == predicateState, - filterPolicy: ListFilterPolicy.ClearAndReplace) + predicate: static (predicateState, item) => item.Id == predicateState, + filterPolicy: ListFilterPolicy.ClearAndReplace) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - // Test filtering of items, by state source.AddRange(new[] { @@ -378,45 +338,43 @@ public void FilterPolicyIsClearAndReplace_ReFilteringPreservesOrder() new Item() { Id = 10, IsIncluded = true } }); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed"); // Capture the current set of filtered items, and publish a state change, to force a re-filter var priorFilteredItems = results.RecordedItems.ToArray(); predicateState.OnNext(1); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - ShouldBeValid(results, source.Items.Where(item => item.Id == predicateState.Value)); - results.RecordedItems.Should().BeEquivalentTo(priorFilteredItems, options => options.WithStrictOrdering()); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await ShouldBeValid(results, source.Items.Where(item => item.Id == predicateState.Value)); + await Assert.That(results.RecordedItems).IsEquivalentTo(priorFilteredItems, TUnit.Assertions.Enums.CollectionOrdering.Matching); } - [Fact] - public void PredicateIsNull_ExceptionIsThrown() - => FluentActions.Invoking(() => Observable.Empty>() + [Test] + public async Task PredicateIsNull_ExceptionIsThrown() + => await Assert.That(() => Observable.Empty>() .Filter( predicateState: Observable.Empty(), - predicate: null!)) - .Should() - .Throw(); - - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void PredicateStateChanges_ItemsAreReFiltered(ListFilterPolicy filterPolicy) + predicate: null!)) + .Throws(); + + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task PredicateStateChanges_ItemsAreReFiltered(ListFilterPolicy filterPolicy) { - using var source = new SourceList(); - using var predicateState = new BehaviorSubject(1); + using var source = new SourceList(); + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(1); using var subscription = source .Connect() .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.Id == predicateState, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.Id == predicateState, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - // Test filtering of items, by state source.AddRange(new[] { @@ -426,156 +384,151 @@ public void PredicateStateChanges_ItemsAreReFiltered(ListFilterPolicy filterPoli new Item() { Id = 4, IsIncluded = false } }); - results.RecordedChangeSets.Count.Should().Be(1, "one source operation was performed"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("one source operation was performed"); + await ShouldBeValid(results, EnumerateFilteredItems()); // Publish a state change, to change the filtering predicateState.OnNext(2); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "one source operation was performed"); - ShouldBeValid(results, EnumerateFilteredItems()); - + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("one source operation was performed"); + await ShouldBeValid(results, EnumerateFilteredItems()); IEnumerable EnumerateFilteredItems() => source.Items.Where(item => item.Id == predicateState.Value); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void PredicateStateCompletesAfterInitialValue_CompletionWaitsForSourceCompletion(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task PredicateStateCompletesAfterInitialValue_CompletionWaitsForSourceCompletion(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .Filter( predicateState: Observable.Return(new object()), - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.HasCompleted.Should().BeFalse("changes could still be generated by the source"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by the source"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); source.OnCompleted(); - results.HasCompleted.Should().BeTrue("all input streams have completed"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all input streams have completed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void PredicateStateCompletesImmediately_CompletionIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task PredicateStateCompletesImmediately_CompletionIsPropagated(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); using var subscription = source .Filter( predicateState: Observable.Empty(), - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.HasCompleted.Should().BeTrue("completion of the predicate state stream before it emits any values means that items can never be accepted by the filter predicate"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("completion of the predicate state stream before it emits any values means that items can never be accepted by the filter predicate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - source.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(source.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void PredicateStateErrors_ErrorIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task PredicateStateErrors_ErrorIsPropagated(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); - using var predicateState = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - var error = new Exception("This is a test."); predicateState.OnError(error); - results.Error.Should().Be(error, "errors should be propagated"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.Error).IsEqualTo(error).Because("errors should be propagated"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - source.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); - predicateState.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(source.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void PredicateStateErrorsImmediately_ErrorIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task PredicateStateErrorsImmediately_ErrorIsPropagated(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception("This is a test."); using var subscription = source .Filter( predicateState: Observable.Throw(error), - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().Be(error, "errors should be propagated"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.Error).IsEqualTo(error).Because("errors should be propagated"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - source.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(source.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Fact] - public void PredicateStateIsNull_ExceptionIsThrown() - => FluentActions.Invoking(() => Observable.Empty>() + [Test] + public async Task PredicateStateIsNull_ExceptionIsThrown() + => await Assert.That(() => Observable.Empty>() .Filter( predicateState: (null as IObservable)!, - predicate: static (_, _) => true)) - .Should() - .Throw(); + predicate: static (_, _) => true)) + .Throws(); - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] public async Task SourceAndPredicateStateNotifyFromDifferentThreads_FilteringIsThreadSafe(ListFilterPolicy filterPolicy) { var randomizer = new Randomizer(0x1234567); (var items, var changeSets) = GenerateStressItemsAndChangeSets( - editCount: 5_000, + editCount: 5_000, maxChangeCount: 20, - maxRangeSize: 10, - randomizer: randomizer); - + maxRangeSize: 10, + randomizer: randomizer); + var predicateStates = GenerateRandomPredicateStates( valueCount: 5_000, randomizer: randomizer); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); - using var source = new Subject>(); - - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( predicateState: predicateState, - predicate: Item.FilterByIdInclusionMask, - filterPolicy: filterPolicy) + predicate: Item.FilterByIdInclusionMask, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); @@ -597,64 +550,64 @@ public async Task SourceAndPredicateStateNotifyFromDifferentThreads_FilteringIsT await Task.WhenAll( Task.Run( - action: () => + action: () => { foreach (var changeSet in changeSets) source.OnNext(changeSet); }, - cancellationToken: timeoutSource.Token), + cancellationToken: timeoutSource.Token), Task.Run( - action: () => + action: () => { foreach (var value in predicateStates) predicateState.OnNext(value); }, - cancellationToken: timeoutSource.Token)); + cancellationToken: timeoutSource.Token)); var finalPredicateState = predicateStates[^1]; - ShouldBeValid(results, items.Where(item => Item.FilterByIdInclusionMask(finalPredicateState, item))); + await ShouldBeValid(results, items.Where(item => Item.FilterByIdInclusionMask(finalPredicateState, item))); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void SourceCompletesWhenEmpty_CompletionIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task SourceCompletesWhenEmpty_CompletionIsPropagated(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); source.OnCompleted(); - results.HasCompleted.Should().BeTrue("no further changes can occur when there are no items to be filtered or unfiltered"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("no further changes can occur when there are no items to be filtered or unfiltered"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - predicateState.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void SourceCompletesWhenNotEmpty_CompletionWaitsForStateCompletion(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task SourceCompletesWhenNotEmpty_CompletionWaitsForStateCompletion(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); @@ -662,160 +615,154 @@ public void SourceCompletesWhenNotEmpty_CompletionWaitsForStateCompletion(ListFi source.OnNext(new ChangeSet() { new(reason: ListChangeReason.Add, current: new Item() { Id = 1, IsIncluded = true }, index: 0) }); source.OnCompleted(); - results.HasCompleted.Should().BeFalse("changes could still be generated by changes in predicate state"); - results.RecordedChangeSets.Should().BeEmpty("the predicate has not initialized"); + await Assert.That(results.HasCompleted).IsFalse().Because("changes could still be generated by changes in predicate state"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("the predicate has not initialized"); predicateState.OnCompleted(); - results.HasCompleted.Should().BeTrue("all input streams have completed"); - results.RecordedChangeSets.Should().BeEmpty("the predicate never initialized"); + await Assert.That(results.HasCompleted).IsTrue().Because("all input streams have completed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("the predicate never initialized"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void SourceCompletesImmediately_CompletionIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task SourceCompletesImmediately_CompletionIsPropagated(ListFilterPolicy filterPolicy) { - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = Observable.Empty>() .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.HasCompleted.Should().BeTrue("no further changes can occur when there are no items to be filtered or unfiltered"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.HasCompleted).IsTrue().Because("no further changes can occur when there are no items to be filtered or unfiltered"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - predicateState.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void SourceErrors_ErrorIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task SourceErrors_ErrorIsPropagated(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - var error = new Exception("This is a test."); source.OnError(error); - results.Error.Should().Be(error, "errors should be propagated"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.Error).IsEqualTo(error).Because("errors should be propagated"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - source.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); - predicateState.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(source.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void SourceErrorsImmediately_ErrorIsPropagated(ListFilterPolicy filterPolicy) + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task SourceErrorsImmediately_ErrorIsPropagated(ListFilterPolicy filterPolicy) { - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); var error = new Exception("This is a test."); using var subscription = Observable.Throw>(error) .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().Be(error, "errors should be propagated"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.Error).IsEqualTo(error).Because("errors should be propagated"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); - predicateState.HasObservers.Should().BeFalse("all subscriptions should have been disposed, during finalization of the stream"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("all subscriptions should have been disposed, during finalization of the stream"); } - [Fact] - public void SourceIsNull_ExceptionIsThrown() - => FluentActions.Invoking(() => ObservableListEx.Filter( - source: (null as IObservable>)!, + [Test] + public async Task SourceIsNull_ExceptionIsThrown() + => await Assert.That(() => ObservableListEx.Filter( + source: (null as IObservable>)!, predicateState: Observable.Empty(), - predicate: static (_, _) => true)) - .Should() - .Throw(); - - [Theory] - [InlineData(ListFilterPolicy.CalculateDiff)] - [InlineData(ListFilterPolicy.ClearAndReplace)] - public void SubscriptionIsDisposed_UnsubscriptionIsPropagated(ListFilterPolicy filterPolicy) + predicate: static (_, _) => true)) + .Throws(); + + [Test] + [Arguments(ListFilterPolicy.CalculateDiff)] + [Arguments(ListFilterPolicy.ClearAndReplace)] + public async Task SubscriptionIsDisposed_UnsubscriptionIsPropagated(ListFilterPolicy filterPolicy) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - filterPolicy: filterPolicy) + predicate: static (predicateState, item) => item.IsIncluded, + filterPolicy: filterPolicy) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - subscription.Dispose(); - source.HasObservers.Should().BeFalse("subscription disposal should be propagated to all input streams"); - predicateState.HasObservers.Should().BeFalse("subscription disposal should be propagated to all input streams"); + await Assert.That(source.HasObservers).IsFalse().Because("subscription disposal should be propagated to all input streams"); + await Assert.That(predicateState.HasObservers).IsFalse().Because("subscription disposal should be propagated to all input streams"); - results.RecordedChangeSets.Should().BeEmpty("no source operations were performed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no source operations were performed"); } - [Theory] - [InlineData("source", "predicateState")] - [InlineData("predicateState", "source")] - public void SuppressEmptyChangeSetsIsFalse_EmptyChangesetsArePropagatedAndOnlyFinalCompletionIsPropagated(params string[] completionOrder) + [Test] + [Arguments("source", "predicateState")] + [Arguments("predicateState", "source")] + public async Task SuppressEmptyChangeSetsIsFalse_EmptyChangesetsArePropagatedAndOnlyFinalCompletionIsPropagated(params string[] completionOrder) { - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); - using var predicateState = new Subject(); + using var predicateState = new ReactiveUI.Primitives.Signals.Signal(); using var subscription = source .Filter( - predicateState: predicateState, - predicate: static (predicateState, item) => item.IsIncluded, - suppressEmptyChangeSets: false) + predicateState: predicateState, + predicate: static (predicateState, item) => item.IsIncluded, + suppressEmptyChangeSets: false) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - // Initialize the predicate predicateState.OnNext(new object()); - results.RecordedChangeSets.Count.Should().Be(1, "the predicate state was initialized"); - results.RecordedChangeSets[0].Should().BeEmpty("there are no items in the collection"); - ShouldBeValid(results, Enumerable.Empty()); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("the predicate state was initialized"); + await Assert.That(results.RecordedChangeSets[0]).IsEmpty().Because("there are no items in the collection"); + await ShouldBeValid(results, Enumerable.Empty()); // Publish an empty changeset source.OnNext(ChangeSet.Empty); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "a source operation was performed"); - results.RecordedChangeSets.Skip(1).First().Should().BeEmpty("the source changeset was empty"); - ShouldBeValid(results, Enumerable.Empty()); - + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("a source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(1).First()).IsEmpty().Because("the source changeset was empty"); + await ShouldBeValid(results, Enumerable.Empty()); // Publish a changeset with only excluded items source.OnNext(new ChangeSet() @@ -830,9 +777,9 @@ public void SuppressEmptyChangeSetsIsFalse_EmptyChangesetsArePropagatedAndOnlyFi index: 0) }); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "a source operation was performed"); - results.RecordedChangeSets.Skip(2).First().Should().BeEmpty("all source items were excluded"); - ShouldBeValid(results, Enumerable.Empty()); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("a source operation was performed"); + await Assert.That(results.RecordedChangeSets.Skip(2).First()).IsEmpty().Because("all source items were excluded"); + await ShouldBeValid(results, Enumerable.Empty()); for (var i = 0; i < completionOrder.Length; ++i) { @@ -848,26 +795,26 @@ public void SuppressEmptyChangeSetsIsFalse_EmptyChangesetsArePropagatedAndOnlyFi } if (i < (completionOrder.Length - 1)) - results.HasCompleted.Should().BeFalse("not all input streams have completed"); + await Assert.That(results.HasCompleted).IsFalse().Because("not all input streams have completed"); } - results.HasCompleted.Should().BeTrue("all input streams have completed"); + await Assert.That(results.HasCompleted).IsTrue().Because("all input streams have completed"); } - private static void ShouldBeValid( + private static async Task ShouldBeValid( ListItemRecordingObserver results, - IEnumerable expectedFilteredItems) + IEnumerable expectedFilteredItems) { - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("no completion events should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(expectedFilteredItems, "all filtered items should match the filter predicate"); + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("no completion events should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(expectedFilteredItems).Because("all filtered items should match the filter predicate"); } private static (IList items, IReadOnlyList> changeSets) GenerateStressItemsAndChangeSets( - int editCount, - int maxChangeCount, - int maxRangeSize, - Randomizer randomizer) + int editCount, + int maxChangeCount, + int maxRangeSize, + Randomizer randomizer) { var changeReasons = new[] { @@ -1002,8 +949,8 @@ private static (IList items, IReadOnlyList> changeSets) G } private static IReadOnlyList GenerateRandomPredicateStates( - int valueCount, - Randomizer randomizer) + int valueCount, + Randomizer randomizer) { var values = new List(capacity: valueCount); @@ -1016,10 +963,10 @@ private static IReadOnlyList GenerateRandomPredicateStates( private class Item { public static bool FilterByIdInclusionMask( - int idInclusionMask, - Item item) + int idInclusionMask, + Item item) => ((item.Id & idInclusionMask) == 0) && item.IsIncluded; - + public required int Id { get; init; } public bool IsIncluded { get; set; } diff --git a/src/DynamicData.Tests/List/FilterFixture.cs b/src/DynamicData.Tests/List/FilterFixture.cs index e5fe3b776..7eb973857 100644 --- a/src/DynamicData.Tests/List/FilterFixture.cs +++ b/src/DynamicData.Tests/List/FilterFixture.cs @@ -1,4 +1,4 @@ -namespace DynamicData.Tests.List; +namespace DynamicData.Tests.List; public static partial class FilterFixture { @@ -23,8 +23,8 @@ public static bool FilterByIsIncluded(Item item) => item.IsIncluded; public static bool FilterByIdInclusionMask( - int idInclusionMask, - Item item) + int idInclusionMask, + Item item) => ((item.Id & idInclusionMask) == 0) && item.IsIncluded; public required int Id { get; init; } diff --git a/src/DynamicData.Tests/List/FilterOnObservableFixture.cs b/src/DynamicData.Tests/List/FilterOnObservableFixture.cs index 8cb3e152b..e85fc5764 100644 --- a/src/DynamicData.Tests/List/FilterOnObservableFixture.cs +++ b/src/DynamicData.Tests/List/FilterOnObservableFixture.cs @@ -1,33 +1,25 @@ -using System; -using System.Linq; -using System.Reactive.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; //TODO: To optimise this, we need to introduce replace range, or specify a buffer public class FilterOnObservableFixture { - [Fact] - public void ChangeAValueSoItIsStillInTheFilter() + [Test] + public async Task ChangeAValueSoItIsStillInTheFilter() { var people = Enumerable.Range(1, 100).Select(i => new PersonObs("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); people[50].SetAge(100); - stub.Results.Data.Count.Should().Be(82); + await Assert.That(stub.Results.Data.Count).IsEqualTo(82); // initial add range, refreshes to filter out < 18 and then no refresh for the no-op filter change - // stub.Results.Messages.Count.Should().Be(102); + // stub.Results.Messages.Count should be 102. } - [Fact] - public void ChangeAValueToMatchFilter() + [Test] + public async Task ChangeAValueToMatchFilter() { var people = Enumerable.Range(1, 100).Select(i => new PersonObs("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); @@ -36,71 +28,71 @@ public void ChangeAValueToMatchFilter() people[20].SetAge(10); // should have 100-18-1 left - stub.Results.Data.Count.Should().Be(81); + await Assert.That(stub.Results.Data.Count).IsEqualTo(81); // initial addrange, refreshes to filter out < 18 and then refresh for the filter change - // stub.Results.Messages.Count.Should().Be(1+18+1); + // stub.Results.Messages.Count should be 1 + 18 + 1. } - [Fact] - public void ChangeAValueToNoLongerMatchFilter() + [Test] + public async Task ChangeAValueToNoLongerMatchFilter() { var people = Enumerable.Range(1, 100).Select(i => new PersonObs("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); // should have 100-18 left - stub.Results.Data.Count.Should().Be(82); + await Assert.That(stub.Results.Data.Count).IsEqualTo(82); - // stub.Results.Messages.Count.Should().Be(1+18); + // stub.Results.Messages.Count should be 1 + 18. people[10].SetAge(20); // should have 82+1 left - stub.Results.Data.Count.Should().Be(83); + await Assert.That(stub.Results.Data.Count).IsEqualTo(83); // initial addrange, refreshes to filter out < 18 and then one refresh for the filter change - // stub.Results.Messages.Count.Should().Be(1+18+1); + // stub.Results.Messages.Count should be 1 + 18 + 1. } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(i => new PersonObs("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); stub.Source.Clear(); - stub.Results.Data.Count.Should().Be(0); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0); } - [Fact] - public void InitialValues() + [Test] + public async Task InitialValues() { var people = Enumerable.Range(1, 100).Select(i => new PersonObs("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); // should have 100-18 left - stub.Results.Data.Count.Should().Be(82); + await Assert.That(stub.Results.Data.Count).IsEqualTo(82); // initial addrange, refreshes to filter out < 18 - // stub.Results.Messages.Count.Should().Be(1+18); + // stub.Results.Messages.Count should be 1 + 18. - stub.Results.Data.Items.Should().BeEquivalentTo(people.Skip(18)); + await Assert.That(stub.Results.Data.Items).IsEquivalentTo(people.Skip(18)); } - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var people = Enumerable.Range(1, 100).Select(i => new PersonObs("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); stub.Source.RemoveRange(89, 10); - stub.Results.Data.Count.Should().Be(72); + await Assert.That(stub.Results.Data.Count).IsEqualTo(72); // initial addrange, refreshes to filter out < 18 and then removerange - // stub.Results.Messages.Count.Should().Be(1+18+1); + // stub.Results.Messages.Count should be 1 + 18 + 1. } private class FilterPropertyStub : IDisposable diff --git a/src/DynamicData.Tests/List/FilterOnPropertyFixture.cs b/src/DynamicData.Tests/List/FilterOnPropertyFixture.cs index 9d9dbfe03..cd0eead4a 100644 --- a/src/DynamicData.Tests/List/FilterOnPropertyFixture.cs +++ b/src/DynamicData.Tests/List/FilterOnPropertyFixture.cs @@ -1,30 +1,23 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class FilterOnPropertyFixture { - [Fact] - public void ChangeAValueSoItIsStillInTheFilter() + [Test] + public async Task ChangeAValueSoItIsStillInTheFilter() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); people[50].Age = 100; - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Data.Count.Should().Be(82); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Data.Count).IsEqualTo(82); } - [Fact] - public void ChangeAValueToMatchFilter() + [Test] + public async Task ChangeAValueToMatchFilter() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); @@ -32,12 +25,12 @@ public void ChangeAValueToMatchFilter() people[20].Age = 10; - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Data.Count.Should().Be(81); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Data.Count).IsEqualTo(81); } - [Fact] - public void ChangeAValueToNoLongerMatchFilter() + [Test] + public async Task ChangeAValueToNoLongerMatchFilter() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); @@ -45,43 +38,43 @@ public void ChangeAValueToNoLongerMatchFilter() people[10].Age = 20; - stub.Results.Messages.Count.Should().Be(2); - stub.Results.Data.Count.Should().Be(83); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(2); + await Assert.That(stub.Results.Data.Count).IsEqualTo(83); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); stub.Source.Clear(); - stub.Results.Data.Count.Should().Be(0); + await Assert.That(stub.Results.Data.Count).IsEqualTo(0); } - [Fact] - public void InitialValues() + [Test] + public async Task InitialValues() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); - stub.Results.Messages.Count.Should().Be(1); - stub.Results.Data.Count.Should().Be(82); + await Assert.That(stub.Results.Messages.Count).IsEqualTo(1); + await Assert.That(stub.Results.Data.Count).IsEqualTo(82); - stub.Results.Data.Items.Should().BeEquivalentTo(people.Skip(18)); + await Assert.That(stub.Results.Data.Items).IsEquivalentTo(people.Skip(18)); } - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); using var stub = new FilterPropertyStub(); stub.Source.AddRange(people); stub.Source.RemoveRange(89, 10); - stub.Results.Data.Count.Should().Be(72); + await Assert.That(stub.Results.Data.Count).IsEqualTo(72); } private class FilterPropertyStub : IDisposable diff --git a/src/DynamicData.Tests/List/FilterWithObservable.cs b/src/DynamicData.Tests/List/FilterWithObservable.cs index 9a71359c5..9154011b2 100644 --- a/src/DynamicData.Tests/List/FilterWithObservable.cs +++ b/src/DynamicData.Tests/List/FilterWithObservable.cs @@ -1,20 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +#else using DynamicData.Aggregation; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class FilterWithObservable : IDisposable { - private readonly BehaviorSubject> _filter; + private readonly ReactiveUI.Primitives.Signals.StateSignal> _filter; private readonly ChangeSetAggregator _results; @@ -23,35 +18,35 @@ public class FilterWithObservable : IDisposable public FilterWithObservable() { _source = new SourceList(); - _filter = new BehaviorSubject>(p => p.Age > 20); + _filter = new ReactiveUI.Primitives.Signals.StateSignal>(p => p.Age > 20); _results = _source.Connect().Filter(_filter).AsAggregator(); } /* Should be the same as standard lambda filter */ - [Fact] - public void AddMatched() + [Test] + public async Task AddMatched() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddNotMatched() + [Test] + public async Task AddNotMatched() { var person = new Person("Adult1", 10); _source.Add(person); - _results.Messages.Count.Should().Be(0, "Should have no item updates"); - _results.Data.Count.Should().Be(0, "Cache should have no items"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should have no item updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Cache should have no items"); } - [Fact] - public void AddNotMatchedAndUpdateMatched() + [Test] + public async Task AddNotMatchedAndUpdateMatched() { const string key = "Adult1"; var notmatched = new Person(key, 19); @@ -64,47 +59,47 @@ public void AddNotMatchedAndUpdateMatched() updater.Add(matched); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].First().Range.First().Should().Be(matched, "Should be same person"); - _results.Data.Items[0].Should().Be(matched, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].First().Range.First()).IsEqualTo(matched).Because("Should be same person"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(matched).Because("Should be same person"); } - [Fact] - public void AttemptedRemovalOfANonExistentKeyWillBeIgnored() + [Test] + public async Task AttemptedRemovalOfANonExistentKeyWillBeIgnored() { _source.Remove(new Person("A", 1)); - _results.Messages.Count.Should().Be(0, "Should be 0 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be 0 updates"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should return 80 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should return 80 adds"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void BatchRemoves() + [Test] + public async Task BatchRemoves() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void BatchSuccessiveUpdates() + [Test] + public async Task BatchSuccessiveUpdates() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); foreach (var person in people) @@ -113,16 +108,16 @@ public void BatchSuccessiveUpdates() _source.Add(person1); } - _results.Messages.Count.Should().Be(80, "Should be 80 messages"); - _results.Data.Count.Should().Be(80, "Should be 80 in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(80).Because("Should be 80 messages"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 in the cache"); var filtered = people.Where(p => p.Age > 20).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(filtered, "Incorrect Filter result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(filtered).Because("Incorrect Filter result"); } - [Fact] - public void ChainFilters() + [Test] + public async Task ChainFilters() { - var filter2 = new BehaviorSubject>(person1 => person1.Age > 20); + var filter2 = new ReactiveUI.Primitives.Signals.StateSignal>(person1 => person1.Age > 20); var stream = _source.Connect().Filter(_filter).Filter(filter2); @@ -135,35 +130,35 @@ public void ChainFilters() person.Age = 10; _filter.OnNext(_filter.Value); - captureList.Should().BeEquivalentTo(new[] { 1, 0 }); + await Assert.That(captureList).IsEquivalentTo(new[] { 1, 0 }); } - [Fact] - public void ChangeFilter() + [Test] + public async Task ChangeFilter() { var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToList(); _source.AddRange(people); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); _filter.OnNext(p => p.Age <= 50); - _results.Data.Count.Should().Be(50, "Should be 50 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(50).Because("Should be 50 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); - _results.Data.Items.All(p => p.Age <= 50).Should().BeTrue(); + await Assert.That(_results.Data.Items.All(p => p.Age <= 50)).IsTrue(); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(80, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(80, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(80).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(80).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() @@ -173,14 +168,14 @@ public void Dispose() _filter.Dispose(); } - [Fact] - public void ReevaluateFilter() + [Test] + public async Task ReevaluateFilter() { //re-evaluate for inline changes var people = Enumerable.Range(1, 100).Select(i => new Person("P" + i, i)).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); foreach (var person in people) { @@ -189,10 +184,10 @@ public void ReevaluateFilter() _filter.OnNext(_filter.Value); - _results.Data.Count.Should().Be(90, "Should be 90 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); - _results.Messages[1].Removes.Should().Be(0, "Should be 80 removes in the second message"); - _results.Messages[1].Adds.Should().Be(10, "Should be 10 adds in the second message"); + await Assert.That(_results.Data.Count).IsEqualTo(90).Because("Should be 90 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(0).Because("Should be 80 removes in the second message"); + await Assert.That(_results.Messages[1].Adds).IsEqualTo(10).Because("Should be 10 adds in the second message"); foreach (var person in people) { @@ -201,12 +196,12 @@ public void ReevaluateFilter() _filter.OnNext(_filter.Value); - _results.Data.Count.Should().Be(80, "Should be 80 people in the cache"); - _results.Messages.Count.Should().Be(3, "Should be 3 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(80).Because("Should be 80 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 update messages"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -214,45 +209,45 @@ public void Remove() _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void RemoveFiltered() + [Test] + public async Task RemoveFiltered() { var person = new Person("P1", 1); _source.Add(person); - _results.Data.Count.Should().Be(0, "Should be 0 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 people in the cache"); _filter.OnNext(p => p.Age >= 1); - _results.Data.Count.Should().Be(1, "Should be 1 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 people in the cache"); _source.Remove(person); - _results.Data.Count.Should().Be(0, "Should be 0 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 people in the cache"); } - [Fact] - public void RemoveFilteredRange() + [Test] + public async Task RemoveFilteredRange() { var people = Enumerable.Range(1, 10).Select(i => new Person("P" + i, i)).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(0, "Should be 0 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 people in the cache"); _filter.OnNext(p => p.Age > 5); - _results.Data.Count.Should().Be(5, "Should be 5 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(5).Because("Should be 5 people in the cache"); _source.RemoveRange(5, 5); - _results.Data.Count.Should().Be(0, "Should be 0 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 people in the cache"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { const string key = "Adult1"; @@ -265,12 +260,12 @@ public void SameKeyChanges() // updater.Remove(key); }); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(3, "Should be 3 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(3).Because("Should be 3 adds"); } - [Fact] - public void UpdateMatched() + [Test] + public async Task UpdateMatched() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -279,13 +274,13 @@ public void UpdateMatched() _source.Add(newperson); _source.Replace(newperson, updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[1].Replaced.Should().Be(1, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[1].Replaced).IsEqualTo(1).Because("Should be 1 update"); } - [Fact] - public void UpdateNotMatched() + [Test] + public async Task UpdateNotMatched() { const string key = "Adult1"; var newperson = new Person(key, 10); @@ -294,7 +289,7 @@ public void UpdateNotMatched() _source.Add(newperson); _source.Replace(newperson, updated); - _results.Messages.Count.Should().Be(0, "Should be no updates"); - _results.Data.Count.Should().Be(0, "Should nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(0).Because("Should be no updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should nothing cached"); } } diff --git a/src/DynamicData.Tests/List/ForEachChangeFixture.cs b/src/DynamicData.Tests/List/ForEachChangeFixture.cs index 589397d31..518886871 100644 --- a/src/DynamicData.Tests/List/ForEachChangeFixture.cs +++ b/src/DynamicData.Tests/List/ForEachChangeFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Collections.Generic; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class ForEachChangeFixture : IDisposable @@ -18,8 +15,8 @@ public class ForEachChangeFixture : IDisposable public void Dispose() => _source.Dispose(); - [Fact] - public void EachChangeInokesTheCallback() + [Test] + public async Task EachChangeInokesTheCallback() { var messages = new List>(); @@ -28,12 +25,12 @@ public void EachChangeInokesTheCallback() var people = new RandomPersonGenerator().Take(100); people.ForEach(_source.Add); - messages.Count.Should().Be(100); + await Assert.That(messages.Count).IsEqualTo(100); messageWriter.Dispose(); } - [Fact] - public void EachItemChangeInokesTheCallbac2() + [Test] + public async Task EachItemChangeInokesTheCallbac2() { var messages = new List>(); @@ -42,12 +39,12 @@ public void EachItemChangeInokesTheCallbac2() _source.InsertRange(new RandomPersonGenerator().Take(5), 2); _source.AddRange(new RandomPersonGenerator().Take(5)); - messages.Count.Should().Be(15); + await Assert.That(messages.Count).IsEqualTo(15); messageWriter.Dispose(); } - [Fact] - public void EachItemChangeInokesTheCallback() + [Test] + public async Task EachItemChangeInokesTheCallback() { var messages = new List>(); @@ -55,7 +52,7 @@ public void EachItemChangeInokesTheCallback() _source.AddRange(new RandomPersonGenerator().Take(100)); - messages.Count.Should().Be(100); + await Assert.That(messages.Count).IsEqualTo(100); messageWriter.Dispose(); } } diff --git a/src/DynamicData.Tests/List/FromAsyncFixture.cs b/src/DynamicData.Tests/List/FromAsyncFixture.cs index 2f1913c48..d763cee0d 100644 --- a/src/DynamicData.Tests/List/FromAsyncFixture.cs +++ b/src/DynamicData.Tests/List/FromAsyncFixture.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Threading.Tasks; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class FromAsyncFixture @@ -20,8 +8,8 @@ public class FromAsyncFixture public FromAsyncFixture() => _scheduler = new TestScheduler(); - [Fact] - public void CanLoadFromTask() + [Test] + public async Task CanLoadFromTask() { Task> Loader() { @@ -32,11 +20,11 @@ Task> Loader() var data = Observable.FromAsync((Func>>)Loader).ToObservableChangeSet().AsObservableList(); - data.Count.Should().Be(100); + await Assert.That(data.Count).IsEqualTo(100); } - [Fact] - public void HandlesErrorsInObservable() + [Test] + public async Task HandlesErrorsInObservable() { Task> Loader() { @@ -48,11 +36,11 @@ Task> Loader() var data = Observable.FromAsync((Func>>)Loader).ToObservableChangeSet().Subscribe((changes) => { }, ex => error = ex); - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } - [Fact] - public void HandlesErrorsObservableList() + [Test] + public async Task HandlesErrorsObservableList() { Task> Loader() { @@ -66,6 +54,6 @@ Task> Loader() var subscribed = data.Connect().Subscribe(changes => { }, ex => error = ex); - error.Should().NotBeNull(); + await Assert.That(error).IsNotNull(); } } diff --git a/src/DynamicData.Tests/List/GroupImmutableFixture.cs b/src/DynamicData.Tests/List/GroupImmutableFixture.cs index cbf674654..6f6296e06 100644 --- a/src/DynamicData.Tests/List/GroupImmutableFixture.cs +++ b/src/DynamicData.Tests/List/GroupImmutableFixture.cs @@ -1,76 +1,75 @@ -using System; -using System.Linq; -using System.Reactive; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DataList = DynamicData.Reactive.List; +#else +using DataList = DynamicData.List; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class GroupImmutableFixture : IDisposable { - private readonly ISubject _regrouper; + private readonly ReactiveUI.Primitives.Signals.ISignal _regrouper; - private readonly ChangeSetAggregator> _results; + private readonly ChangeSetAggregator> _results; private readonly ISourceList _source; public GroupImmutableFixture() { _source = new SourceList(); - _regrouper = new Subject(); + _regrouper = new ReactiveUI.Primitives.Signals.Signal(); _results = _source.Connect().GroupWithImmutableState(p => p.Age, _regrouper).AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { _source.Add(new Person("Person1", 20)); - _results.Data.Count.Should().Be(1, "Should be 1 add"); - _results.Messages.First().Adds.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 add"); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); } - [Fact] - public void ChanegMultipleGroups() + [Test] + public async Task ChanegMultipleGroups() { var initialPeople = Enumerable.Range(1, 10000).Select(i => new Person("Person" + i, i % 10)).ToArray(); _source.AddRange(initialPeople); - initialPeople.GroupBy(p => p.Age).ForEach( - group => - { - var grp = _results.Data.Items.First(g => g.Key.Equals(group.Key)); - grp.Items.Should().BeEquivalentTo(group.ToArray()); - }); + foreach (var group in initialPeople.GroupBy(p => p.Age)) + { + var grp = _results.Data.Items.First(g => g.Key.Equals(group.Key)); + await Assert.That(grp.Items).IsEquivalentTo(group.ToArray()); + } _source.RemoveMany(initialPeople.Take(15)); - initialPeople.Skip(15).GroupBy(p => p.Age).ForEach( - group => - { - var list = _results.Data.Items.First(p => p.Key == group.Key); - list.Items.Should().BeEquivalentTo(group); - }); + foreach (var group in initialPeople.Skip(15).GroupBy(p => p.Age)) + { + var list = _results.Data.Items.First(p => p.Key == group.Key); + await Assert.That(list.Items).IsEquivalentTo(group); + } - _results.Messages.Count.Should().Be(2); - _results.Messages.First().Adds.Should().Be(10); - _results.Messages.Skip(1).First().Replaced.Should().Be(10); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(10); + await Assert.That(_results.Messages.Skip(1).First().Replaced).IsEqualTo(10); } public void Dispose() { _source.Dispose(); _results.Dispose(); + _regrouper.Dispose(); } - [Fact] - public void FiresManyValueForBatchOfDifferentAdds() + [Test] + public async Task FiresManyValueForBatchOfDifferentAdds() { _source.Edit( updater => @@ -81,17 +80,17 @@ public void FiresManyValueForBatchOfDifferentAdds() updater.Add(new Person("Person4", 23)); }); - _results.Data.Count.Should().Be(4); - _results.Messages.Count.Should().Be(1); - _results.Messages.First().Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(4); + await Assert.That(_results.Messages.Count).IsEqualTo(1); + await Assert.That(_results.Messages.First().Count).IsEqualTo(1); foreach (var update in _results.Messages.First()) { - update.Reason.Should().Be(ListChangeReason.AddRange); + await Assert.That(update.Reason).IsEqualTo(ListChangeReason.AddRange); } } - [Fact] - public void FiresOnlyOnceForABatchOfUniqueValues() + [Test] + public async Task FiresOnlyOnceForABatchOfUniqueValues() { _source.Edit( updater => @@ -102,18 +101,18 @@ public void FiresOnlyOnceForABatchOfUniqueValues() updater.Add(new Person("Person4", 20)); }); - _results.Messages.Count.Should().Be(1); - _results.Messages.First().Adds.Should().Be(1); - _results.Data.Items[0].Count.Should().Be(4); + await Assert.That(_results.Messages.Count).IsEqualTo(1); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); + await Assert.That(_results.Data.Items[0].Count).IsEqualTo(4); } - [Fact] - public void Reevaluate() + [Test] + public async Task Reevaluate() { var initialPeople = Enumerable.Range(1, 10).Select(i => new Person("Person" + i, i % 2)).ToArray(); _source.AddRange(initialPeople); - _results.Messages.Count.Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); //do an inline update foreach (var person in initialPeople) @@ -124,61 +123,60 @@ public void Reevaluate() //signal operators to evaluate again _regrouper.OnNext(); - initialPeople.GroupBy(p => p.Age).ForEach( - groupContainer => - { - var grouping = _results.Data.Items.First(g => g.Key == groupContainer.Key); - grouping.Items.Should().BeEquivalentTo(groupContainer); - }); + foreach (var groupContainer in initialPeople.GroupBy(p => p.Age)) + { + var grouping = _results.Data.Items.First(g => g.Key == groupContainer.Key); + await Assert.That(grouping.Items).IsEquivalentTo(groupContainer); + } - _results.Data.Count.Should().Be(2); - _results.Messages.Count.Should().Be(2); + await Assert.That(_results.Data.Count).IsEqualTo(2); + await Assert.That(_results.Messages.Count).IsEqualTo(2); var secondMessage = _results.Messages.Skip(1).First(); - secondMessage.Removes.Should().Be(1); - secondMessage.Replaced.Should().Be(1); - secondMessage.Adds.Should().Be(1); + await Assert.That(secondMessage.Removes).IsEqualTo(1); + await Assert.That(secondMessage.Replaced).IsEqualTo(1); + await Assert.That(secondMessage.Adds).IsEqualTo(1); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var person = new Person("Person1", 20); _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Messages.Count).IsEqualTo(2); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void UpdateAnItemWillChangedThegroup() + [Test] + public async Task UpdateAnItemWillChangedThegroup() { var person1 = new Person("Person1", 20); _source.Add(person1); _source.Replace(person1, new Person("Person1", 21)); - _results.Data.Count.Should().Be(1); - _results.Messages.First().Adds.Should().Be(1); - _results.Messages.Skip(1).First().Adds.Should().Be(1); - _results.Messages.Skip(1).First().Removes.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); + await Assert.That(_results.Messages.Skip(1).First().Adds).IsEqualTo(1); + await Assert.That(_results.Messages.Skip(1).First().Removes).IsEqualTo(1); var group = _results.Data.Items[0]; - group.Count.Should().Be(1); + await Assert.That(group.Count).IsEqualTo(1); - group.Key.Should().Be(21); + await Assert.That(group.Key).IsEqualTo(21); } - [Fact] - public void UpdatesArePermissible() + [Test] + public async Task UpdatesArePermissible() { _source.Add(new Person("Person1", 20)); _source.Add(new Person("Person2", 20)); - _results.Data.Count.Should().Be(1); //1 group - _results.Messages.First().Adds.Should().Be(1); - _results.Messages.Skip(1).First().Replaced.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); //1 group + await Assert.That(_results.Messages.First().Adds).IsEqualTo(1); + await Assert.That(_results.Messages.Skip(1).First().Replaced).IsEqualTo(1); var group = _results.Data.Items[0]; - group.Count.Should().Be(2); + await Assert.That(group.Count).IsEqualTo(2); } } diff --git a/src/DynamicData.Tests/List/GroupOnFixture.cs b/src/DynamicData.Tests/List/GroupOnFixture.cs index 61164d3c3..e0d72b430 100644 --- a/src/DynamicData.Tests/List/GroupOnFixture.cs +++ b/src/DynamicData.Tests/List/GroupOnFixture.cs @@ -1,12 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class GroupOnFixture : IDisposable @@ -21,21 +14,21 @@ public GroupOnFixture() _results = _source.Connect().GroupOn(p => p.Age).AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); var firstGroup = _results.Data.Items[0].List.Items.ToArray(); - firstGroup[0].Should().Be(person, "Should be same person"); + await Assert.That(firstGroup[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void BigList() + [Test] + public async Task BigList() { var generator = new RandomPersonGenerator(); var people = generator.Take(10000).ToArray(); @@ -50,28 +43,28 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var person = new Person("Adult1", 50); _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 1 updates"); - _results.Data.Count.Should().Be(0, "Should be no groups"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be no groups"); } - [Fact] - public void UpdateWillChangeTheGroup() + [Test] + public async Task UpdateWillChangeTheGroup() { var person = new Person("Adult1", 50); var amended = new Person("Adult1", 60); _source.Add(person); _source.ReplaceAt(0, amended); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); var firstGroup = _results.Data.Items[0].List.Items.ToArray(); - firstGroup[0].Should().Be(amended, "Should be same person"); + await Assert.That(firstGroup[0]).IsEqualTo(amended).Because("Should be same person"); } } diff --git a/src/DynamicData.Tests/List/GroupOnPropertyFixture.cs b/src/DynamicData.Tests/List/GroupOnPropertyFixture.cs index aa9442888..0d290268a 100644 --- a/src/DynamicData.Tests/List/GroupOnPropertyFixture.cs +++ b/src/DynamicData.Tests/List/GroupOnPropertyFixture.cs @@ -1,18 +1,20 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DataList = DynamicData.Reactive.List; +#else +using DataList = DynamicData.List; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class GroupOnPropertyFixture : IDisposable { - private readonly ChangeSetAggregator> _results; + private readonly ChangeSetAggregator> _results; private readonly ISourceList _source; @@ -22,21 +24,21 @@ public GroupOnPropertyFixture() _results = _source.Connect().GroupOnPropertyWithImmutableState(p => p.Age).AsAggregator(); } - [Fact] - public void CanGroupOnAdds() + [Test] + public async Task CanGroupOnAdds() { _source.Add(new Person("A", 10)); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Count.Should().Be(1); - firstGroup.Key.Should().Be(10); + await Assert.That(firstGroup.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(10); } - [Fact] - public void CanHandleAddBatch() + [Test] + public async Task CanHandleAddBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(1000).ToArray(); @@ -44,11 +46,11 @@ public void CanHandleAddBatch() _source.AddRange(people); var expectedGroupCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(expectedGroupCount); + await Assert.That(_results.Data.Count).IsEqualTo(expectedGroupCount); } - [Fact] - public void CanHandleChangedItemsBatch() + [Test] + public async Task CanHandleChangedItemsBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(100).ToArray(); @@ -56,27 +58,27 @@ public void CanHandleChangedItemsBatch() _source.AddRange(people); var initialCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(initialCount); + await Assert.That(_results.Data.Count).IsEqualTo(initialCount); people.Take(25).ForEach(p => p.Age = 200); var changedCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(changedCount); + await Assert.That(_results.Data.Count).IsEqualTo(changedCount); //check that each item is only in one cache var peopleInCache = _results.Data.Items.SelectMany(g => g.Items).ToArray(); - peopleInCache.Length.Should().Be(100); + await Assert.That(peopleInCache.Length).IsEqualTo(100); } - [Fact] - public void CanRemoveFromGroup() + [Test] + public async Task CanRemoveFromGroup() { var person = new Person("A", 10); _source.Add(person); _source.Remove(person); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() @@ -85,17 +87,17 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Regroup() + [Test] + public async Task Regroup() { var person = new Person("A", 10); _source.Add(person); person.Age = 20; - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Count.Should().Be(1); - firstGroup.Key.Should().Be(20); + await Assert.That(firstGroup.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(20); } } diff --git a/src/DynamicData.Tests/List/GroupOnPropertyWithImmutableStateFixture.cs b/src/DynamicData.Tests/List/GroupOnPropertyWithImmutableStateFixture.cs index 0f55473d4..e1611e87e 100644 --- a/src/DynamicData.Tests/List/GroupOnPropertyWithImmutableStateFixture.cs +++ b/src/DynamicData.Tests/List/GroupOnPropertyWithImmutableStateFixture.cs @@ -1,18 +1,20 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DataList = DynamicData.Reactive.List; +#else +using DataList = DynamicData.List; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class GroupOnPropertyWithImmutableStateFixture : IDisposable { - private readonly ChangeSetAggregator> _results; + private readonly ChangeSetAggregator> _results; private readonly ISourceList _source; @@ -22,21 +24,21 @@ public GroupOnPropertyWithImmutableStateFixture() _results = _source.Connect().GroupOnPropertyWithImmutableState(p => p.Age).AsAggregator(); } - [Fact] - public void CanGroupOnAdds() + [Test] + public async Task CanGroupOnAdds() { _source.Add(new Person("A", 10)); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Count.Should().Be(1); - firstGroup.Key.Should().Be(10); + await Assert.That(firstGroup.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(10); } - [Fact] - public void CanHandleAddBatch() + [Test] + public async Task CanHandleAddBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(1000).ToArray(); @@ -44,11 +46,11 @@ public void CanHandleAddBatch() _source.AddRange(people); var expectedGroupCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(expectedGroupCount); + await Assert.That(_results.Data.Count).IsEqualTo(expectedGroupCount); } - [Fact] - public void CanHandleChangedItemsBatch() + [Test] + public async Task CanHandleChangedItemsBatch() { var generator = new RandomPersonGenerator(); var people = generator.Take(100).ToArray(); @@ -56,27 +58,27 @@ public void CanHandleChangedItemsBatch() _source.AddRange(people); var initialCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(initialCount); + await Assert.That(_results.Data.Count).IsEqualTo(initialCount); people.Take(25).ForEach(p => p.Age = 200); var changedCount = people.Select(p => p.Age).Distinct().Count(); - _results.Data.Count.Should().Be(changedCount); + await Assert.That(_results.Data.Count).IsEqualTo(changedCount); //check that each item is only in one cache var peopleInCache = _results.Data.Items.SelectMany(g => g.Items).ToArray(); - peopleInCache.Length.Should().Be(100); + await Assert.That(peopleInCache.Length).IsEqualTo(100); } - [Fact] - public void CanRemoveFromGroup() + [Test] + public async Task CanRemoveFromGroup() { var person = new Person("A", 10); _source.Add(person); _source.Remove(person); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() @@ -85,17 +87,17 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Regroup() + [Test] + public async Task Regroup() { var person = new Person("A", 10); _source.Add(person); person.Age = 20; - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); var firstGroup = _results.Data.Items[0]; - firstGroup.Count.Should().Be(1); - firstGroup.Key.Should().Be(20); + await Assert.That(firstGroup.Count).IsEqualTo(1); + await Assert.That(firstGroup.Key).IsEqualTo(20); } } diff --git a/src/DynamicData.Tests/List/ListEdgeCoverageFixture.cs b/src/DynamicData.Tests/List/ListEdgeCoverageFixture.cs new file mode 100644 index 000000000..31a447e17 --- /dev/null +++ b/src/DynamicData.Tests/List/ListEdgeCoverageFixture.cs @@ -0,0 +1,329 @@ +namespace DynamicData.Tests.List; + +public class ListEdgeCoverageFixture +{ + [Test] + public async Task DynamicXorRechecksMembershipWhenSourceIsAddedAndRemoved() + { + using var first = new SourceList(); + using var second = new SourceList(); + using var sources = new SourceList>(); + using var results = sources.Xor().AsAggregator(); + + sources.Add(first); + first.Add(1); + sources.Add(second); + second.Add(1); + sources.Remove(second); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(results.Messages[2].Adds).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1 }); + } + + [Test] + public async Task DynamicExceptRechecksFirstSourceItemsWhenOtherSourceIsAddedAndRemoved() + { + using var first = new SourceList(); + using var second = new SourceList(); + using var sources = new SourceList>(); + using var results = sources.Except().AsAggregator(); + + first.Add(1); + second.Add(1); + + sources.Add(first); + sources.Add(second); + sources.Remove(second); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(results.Messages[2].Adds).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1 }); + } + + [Test] + public async Task DynamicCombinerIgnoresFailedChildrenAndKeepsHealthyChildrenActive() + { + using var failedChild = new ReactiveUI.Primitives.Signals.Signal>(); + using var healthyChild = new SourceList(); + using var sources = new SourceList>>(); + using var results = sources.Or().AsAggregator(); + + sources.Add(failedChild); + sources.Add(healthyChild.Connect()); + failedChild.OnError(new InvalidOperationException("child failed")); + healthyChild.Add(42); + + await Assert.That(results.Exception).IsNull(); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 42 }); + await Assert.That(results.Messages).HasSingleItem(); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + } + + [Test] + public async Task TransformAsyncTransformOnRefreshUsesPreviousValue() + { + using var source = new TestSourceList(); + var calls = new List(); + using var results = source.Connect() + .TransformAsync( + (value, previous, index, _) => + { + calls.Add(previous.HasValue ? previous.Value : "none"); + return Task.FromResult($"{value}:{index}"); + }, + transformOnRefresh: true) + .AsAggregator(); + + source.Add(1); + source.Refresh(0); + + await Assert.That(calls).IsEquivalentTo(new[] { "none", "1:0" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Replaced).IsEqualTo(1); + } + + [Test] + public async Task TransformAsyncClearAndRemoveRangeUpdateTransformedState() + { + using var source = new SourceList(); + using var results = source.Connect() + .TransformAsync((value, _, index, _) => Task.FromResult($"{value}:{index}")) + .AsAggregator(); + + source.AddRange(new[] { 1, 2, 3, 4 }); + source.RemoveRange(1, 2); + source.Clear(); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[1].Removes).IsEqualTo(2); + await Assert.That(results.Messages[2].Removes).IsEqualTo(2); + await Assert.That(results.Data.Items).IsEmpty(); + } + + [Test] + public async Task DynamicFilterRefreshPromotesRefreshesAndDemotesItems() + { + using var source = new TestSourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Connect().Filter(predicates).AsAggregator(); + + var item = new EdgeItem("one", "A", included: false); + source.Add(item); + + item.Included = true; + source.Refresh(0); + source.Refresh(0); + item.Included = false; + source.Refresh(0); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Refreshes).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEmpty(); + } + + [Test] + public async Task DynamicFilterPredicateReplacementAfterRefreshUsesLatestMatchState() + { + using var source = new TestSourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Connect().Filter(predicates).AsAggregator(); + + var item = new EdgeItem("one", "A", included: true); + source.Add(item); + source.Refresh(0); + predicates.OnNext(static _ => false); + predicates.OnNext(static item => item.Included); + + await Assert.That(results.Messages.Count).IsEqualTo(4); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Refreshes).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Messages[3].Adds).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item }); + } + + [Test] + public async Task DynamicFilterMixedRefreshBatchForwardsAndDemotes() + { + using var source = new TestSourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Connect().Filter(predicates).AsAggregator(); + + var retained = new EdgeItem("retained", "A", included: true); + var demoted = new EdgeItem("demoted", "A", included: true); + source.AddRange(new[] { retained, demoted }); + + demoted.Included = false; + source.Refresh(new[] { 0, 1 }); + + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(2); + await Assert.That(results.Messages[1].Refreshes).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { retained }); + } + + [Test] + public async Task DynamicFilterReplaceHandlesMatchTransitions() + { + using var source = new SourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Connect().Filter(predicates).AsAggregator(); + + var excluded = new EdgeItem("excluded", "A", included: false); + var included = new EdgeItem("included", "A", included: true); + var stillIncluded = new EdgeItem("still included", "A", included: true); + var excludedAgain = new EdgeItem("excluded again", "A", included: false); + + source.Add(excluded); + source.ReplaceAt(0, included); + source.ReplaceAt(0, stillIncluded); + source.ReplaceAt(0, excludedAgain); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEmpty(); + } + + [Test] + public async Task DynamicFilterRefreshMatchStateDrivesFollowingReplace() + { + using var source = new TestSourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Connect().Filter(predicates).AsAggregator(); + + var promoted = new EdgeItem("promoted", "A", included: false); + var replacementAfterPromotion = new EdgeItem("replacement after promotion", "A", included: true); + var replacementAfterDemotion = new EdgeItem("replacement after demotion", "A", included: true); + + source.Add(promoted); + promoted.Included = true; + source.Refresh(0); + source.ReplaceAt(0, replacementAfterPromotion); + replacementAfterPromotion.Included = false; + source.Refresh(0); + source.ReplaceAt(0, replacementAfterDemotion); + + await Assert.That(results.Messages.Count).IsEqualTo(4); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Messages[3].Adds).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { replacementAfterDemotion }); + } + + [Test] + public async Task DynamicFilterRefreshThenReplaceInSameBatchUsesUpdatedMatchState() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Filter(predicates).AsAggregator(); + + var item = new EdgeItem("item", "A", included: false); + var replacement = new EdgeItem("replacement", "A", included: true); + + source.OnNext(new ChangeSet { new(ListChangeReason.Add, item, 0) }); + + item.Included = true; + source.OnNext(new ChangeSet + { + new(ListChangeReason.Refresh, item, 0), + new(ListChangeReason.Replace, replacement, ReactiveUI.Primitives.Optional.Create(item), 0, 0) + }); + + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Messages[0].Replaced).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { replacement }); + } + + [Test] + public async Task DynamicFilterExplicitEqualOrSameReferenceReplaceStaysReplace() + { + using var referenceSource = new SourceList(); + using var referencePredicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var referenceResults = referenceSource.Connect().Filter(referencePredicates).AsAggregator(); + + var item = new EdgeItem("same", "A", included: true); + referenceSource.Add(item); + referenceSource.ReplaceAt(0, item); + + await Assert.That(referenceResults.Messages.Count).IsEqualTo(2); + await Assert.That(referenceResults.Messages[0].Adds).IsEqualTo(1); + await Assert.That(referenceResults.Messages[1].Replaced).IsEqualTo(1); + await Assert.That(referenceResults.Messages[1].Refreshes).IsEqualTo(0); + + using var valueSource = new SourceList(); + using var valuePredicates = new ReactiveUI.Primitives.Signals.StateSignal>(static _ => true); + using var valueResults = valueSource.Connect().Filter(valuePredicates).AsAggregator(); + + valueSource.Add(1); + valueSource.ReplaceAt(0, 1); + + await Assert.That(valueResults.Messages.Count).IsEqualTo(2); + await Assert.That(valueResults.Messages[0].Adds).IsEqualTo(1); + await Assert.That(valueResults.Messages[1].Replaced).IsEqualTo(1); + await Assert.That(valueResults.Messages[1].Refreshes).IsEqualTo(0); + } + + [Test] + public async Task DynamicFilterRemoveRangeRemovesOnlyMatchedItems() + { + using var source = new SourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static item => item.Included); + using var results = source.Connect().Filter(predicates).AsAggregator(); + + source.AddRange(new[] + { + new EdgeItem("one", "A", included: true), + new EdgeItem("two", "A", included: false), + new EdgeItem("three", "A", included: true) + }); + + source.RemoveRange(0, 3); + + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(2); + await Assert.That(results.Messages[1].Removes).IsEqualTo(2); + await Assert.That(results.Data.Items).IsEmpty(); + } + + [Test] + public async Task GroupOperatorsRemoveEmptyGroupsOnRemoveAndClear() + { + using var source = new SourceList(); + using var liveGroups = source.Connect().GroupOn(static item => item.Group).AsAggregator(); + using var immutableGroups = source.Connect().GroupWithImmutableState(static item => item.Group).AsAggregator(); + + var first = new EdgeItem("one", "A", included: true); + var second = new EdgeItem("two", "A", included: true); + source.AddRange(new[] { first, second }); + source.Remove(first); + source.Clear(); + + await Assert.That(liveGroups.Data.Items).IsEmpty(); + await Assert.That(immutableGroups.Data.Items).IsEmpty(); + await Assert.That(liveGroups.Messages.Last().Removes).IsEqualTo(1); + await Assert.That(immutableGroups.Messages.Last().Removes).IsEqualTo(1); + } + + private sealed class EdgeItem(string name, string group, bool included) + { + public string Group { get; set; } = group; + + public bool Included { get; set; } = included; + + public string Name { get; } = name; + + public override string ToString() => $"{Name}:{Group}:{Included}"; + } +} diff --git a/src/DynamicData.Tests/List/ListGroupingBoundaryCoverageFixture.cs b/src/DynamicData.Tests/List/ListGroupingBoundaryCoverageFixture.cs new file mode 100644 index 000000000..2edb07dfa --- /dev/null +++ b/src/DynamicData.Tests/List/ListGroupingBoundaryCoverageFixture.cs @@ -0,0 +1,328 @@ +namespace DynamicData.Tests.List; + +public sealed class ListGroupingBoundaryCoverageFixture +{ + [Test] + public async Task GroupOnHandlesRefreshRegroupReplaceClearAndDisposesRemovedGroups() + { + using var source = new TestSourceList(); + using var regrouper = new ReactiveUI.Primitives.Signals.Signal(); + using var results = source.Connect().GroupOn(item => item.Group, regrouper).AsAggregator(); + + var first = new MutableItem(1, "A", "one"); + var second = new MutableItem(2, "A", "two"); + var third = new MutableItem(3, "B", "three"); + source.AddRange(new[] { first, second, third }); + + await AssertGroup(results.Data.Items, "A", first, second); + await AssertGroup(results.Data.Items, "B", third); + + first.Group = "C"; + source.Refresh(0); + + await AssertGroup(results.Data.Items, "A", second); + await AssertGroup(results.Data.Items, "B", third); + await AssertGroup(results.Data.Items, "C", first); + + second.Group = "B"; + regrouper.OnNext(Unit.Default); + + await AssertGroupAbsent(results.Data.Items, "A"); + await AssertGroup(results.Data.Items, "B", third, second); + await AssertGroup(results.Data.Items, "C", first); + + var replacement = new MutableItem(4, "B", "replacement"); + source.Replace(third, replacement); + + await AssertGroup(results.Data.Items, "B", replacement, second); + + source.Clear(); + + await Assert.That(results.Data.Count).IsEqualTo(0); + } + + [Test] + public async Task GroupWithImmutableStateReplacesSnapshotsForRefreshReplaceRegroupAndRemoval() + { + using var source = new TestSourceList(); + using var regrouper = new ReactiveUI.Primitives.Signals.Signal(); + using var results = source.Connect().GroupWithImmutableState(item => item.Group, regrouper).AsAggregator(); + + var first = new MutableItem(1, "A", "one"); + var second = new MutableItem(2, "A", "two"); + var third = new MutableItem(3, "B", "three"); + source.AddRange(new[] { first, second, third }); + + await AssertImmutableGroup(results.Data.Items, "A", first, second); + await AssertImmutableGroup(results.Data.Items, "B", third); + + first.Group = "C"; + source.Refresh(0); + + await AssertImmutableGroup(results.Data.Items, "A", second); + await AssertImmutableGroup(results.Data.Items, "B", third); + await AssertImmutableGroup(results.Data.Items, "C", first); + + second.Group = "B"; + regrouper.OnNext(Unit.Default); + + await AssertImmutableGroupAbsent(results.Data.Items, "A"); + await AssertImmutableGroup(results.Data.Items, "B", third, second); + await AssertImmutableGroup(results.Data.Items, "C", first); + + var replacement = new MutableItem(4, "D", "replacement"); + source.Replace(third, replacement); + + await AssertImmutableGroup(results.Data.Items, "B", second); + await AssertImmutableGroup(results.Data.Items, "D", replacement); + + source.Remove(second); + + await AssertImmutableGroupAbsent(results.Data.Items, "B"); + await AssertImmutableGroup(results.Data.Items, "C", first); + await AssertImmutableGroup(results.Data.Items, "D", replacement); + } + + [Test] + public async Task DistinctValuesHandlesRangeRefreshReplaceRemoveRangeAndClearBoundaries() + { + using var source = new TestSourceList(); + using var results = source.Connect().DistinctValues(item => item.Group).AsAggregator(); + + var first = new MutableItem(1, "A", "one"); + var second = new MutableItem(2, "A", "two"); + var third = new MutableItem(3, "B", "three"); + source.AddRange(new[] { first, second, third }); + + await Assert.That(results.Data.Items.OrderBy(static value => value)).IsEquivalentTo(new[] { "A", "B" }); + + first.Group = "A"; + source.Refresh(0); + + first.Group = "C"; + source.Refresh(0); + await Assert.That(results.Data.Items.OrderBy(static value => value)).IsEquivalentTo(new[] { "A", "B", "C" }); + + source.Replace(third, new MutableItem(4, "C", "replacement")); + await Assert.That(results.Data.Items.OrderBy(static value => value)).IsEquivalentTo(new[] { "A", "C" }); + + source.RemoveMany(new[] { second, first }); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { "C" }); + + source.Clear(); + await Assert.That(results.Data.Count).IsEqualTo(0); + } + + [Test] + public async Task MergeManyCacheChangeSetsHandlesParentMoveReplaceClearAndChildRefresh() + { + using var parents = new SourceList(); + var first = new CacheParent("first"); + var second = new CacheParent("second"); + var replacement = new CacheParent("replacement"); + first.Children.AddOrUpdate(new Child(1, "one", 10)); + second.Children.AddOrUpdate(new Child(2, "two", 20)); + + using var results = parents.Connect().MergeManyChangeSets(parent => parent.Children.Connect(), Child.ValueEqualityComparer, Child.HighScoreComparer).AsAggregator(); + + parents.AddRange(new[] { first, second }); + await Assert.That(results.Data.Count).IsEqualTo(2); + + parents.Move(0, 1); + await Assert.That(results.Data.Count).IsEqualTo(2); + + replacement.Children.AddOrUpdate(new Child(3, "three", 30)); + parents.Replace(first, replacement); + + await Assert.That(results.Data.Items.Select(static child => child.Id).OrderBy(static id => id)).IsEquivalentTo(new[] { 2, 3 }); + + second.Children.AddOrUpdate(new Child(2, "two-updated", 40)); + second.Children.Refresh(second.Children.Lookup(2).Value); + + await Assert.That(results.Data.Lookup(2).Value.Name).IsEqualTo("two-updated"); + + parents.Clear(); + await Assert.That(results.Data.Count).IsEqualTo(0); + } + + [Test] + public async Task MergeManyListChangeSetsHandlesParentMoveReplaceRemoveRangeAndChildUpdates() + { + using var parents = new SourceList(); + var first = new ListParent("first", new Child(1, "one", 10)); + var second = new ListParent("second", new Child(2, "two", 20)); + var third = new ListParent("third", new Child(3, "three", 30)); + using var results = parents.Connect().MergeManyChangeSets(parent => parent.Children.Connect(), Child.ValueEqualityComparer).AsAggregator(); + + parents.AddRange(new[] { first, second, third }); + await Assert.That(results.Data.Items.Select(static child => child.Id).OrderBy(static id => id)).IsEquivalentTo(new[] { 1, 2, 3 }); + + parents.Move(0, 2); + await Assert.That(results.Data.Count).IsEqualTo(3); + + var replacement = new ListParent("replacement", new Child(4, "four", 40)); + parents.Replace(second, replacement); + await Assert.That(results.Data.Items.Select(static child => child.Id).OrderBy(static id => id)).IsEquivalentTo(new[] { 1, 3, 4 }); + + replacement.Children.Add(new Child(5, "five", 50)); + await Assert.That(results.Data.Items.Select(static child => child.Id).OrderBy(static id => id)).IsEquivalentTo(new[] { 1, 3, 4, 5 }); + + parents.RemoveMany(new[] { first, third }); + await Assert.That(results.Data.Items.Select(static child => child.Id).OrderBy(static id => id)).IsEquivalentTo(new[] { 4, 5 }); + + parents.Clear(); + await Assert.That(results.Data.Count).IsEqualTo(0); + } + + [Test] + public async Task MergeManyChangeSetsPropagatesChildCompletionAndErrorAndDisposesRemovedParentSubscription() + { + using var parents = new SourceList(); + var first = new ManualParent("first"); + var second = new ManualParent("second"); + var expected = new InvalidOperationException("child failed"); + using var results = parents.Connect().MergeManyChangeSets(parent => parent.Changes).AsAggregator(); + + parents.Add(first); + first.Emit(new ChangeSet { new(ListChangeReason.Add, new Child(1, "one", 10), 0) }); + await Assert.That(results.Data.Count).IsEqualTo(1); + + parents.Remove(first); + await Assert.That(first.SubscriptionCount).IsEqualTo(0); + first.Emit(new ChangeSet { new(ListChangeReason.Add, new Child(99, "stale", 99), 0) }); + await Assert.That(results.Data.Count).IsEqualTo(0); + + parents.Add(second); + second.Complete(); + await Assert.That(results.IsCompleted).IsFalse(); + + var third = new ManualParent("third"); + parents.Add(third); + third.Fail(expected); + await Assert.That(results.Exception).IsEqualTo(expected); + } + + private static async Task AssertGroup(IEnumerable> groups, string key, params MutableItem[] expected) + { + var group = groups.SingleOrDefault(group => group.GroupKey == key); + await Assert.That(group).IsNotNull(); + await Assert.That(group!.List.Items).IsEquivalentTo(expected); + } + + private static async Task AssertGroupAbsent(IEnumerable> groups, string key) => + await Assert.That(groups.Any(group => group.GroupKey == key)).IsFalse(); + +#if REACTIVE_TESTS + private static async Task AssertImmutableGroup(IEnumerable> groups, string key, params MutableItem[] expected) +#else + private static async Task AssertImmutableGroup(IEnumerable> groups, string key, params MutableItem[] expected) +#endif + { + var group = groups.SingleOrDefault(group => group.Key == key); + await Assert.That(group).IsNotNull(); + await Assert.That(group!.Items).IsEquivalentTo(expected); + await Assert.That(group.Count).IsEqualTo(expected.Length); + } + +#if REACTIVE_TESTS + private static async Task AssertImmutableGroupAbsent(IEnumerable> groups, string key) => +#else + private static async Task AssertImmutableGroupAbsent(IEnumerable> groups, string key) => +#endif + await Assert.That(groups.Any(group => group.Key == key)).IsFalse(); + + private sealed class MutableItem(int id, string group, string name) + { + public int Id { get; } = id; + + public string Group { get; set; } = group; + + public string Name { get; } = name; + + public override string ToString() => $"{Id}:{Name}:{Group}"; + } + + private sealed class CacheParent(string name) : IDisposable + { + public string Name { get; } = name; + + public SourceCache Children { get; } = new(static child => child.Id); + + public void Dispose() => Children.Dispose(); + } + + private sealed class ListParent : IDisposable + { + public ListParent(string name, params Child[] children) + { + Name = name; + Children.AddRange(children); + } + + public string Name { get; } + + public SourceList Children { get; } = new(); + + public void Dispose() => Children.Dispose(); + + public override string ToString() => Name; + } + + private sealed class ManualParent + { + private readonly IObservable> _changes; + private IObserver>? _observer; + + public ManualParent(string name) + { + Name = name; + _changes = Observable.Create>(observer => + { + _observer = observer; + SubscriptionCount++; + return Disposable.Create(() => + { + SubscriptionCount--; + if (ReferenceEquals(_observer, observer)) + { + _observer = null; + } + }); + }); + } + + public string Name { get; } + + public int SubscriptionCount { get; private set; } + + public IObservable> Changes => _changes; + + public void Complete() => _observer?.OnCompleted(); + + public void Emit(IChangeSet changes) => _observer?.OnNext(changes); + + public void Fail(Exception error) => _observer?.OnError(error); + } + + private sealed class Child(int id, string name, int score) + { + public static IEqualityComparer ValueEqualityComparer { get; } = new ChildValueEqualityComparer(); + + public static IComparer HighScoreComparer { get; } = Comparer.Create(static (left, right) => right.Score.CompareTo(left.Score)); + + public int Id { get; } = id; + + public string Name { get; } = name; + + public int Score { get; } = score; + + public override string ToString() => $"{Id}:{Name}:{Score}"; + + private sealed class ChildValueEqualityComparer : IEqualityComparer + { + public bool Equals(Child? x, Child? y) => x?.Id == y?.Id && x?.Name == y?.Name && x?.Score == y?.Score; + + public int GetHashCode(Child obj) => HashCode.Combine(obj.Id, obj.Name, obj.Score); + } + } +} diff --git a/src/DynamicData.Tests/List/ListLifecycleCoverageFixture.cs b/src/DynamicData.Tests/List/ListLifecycleCoverageFixture.cs new file mode 100644 index 000000000..097841640 --- /dev/null +++ b/src/DynamicData.Tests/List/ListLifecycleCoverageFixture.cs @@ -0,0 +1,268 @@ +using System.Collections.ObjectModel; +using DynamicData.Tests.Utilities; + +namespace DynamicData.Tests.List; + +public class ListLifecycleCoverageFixture +{ + [Test] + public async Task SourceListCountChangedAfterDisposePublishesFinalCountAndCompletes() + { + var source = new SourceList(); + source.AddRange(new[] { 1, 2, 3 }); + source.Dispose(); + + using var subscription = source.CountChanged.RecordValues(out var observer); + + await Assert.That(observer.RecordedValues).IsEquivalentTo(new[] { 3 }); + await Assert.That(observer.HasCompleted).IsTrue(); + } + + [Test] + public async Task SourceListConnectDuringEditWaitsForCompletedEditSnapshot() + { + using var source = new SourceList(); + IDisposable? connection = null; + ListItemRecordingObserver? observer = null; + + source.Edit(items => + { + items.Add(1); + connection = source.Connect().RecordListItems(out observer); + items.Add(2); + }); + + using (connection!) + { + await Assert.That(observer!.RecordedChangeSets.Count).IsEqualTo(1); + await Assert.That(observer.RecordedChangeSets[0].Adds).IsEqualTo(2); + await Assert.That(observer.RecordedItems).IsEquivalentTo(new[] { 1, 2 }); + } + } + + [Test] + public async Task SourceListPreviewAfterDisposeCompletesWithoutChanges() + { + var source = new SourceList(); + source.Add(1); + source.Dispose(); + + using var subscription = source.Preview().RecordListItems(out var observer); + + await Assert.That(observer.RecordedChangeSets).IsEmpty(); + await Assert.That(observer.HasCompleted).IsTrue(); + } + + [Test] + public async Task SourceListSourceErrorsReachConnectPreviewAndCountObservers() + { + using var upstream = new ReactiveUI.Primitives.Signals.Signal>(); + using var source = new SourceList(upstream); + + source.Edit(items => + { + using var pending = source.Connect().Subscribe(_ => { }); + items.Add(1); + }); + + using var connectSubscription = source.Connect().RecordListItems(out var connect); + using var previewSubscription = source.Preview().RecordListItems(out var preview); + using var countSubscription = source.CountChanged.RecordValues(out var counts); + var error = new InvalidOperationException("expected"); + + upstream.OnError(error); + + await Assert.That(connect.Error).IsSameReferenceAs(error); + await Assert.That(preview.Error).IsSameReferenceAs(error); + await Assert.That(counts.Error).IsSameReferenceAs(error); + } + + [Test] + public async Task SourceListSourceCompletionReachesConnectAndCountObservers() + { + using var upstream = new ReactiveUI.Primitives.Signals.Signal>(); + using var source = new SourceList(upstream); + + source.Edit(items => + { + using var pending = source.Connect().Subscribe(_ => { }); + items.Add(1); + }); + + using var connectSubscription = source.Connect().RecordListItems(out var connect); + using var countSubscription = source.CountChanged.RecordValues(out var counts); + + upstream.OnCompleted(); + + await Assert.That(connect.HasCompleted).IsTrue(); + await Assert.That(counts.HasCompleted).IsTrue(); + } + + [Test] + public async Task ChangeAwareListCopyConstructorCanPreservePendingChanges() + { + var original = new ChangeAwareList(); + original.Add(42); + + var copy = new ChangeAwareList(original, copyChanges: true); + var copiedChanges = copy.CaptureChanges(); + var originalChanges = original.CaptureChanges(); + + await Assert.That(copy.IsReadOnly).IsFalse(); + await Assert.That(copy.Contains(42)).IsTrue(); + await Assert.That(copiedChanges.Count).IsEqualTo(1); + await Assert.That(copiedChanges.Adds).IsEqualTo(1); + await Assert.That(originalChanges.Count).IsEqualTo(1); + } + + [Test] + public async Task ChangeAwareListBoundaryOperationsThrowBeforeMutation() + { + var list = new ChangeAwareList(new[] { 1, 2 }); + list.CaptureChanges(); + + await Assert.That(() => list.Insert(-1, 0)).Throws(); + await Assert.That(() => list.Insert(3, 0)).Throws(); + await Assert.That(() => list.Move(1, -1)).Throws(); + await Assert.That(() => list.Move(3, 0)).Throws(); + await Assert.That(list.Refresh(9)).IsFalse(); + await Assert.That(() => list.RefreshAt(-1)).Throws(); + await Assert.That(() => list.RemoveAt(-1)).Throws(); + await Assert.That(() => list.RemoveRange(2, 1)).Throws(); + await Assert.That(list.CaptureChanges()).IsEmpty(); + } + + [Test] + public async Task ChangeAwareListInsertBatchingExtendsRangesAtStartAndEnd() + { + var list = new ChangeAwareList(); + + list.InsertRange(new[] { 2, 3 }, 0); + list.Insert(0, 1); + list.Insert(3, 4); + + var changes = list.CaptureChanges(); + var change = changes.Single(); + + await Assert.That(change.Reason).IsEqualTo(ListChangeReason.AddRange); + await Assert.That(change.Range.Index).IsEqualTo(0); + await Assert.That(change.Range).IsEquivalentTo(new[] { 1, 2, 3, 4 }); + } + + [Test] + public async Task ChangeAwareListRemoveBatchingExtendsRangesInReverseOrder() + { + var list = new ChangeAwareList(new[] { 1, 2, 3, 4 }); + list.CaptureChanges(); + + list.RemoveAt(2); + list.RemoveAt(2); + list.RemoveAt(1); + + var changes = list.CaptureChanges(); + var change = changes.Single(); + + await Assert.That(change.Reason).IsEqualTo(ListChangeReason.RemoveRange); + await Assert.That(change.Range.Index).IsEqualTo(1); + await Assert.That(change.Range).IsEquivalentTo(new[] { 2, 3, 4 }); + } + + [Test] + public async Task ChangeAwareListRemoveRangeWithZeroCountDoesNotRecordChange() + { + var list = new ChangeAwareList(new[] { 1, 2, 3 }); + list.CaptureChanges(); + + list.RemoveRange(1, 0); + + await Assert.That(list).IsEquivalentTo(new[] { 1, 2, 3 }); + await Assert.That(list.CaptureChanges()).IsEmpty(); + } + + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task RefCountChangeAwareListTracksDuplicatesThroughRangeSetAndClear(bool useAddRange) + { + var list = new ChangeAwareListWithRefCounts(); + + if (useAddRange) + { + list.AddRange(new[] { "a", "a", "b" }); + } + else + { + list.InsertRange(new[] { "a", "a", "b" }, 0); + } + + list.Remove("a"); + await Assert.That(list.Contains("a")).IsTrue(); + + list[0] = "c"; + await Assert.That(list.Contains("a")).IsFalse(); + await Assert.That(list.Contains("c")).IsTrue(); + + list.RemoveRange(0, 1); + await Assert.That(list.Contains("c")).IsFalse(); + + list.Clear(); + await Assert.That(list.Contains("b")).IsFalse(); + await Assert.That(list.Count).IsEqualTo(0); + } + + [Test] + public async Task ListExFallbackRangeAndSearchOperationsUsePlainIListSemantics() + { + IList plain = new Collection(); + plain.AddRange(new[] { 2, 3 }); + plain.AddOrInsertRange(new[] { 0, 1 }, 0); + plain.AddOrInsertRange(new[] { 4, 5 }, -1); + var missing = plain.IndexOf(99, EqualityComparer.Default); + var found = plain.IndexOfOptional(3); + + await Assert.That(plain).IsEquivalentTo(new[] { 0, 1, 2, 3, 4, 5 }); + await Assert.That(missing).IsEqualTo(-1); + await Assert.That(found.HasValue).IsTrue(); + await Assert.That(found.Value.Index).IsEqualTo(3); + await Assert.That(new[] { 1, 3, 5 }.BinarySearch(3)).IsEqualTo(1); + } + + [Test] + public async Task ListExReplaceVariantsCoverMissingAndComparerPaths() + { + IList values = new List { "aa" }; + var comparer = new SameLengthComparer(); + + values.Replace("aa", "bb", comparer); + values.ReplaceOrAdd("missing", "cc"); + + await Assert.That(values).IsEquivalentTo(new[] { "bb", "cc" }); + await Assert.That(() => values.Replace("missing", "dd")).Throws(); + } + + [Test] + public async Task ListExCloneAppliesNonExtendedListRefreshMoveAndReplaceShapes() + { + IList target = new Collection { 1, 2, 3 }; + + target.Clone(new[] + { + new Change(ListChangeReason.Refresh, 20, 1), + new Change(20, 2, 1), + new Change(ListChangeReason.Replace, 40, ReactiveUI.Primitives.Optional.Create(20), -1, 2), + new Change(ListChangeReason.Replace, 50, ReactiveUI.Primitives.Optional.Create(40), 0, -1) + }, null); + + await Assert.That(target).IsEquivalentTo(new[] { 50, 1, 3 }); + await Assert.That(new Change(ListChangeReason.Add, 1).MovedWithinRange(0, 1)).IsFalse(); + await Assert.That(new Change(1, 2, 0).MovedWithinRange(1, 1)).IsFalse(); + await Assert.That(() => target.Clone(new[] { new Change(ListChangeReason.Moved, 1, ReactiveUI.Primitives.Optional.None, -1, 0) }, null)).Throws(); + } + + private sealed class SameLengthComparer : IEqualityComparer + { + public bool Equals(string? x, string? y) => x?.Length == y?.Length; + + public int GetHashCode(string obj) => obj.Length; + } +} diff --git a/src/DynamicData.Tests/List/ListOperatorCoverageFixture.cs b/src/DynamicData.Tests/List/ListOperatorCoverageFixture.cs new file mode 100644 index 000000000..a82409606 --- /dev/null +++ b/src/DynamicData.Tests/List/ListOperatorCoverageFixture.cs @@ -0,0 +1,220 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else +using DynamicData.Binding; +#endif +using DynamicData.Tests.Domain; + +namespace DynamicData.Tests.List; + +public class ListOperatorCoverageFixture +{ + [Test] + public async Task DynamicFilterRequeriesExistingItemsWhenPredicateChanges() + { + using var source = new SourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static value => value % 2 == 0); + using var results = source.Connect().Filter(predicates, ListFilterPolicy.CalculateDiff).AsAggregator(); + + source.AddRange(new[] { 1, 2, 3, 4 }); + predicates.OnNext(static value => value >= 3); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 3, 4 }); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + } + + [Test] + public async Task DynamicFilterClearAndReplacePublishesReplacementSnapshot() + { + using var source = new SourceList(); + using var predicates = new ReactiveUI.Primitives.Signals.StateSignal>(static value => value < 4); + using var results = source.Connect().Filter(predicates, ListFilterPolicy.ClearAndReplace).AsAggregator(); + + source.AddRange(new[] { 1, 2, 3, 4, 5 }); + predicates.OnNext(static value => value > 3); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 4, 5 }); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Removes).IsEqualTo(3); + await Assert.That(results.Messages[1].Adds).IsEqualTo(2); + } + + [Test] + public async Task DistinctValuesTracksRefreshesAndDuplicateRemoval() + { + using var source = new TestSourceList(); + using var results = source.Connect().DistinctValues(static item => item.Group).AsAggregator(); + + var first = new MutableListItem("first", "A"); + var second = new MutableListItem("second", "A"); + source.AddRange(new[] { first, second }); + + first.Group = "B"; + source.Refresh(0); + source.Remove(second); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { "B" }); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(0); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + } + + [Test] + public async Task GroupOnRegrouperMovesItemsBetweenGroups() + { + using var source = new SourceList(); + using var regrouper = new ReactiveUI.Primitives.Signals.Signal(); + using var results = source.Connect().GroupOn(static item => item.Group, regrouper).AsAggregator(); + + var item = new MutableListItem("item", "A"); + source.Add(item); + + item.Group = "B"; + regrouper.OnNext(Unit.Default); + + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Items[0].GroupKey).IsEqualTo("B"); + await Assert.That(results.Data.Items[0].List.Items).IsEquivalentTo(new[] { item }); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + } + + [Test] + public async Task GroupOnRefreshMovesMutableItemBetweenGroups() + { + using var source = new SourceList(); + using var results = source.Connect().AutoRefresh(item => item.Group).GroupOn(static item => item.Group).AsAggregator(); + + var item = new MutableListItem("item", "A"); + source.Add(item); + + item.Group = "B"; + + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Items[0].GroupKey).IsEqualTo("B"); + await Assert.That(results.Data.Items[0].List.Items).IsEquivalentTo(new[] { item }); + await Assert.That(results.Messages.Count).IsEqualTo(2); + } + + [Test] + public async Task GroupWithImmutableStateRegrouperPublishesNewSnapshots() + { + using var source = new SourceList(); + using var regrouper = new ReactiveUI.Primitives.Signals.Signal(); + using var results = source.Connect().GroupWithImmutableState(static item => item.Group, regrouper).AsAggregator(); + + var item = new MutableListItem("item", "A"); + source.Add(item); + + item.Group = "B"; + regrouper.OnNext(Unit.Default); + + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Items[0].Key).IsEqualTo("B"); + await Assert.That(results.Data.Items[0].Items).IsEquivalentTo(new[] { item }); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + } + + [Test] + public async Task GroupOnPropertyMovesWhenObservedPropertyChanges() + { + using var source = new SourceList(); + using var results = source.Connect().GroupOnProperty(person => person.Age).AsAggregator(); + + var person = new Person("Adult", 40); + source.Add(person); + + person.Age = 41; + + await Assert.That(results.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Items[0].GroupKey).IsEqualTo(41); + await Assert.That(results.Data.Items[0].List.Items).IsEquivalentTo(new[] { person }); + await Assert.That(results.Messages.Count).IsEqualTo(2); + } + + [Test] + public async Task TransformAsyncUsesIndexesPreviousValuesAndRefreshPolicy() + { + using var source = new TestSourceList(); + var calls = new List(); + using var results = source.Connect() + .TransformAsync( + (value, previous, index, _) => + { + calls.Add($"{value}:{index}:{(previous.HasValue ? previous.Value : "none")}"); + return Task.FromResult($"{value}:{index}"); + }, + transformOnRefresh: false) + .AsAggregator(); + + source.AddRange(new[] { 10, 20 }); + source.Insert(1, 15); + source.ReplaceAt(1, 16); + source.Move(2, 0); + source.Refresh(0); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { "20:1", "10:0", "16:1" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(calls).IsEquivalentTo(new[] { "10:0:none", "20:1:none", "15:1:none", "16:1:15:1" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Last().Refreshes).IsEqualTo(1); + } + + [Test] + public async Task CombineRequiresAtLeastOneOtherSource() + { + using var source = new SourceList(); + + await Assert.That(() => source.Connect().Or()).Throws(); + } + + [Test] + public async Task DynamicObservableListCombineTracksAddedAndRemovedSources() + { + using var first = new SourceList(); + using var second = new SourceList(); + using var sources = new SourceList>(); + using var results = sources.Or().AsAggregator(); + + sources.Add(first); + await Assert.That(results.Messages).IsEmpty(); + + first.Add(1); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1 }); + + sources.Add(second); + await Assert.That(results.Messages.Count).IsEqualTo(1); + + second.Add(2); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 1, 2 }); + + sources.Remove(first); + + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 2 }); + } + + private sealed class MutableListItem(string name, string group) : AbstractNotifyPropertyChanged + { + private string _group = group; + + public string Group + { + get => _group; + set => SetAndRaise(ref _group, value); + } + + public string Name { get; } = name; + + public override string ToString() => $"{Name}:{Group}"; + } +} diff --git a/src/DynamicData.Tests/List/ListTransformBoundaryCoverageFixture.cs b/src/DynamicData.Tests/List/ListTransformBoundaryCoverageFixture.cs new file mode 100644 index 000000000..2f698012c --- /dev/null +++ b/src/DynamicData.Tests/List/ListTransformBoundaryCoverageFixture.cs @@ -0,0 +1,429 @@ +namespace DynamicData.Tests.List; + +public class ListTransformBoundaryCoverageFixture +{ + [Test] + public async Task TransformHandlesUnindexedRemoveRangeClearAndReplace() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var calls = new List(); + using var results = source + .Transform((item, previous, index) => + { + calls.Add($"{item.Name}:{index}:{(previous.HasValue ? previous.Value : "none")}"); + return $"{item.Name}:{index}"; + }) + .AsAggregator(); + + var first = new BoundaryItem("first"); + var second = new BoundaryItem("second"); + var third = new BoundaryItem("third"); + var replacement = new BoundaryItem("replacement"); + + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { first, second, third }, 0) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.RemoveRange, new[] { first, third }) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Replace, replacement, ReactiveUI.Primitives.Optional.Create(second), -1, -1) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Clear, new[] { replacement }) + }); + + await Assert.That(results.Data.Items).IsEmpty(); + await Assert.That(results.Messages.Count).IsEqualTo(4); + await Assert.That(results.Messages[1].Removes).IsEqualTo(2); + await Assert.That(results.Messages[2].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[3].Removes).IsEqualTo(1); + await Assert.That(calls).IsEquivalentTo( + new[] { "first:0:none", "second:1:none", "third:2:none", "replacement:0:second:1" }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task TransformThrowsWhenMoveDoesNotSpecifyCurrentIndex() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = source.Transform(static value => value.ToString()).AsAggregator(); + + source.OnNext(new ChangeSet { new(ListChangeReason.AddRange, new[] { 1, 2 }, 0) }); +#if REACTIVE_TESTS + source.OnNext(new ChangeSet { new(ListChangeReason.Moved, 1, ReactiveUI.Primitives.Optional.None, -1, 0) }); + await Assert.That(results.Exception).IsTypeOf(); +#else + await Assert.That(() => source.OnNext(new ChangeSet { new(ListChangeReason.Moved, 1, ReactiveUI.Primitives.Optional.None, -1, 0) })).Throws(); + await Assert.That(results.Exception).IsNull(); +#endif + } + + [Test] + public async Task TransformAsyncPropagatesFactoryErrorsAndStopsProcessingBatch() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + var error = new InvalidOperationException("transform failed"); + using var results = source + .TransformAsync((value, _, _, _) => + value == 2 ? Task.FromException(error) : Task.FromResult(value.ToString())) + .AsAggregator(); + + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { 1, 2, 3 }, 0) + }); + + await Assert.That(results.Exception).IsSameReferenceAs(error); + await Assert.That(results.Data.Items).IsEmpty(); + } + + [Test] + public async Task TransformAsyncMoveReplaceRefreshAndClearMaintainIndexes() + { + using var source = new TestSourceList(); + var calls = new List(); + using var results = source.Connect() + .TransformAsync((value, previous, index, _) => + { + calls.Add($"{value}:{index}:{(previous.HasValue ? previous.Value : "none")}"); + return Task.FromResult($"{value}:{index}"); + }, transformOnRefresh: true) + .AsAggregator(); + + source.AddRange(new[] { 10, 20, 30 }); + source.Move(0, 2); + source.ReplaceAt(1, 25); + source.Refresh(1); + source.Clear(); + + await Assert.That(results.Data.Items).IsEmpty(); + await Assert.That(results.Messages.Count).IsEqualTo(5); + await Assert.That(results.Messages[1].Moves).IsEqualTo(1); + await Assert.That(results.Messages[2].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[3].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[4].Removes).IsEqualTo(3); + await Assert.That(calls).IsEquivalentTo( + new[] { "10:0:none", "20:1:none", "30:2:none", "25:1:30:2", "25:1:25:1" }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task TransformAsyncUnindexedRemoveRemovesMatchingReferenceSourceItem() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = source + .TransformAsync(static item => Task.FromResult(item.Name)) + .AsAggregator(); + + var first = new BoundaryItem("first"); + var second = new BoundaryItem("second"); + var third = new BoundaryItem("third"); + + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { first, second, third }, 0) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Remove, second) + }); + + await Assert.That(results.Exception).IsNull(); + await Assert.That(results.Data.Items).IsEquivalentTo( + new[] { "first", "third" }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task TransformAsyncUnindexedRemoveRangeRemovesMatchingReferenceSourceItems() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = source + .TransformAsync(static item => Task.FromResult(item.Name)) + .AsAggregator(); + + var first = new BoundaryItem("first"); + var second = new BoundaryItem("second"); + var third = new BoundaryItem("third"); + var fourth = new BoundaryItem("fourth"); + + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { first, second, third, fourth }, 0) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.RemoveRange, new[] { first, third }) + }); + + await Assert.That(results.Exception).IsNull(); + await Assert.That(results.Data.Items).IsEquivalentTo( + new[] { "second", "fourth" }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task StaticFilterProcessesRangeReplaceRemoveAndClear() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = source.Filter(static value => value % 2 == 0).AsAggregator(); + + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { 1, 2, 3, 4, 8 }, 0) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Replace, 6, ReactiveUI.Primitives.Optional.Create(2), 1, 1), + new(ListChangeReason.Replace, 7, ReactiveUI.Primitives.Optional.Create(4), 3, 3) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.RemoveRange, new[] { 6, 3, 7 }, 1) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.Clear, new[] { 1, 8 }) + }); + + await Assert.That(results.Data.Items).IsEmpty(); + await Assert.That(results.Messages.Count).IsEqualTo(4); + await Assert.That(results.Messages[0].Adds).IsEqualTo(3); + await Assert.That(results.Messages[1].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Messages[3].Removes).IsEqualTo(1); + } + + [Test] + public async Task SourceListConnectPredicateUsesIndexedStaticFilterPaths() + { + using var source = new SourceList(); + using var results = source.Connect(static value => value % 2 == 0).AsAggregator(); + + source.AddRange(new[] { 1, 2, 4 }); + source.ReplaceAt(1, 6); + source.ReplaceAt(1, 7); + source.RemoveRange(0, 2); + source.Clear(); + + await Assert.That(results.Data.Items).IsEmpty(); + await Assert.That(results.Messages.Count).IsEqualTo(4); + await Assert.That(results.Messages[0].Adds).IsEqualTo(2); + await Assert.That(results.Messages[1].Replaced).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + await Assert.That(results.Messages[3].Removes).IsEqualTo(1); + } + + [Test] + public async Task DynamicFilterStaticPredicateConstructorGuardsNullArguments() + { + await Assert.That(() => ObservableListEx.Filter( + source: (null as IObservable>)!, + predicate: static value => value > 0)) + .Throws(); + + await Assert.That(() => ObservableListEx.Filter( + source: Observable.Empty>(), + predicate: (null as Func)!)) + .Throws(); + } + + [Test] + public async Task DynamicFilterObservablePredicateConstructorGuardsNullArguments() + { + await Assert.That(() => ObservableListEx.Filter( + source: (null as IObservable>)!, + predicate: Observable.Return>(static value => value > 0))) + .Throws(); + + await Assert.That(() => ObservableListEx.Filter( + source: Observable.Empty>(), + predicate: (null as IObservable>)!)) + .Throws(); + } + + [Test] + public async Task FilterWithPredicateStateRejectsInvalidPolicy() + { + await Assert.That(() => ObservableListEx.Filter( + source: Observable.Empty>(), + predicateState: Observable.Return(0), + predicate: static (state, value) => value == state, + filterPolicy: (ListFilterPolicy)42)) + .Throws(); + } + + [Test] + public async Task FilterWithPredicateStateIndexedRangeInsertionUpdatesFollowingFilteredIndexes() + { + using var source = new ReactiveUI.Primitives.Signals.Signal>(); + using var predicateState = new ReactiveUI.Primitives.Signals.StateSignal(0); + using var results = source + .Filter(predicateState, static (state, value) => value >= state) + .AsAggregator(); + + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { 1, 3 }, 0) + }); + source.OnNext(new ChangeSet + { + new(ListChangeReason.AddRange, new[] { 2 }, 1) + }); + predicateState.OnNext(2); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[1].Adds).IsEqualTo(1); + await Assert.That(results.Messages[2].Removes).IsEqualTo(1); + } + + [Test] + public async Task SwitchClearsPreviousItemsAndIgnoresSupersededSignals() + { + using var outer = new ReactiveUI.Primitives.Signals.Signal>>(); + using var first = new ReactiveUI.Primitives.Signals.Signal>(); + using var second = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = ObservableListEx.Switch(outer).AsAggregator(); + + outer.OnNext(first); + first.OnNext(new ChangeSet { new(ListChangeReason.AddRange, new[] { 1, 2 }, 0) }); + outer.OnNext(second); + first.OnNext(new ChangeSet { new(ListChangeReason.Add, 99, 0) }); + second.OnNext(new ChangeSet { new(ListChangeReason.Add, 3, 0) }); + + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 3 }); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[1].First().Reason).IsEqualTo(ListChangeReason.Clear); + await Assert.That(results.Messages[2].Adds).IsEqualTo(1); + } + + [Test] + public async Task SwitchCompletionWaitsForActiveInnerCompletion() + { + using var outer = new ReactiveUI.Primitives.Signals.Signal>>(); + using var inner = new ReactiveUI.Primitives.Signals.Signal>(); + using var subscription = ObservableListEx.Switch(outer).RecordListItems(out var results); + + outer.OnNext(inner); + outer.OnCompleted(); + + await Assert.That(results.HasCompleted).IsFalse(); + + inner.OnCompleted(); + + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task SwitchPropagatesOnlyActiveInnerErrors() + { + using var outer = new ReactiveUI.Primitives.Signals.Signal>>(); + using var first = new ReactiveUI.Primitives.Signals.Signal>(); + using var second = new ReactiveUI.Primitives.Signals.Signal>(); + var ignored = new InvalidOperationException("ignored"); + var active = new InvalidOperationException("active"); + using var subscription = ObservableListEx.Switch(outer).RecordListItems(out var results); + + outer.OnNext(first); + outer.OnNext(second); + first.OnError(ignored); + second.OnError(active); + + await Assert.That(results.Error).IsSameReferenceAs(active); + } + + [Test] + public async Task ToObservableChangeSetItemOverloadsGuardNullSources() + { + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable)!)) + .Throws(); + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable)!, expireAfter: static _ => (TimeSpan?)null)) + .Throws(); + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable)!, limitSizeTo: 1)) + .Throws(); + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable)!, expireAfter: null, limitSizeTo: 1)) + .Throws(); + } + + [Test] + public async Task ToObservableChangeSetSequenceOverloadsGuardNullSources() + { + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable>)!)) + .Throws(); + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable>)!, limitSizeTo: 1)) + .Throws(); + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable>)!, expireAfter: static _ => (TimeSpan?)null)) + .Throws(); + await Assert.That(() => ObservableListEx.ToObservableChangeSet(source: (null as IObservable>)!, expireAfter: null, limitSizeTo: 1)) + .Throws(); + } + + [Test] + public async Task ToObservableChangeSetSizeLimitAdjustsQueuedExpirationsAndScheduledExpiration() + { + using var source = new ReactiveUI.Primitives.Signals.Signal(); + var scheduler = new TestScheduler(); + using var subscription = source + .ToObservableChangeSet( + expireAfter: static value => value switch + { + 1 => TimeSpan.FromSeconds(10), + 2 => TimeSpan.FromSeconds(20), + 3 => TimeSpan.FromSeconds(30), + _ => null + }, + limitSizeTo: 3, + scheduler: scheduler) + .ValidateChangeSets() + .RecordListItems(out var results); + + source.OnNext(1); + source.OnNext(2); + source.OnNext(3); + source.OnNext(4); + + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 2, 3, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.RecordedChangeSets[results.RecordedChangeSets.Count - 1].Removes).IsEqualTo(1); + + scheduler.AdvanceTo(TimeSpan.FromSeconds(10).Ticks); + + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 2, 3, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + scheduler.AdvanceTo(TimeSpan.FromSeconds(20).Ticks); + + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 3, 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + scheduler.AdvanceTo(TimeSpan.FromSeconds(30).Ticks); + + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { 4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(results.Error).IsNull(); + } + + [Test] + public async Task ToObservableChangeSetSequenceOverloadEmitsInitialEmptyChangeSetAndCompletes() + { + using var subscription = Observable.Empty>() + .ToObservableChangeSet() + .RecordListItems(out var results); + + await Assert.That(results.RecordedChangeSets).HasSingleItem(); + await Assert.That(results.RecordedChangeSets[0].Count).IsEqualTo(0); + await Assert.That(results.HasCompleted).IsTrue(); + await Assert.That(results.Error).IsNull(); + } + + private sealed class BoundaryItem(string name) + { + public string Name { get; } = name; + + public override string ToString() => Name; + } +} diff --git a/src/DynamicData.Tests/List/ListValueCoverageFixture.cs b/src/DynamicData.Tests/List/ListValueCoverageFixture.cs new file mode 100644 index 000000000..63291824d --- /dev/null +++ b/src/DynamicData.Tests/List/ListValueCoverageFixture.cs @@ -0,0 +1,149 @@ +namespace DynamicData.Tests.List; + +public class ListValueCoverageFixture +{ + [Test] + public async Task ChangeConstructorsValidateReasonShapeAndIndexes() + { + await Assert.That(() => new Change(ListChangeReason.Add, new[] { 1 })).Throws(); + await Assert.That(() => new Change(1, -1, 0)).Throws(); + await Assert.That(() => new Change(1, 0, -1)).Throws(); + await Assert.That(() => new Change(ListChangeReason.Add, 1, new ReactiveUI.Primitives.Optional(0))).Throws(); + await Assert.That(() => new Change(ListChangeReason.Replace, 1)).Throws(); + await Assert.That(() => new Change(ListChangeReason.Refresh, 1)).Throws(); + } + + [Test] + public async Task ChangeEqualityHashCodeAndFormattingUseValueState() + { + var first = new Change(ListChangeReason.Replace, 2, new ReactiveUI.Primitives.Optional(1), 0, 0); + var same = new Change(ListChangeReason.Replace, 2, new ReactiveUI.Primitives.Optional(1), 0, 0); + var different = new Change(ListChangeReason.Add, 2, 0); + + await Assert.That(first == same).IsTrue(); + await Assert.That(first != different).IsTrue(); + await Assert.That(first.Equals((object)same)).IsTrue(); + await Assert.That(first.Equals((object?)null)).IsFalse(); + await Assert.That(first.Equals("not a change")).IsFalse(); + await Assert.That(first.GetHashCode()).IsEqualTo(same.GetHashCode()); + await Assert.That(new Change(ListChangeReason.AddRange, new[] { 1, 2 }).ToString()).IsEqualTo("AddRange. 2 changes"); + } + + [Test] + public async Task ChangeAwareListConstructorsCopyItemsAndChanges() + { + var original = new ChangeAwareList(capacity: 4); + original.AddRange(new[] { 1, 2 }); + + var copiedWithChanges = new ChangeAwareList(original, copyChanges: true); + var copiedWithoutChanges = new ChangeAwareList(original, copyChanges: false); + + await Assert.That(original.Capacity).IsGreaterThanOrEqualTo(4); + await Assert.That(original.IsReadOnly).IsFalse(); + await Assert.That(original.Contains(1)).IsTrue(); + await Assert.That(copiedWithChanges.CaptureChanges().Adds).IsEqualTo(2); + await Assert.That(copiedWithoutChanges.CaptureChanges()).IsEmpty(); + } + + [Test] + public async Task ChangeAwareListBatchesAdjacentAddsAndRemoves() + { + var addedAtSameIndex = new ChangeAwareList(); + addedAtSameIndex.Insert(0, 2); + addedAtSameIndex.Insert(0, 1); + + var sameIndexChanges = addedAtSameIndex.CaptureChanges(); + await Assert.That(sameIndexChanges.Single().Reason).IsEqualTo(ListChangeReason.AddRange); + await Assert.That(sameIndexChanges.Single().Range).IsEquivalentTo(new[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var addedAtEnd = new ChangeAwareList(); + addedAtEnd.Add(1); + addedAtEnd.Add(2); + + var endChanges = addedAtEnd.CaptureChanges(); + await Assert.That(endChanges.Single().Reason).IsEqualTo(ListChangeReason.AddRange); + await Assert.That(endChanges.Single().Range).IsEquivalentTo(new[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var removedForward = new ChangeAwareList(new[] { 1, 2, 3, 4 }); + removedForward.CaptureChanges(); + removedForward.RemoveAt(1); + removedForward.RemoveAt(1); + + var forwardChanges = removedForward.CaptureChanges(); + await Assert.That(forwardChanges.Single().Reason).IsEqualTo(ListChangeReason.RemoveRange); + await Assert.That(forwardChanges.Single().Range).IsEquivalentTo(new[] { 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var removedBackward = new ChangeAwareList(new[] { 1, 2, 3, 4 }); + removedBackward.CaptureChanges(); + removedBackward.RemoveAt(2); + removedBackward.RemoveAt(1); + + var backwardChanges = removedBackward.CaptureChanges(); + await Assert.That(backwardChanges.Single().Reason).IsEqualTo(ListChangeReason.RemoveRange); + await Assert.That(backwardChanges.Single().Range).IsEquivalentTo(new[] { 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task ChangeAwareListHandlesNoOpsAndGuardClauses() + { + var list = new ChangeAwareList(new[] { 1, 2, 3 }); + list.CaptureChanges(); + + await Assert.That(list.Refresh(9)).IsFalse(); + + list.AddRange(Array.Empty()); + list.InsertRange(Array.Empty(), 1); + list.RemoveRange(1, 0); + + await Assert.That(list.CaptureChanges()).IsEmpty(); + await Assert.That(() => list.Insert(-1, 0)).Throws(); + await Assert.That(() => list.Insert(5, 0)).Throws(); + await Assert.That(() => list.Move(-1, 0)).Throws(); + await Assert.That(() => list.Move(0, -1)).Throws(); + await Assert.That(() => list.Refresh(1, -1)).Throws(); + await Assert.That(() => list.RefreshAt(-1)).Throws(); + await Assert.That(() => list.RemoveAt(-1)).Throws(); + await Assert.That(() => list[5] = 5).Throws(); + } + + [Test] + public async Task ListExUsesFallbackListOperations() + { + var collection = new Collection { 3 }; + + collection.AddOrInsertRange(new[] { 1, 2 }, 0); + collection.AddRange(new[] { 4, 5 }); + collection.AddRange(new[] { 6, 7 }, 0); + collection.Remove(new[] { 6, 7 }); + + await Assert.That(collection).IsEquivalentTo(new[] { 1, 2, 3, 4, 5 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(collection.IndexOf(99, EqualityComparer.Default)).IsEqualTo(-1); + + collection.ReplaceOrAdd(42, 6); + collection.Replace(6, 7); + + await Assert.That(collection).IsEquivalentTo(new[] { 1, 2, 3, 4, 5, 7 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(() => collection.Replace(42, 8)).Throws(); + } + + [Test] + public async Task ListExClonesIndexedReplaceMoveAndRefreshChanges() + { + var source = new ChangeAwareList(new[] { 1, 2, 3 }); + source.CaptureChanges(); + source[1] = 20; + source.Move(2, 0); + source.RefreshAt(0); + + var target = new ChangeAwareList(new[] { 1, 2, 3 }); + target.CaptureChanges(); + target.Clone(source.CaptureChanges()); + + await Assert.That(target).IsEquivalentTo(new[] { 3, 1, 20 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var changes = target.CaptureChanges().ToList(); + await Assert.That(changes.Select(static change => change.Reason)).IsEquivalentTo( + new[] { ListChangeReason.Replace, ListChangeReason.Moved, ListChangeReason.Refresh }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + } +} diff --git a/src/DynamicData.Tests/List/MergeChangeSetsFixture.cs b/src/DynamicData.Tests/List/MergeChangeSetsFixture.cs index 253a70070..99bf60a27 100644 --- a/src/DynamicData.Tests/List/MergeChangeSetsFixture.cs +++ b/src/DynamicData.Tests/List/MergeChangeSetsFixture.cs @@ -1,17 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Microsoft.Reactive.Testing; -using Xunit; using System.Collections.Concurrent; namespace DynamicData.Tests.List; @@ -39,13 +32,13 @@ public MergeChangeSetsFixture() _animalOwners.Add(_animalOwnerFaker.Generate(InitialOwnerCount)); } - [Theory] - [InlineData(5, 7)] - [InlineData(10, 50)] + [Test] + [Arguments(5, 7)] + [Arguments(10, 50)] #if !DEBUG - [InlineData(10, 1_000)] - [InlineData(200, 500)] - [InlineData(1_000, 10)] + [Arguments(10, 1_000)] + [Arguments(200, 500)] + [Arguments(1_000, 10)] #endif public async Task MultiThreadedStressTest(int ownerCount, int animalCount) { @@ -113,11 +106,11 @@ IObservable AddRemoveAnimals(AnimalOwner owner, int animalCount, int par while (addingAnimals); // Verify the results - CheckResultContents(addedOwners.ToList(), results); + await CheckResultContents(addedOwners.ToList(), results); } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // Arrange var nullChangeSetObs = (IObservable>>)null!; @@ -126,13 +119,13 @@ public void NullChecks() var checkParam1 = () => nullChangeSetObs.MergeChangeSets(); // Assert - nullChangeSetObs.Should().BeNull(); + await Assert.That(nullChangeSetObs).IsNull(); - checkParam1.Should().Throw(); + await Assert.That(checkParam1).Throws(); } - [Fact] - public void ResultContainsAllInitialChildrenObsObs() + [Test] + public async Task ResultContainsAllInitialChildrenObsObs() { // Arrange var obs = GetObservableObservable(); @@ -141,11 +134,11 @@ public void ResultContainsAllInitialChildrenObsObs() using var results = obs.MergeChangeSets().AsAggregator(); // Assert - CheckResultContents(_animalOwners, results); + await CheckResultContents(_animalOwners, results); } - [Fact] - public void ResultContainsAllInitialChildrenEnum() + [Test] + public async Task ResultContainsAllInitialChildrenEnum() { // Arrange var obs = GetEnumerableObservable(); @@ -154,11 +147,11 @@ public void ResultContainsAllInitialChildrenEnum() using var results = obs.MergeChangeSets().AsAggregator(); // Assert - CheckResultContents(_animalOwners, results); + await CheckResultContents(_animalOwners, results); } - [Fact] - public void ResultEmptyIfSourceIsClearedObs() + [Test] + public async Task ResultEmptyIfSourceIsClearedObs() { // Arrange var obs = GetObservableObservable(); @@ -168,11 +161,11 @@ public void ResultEmptyIfSourceIsClearedObs() _animalOwners.ForEach(owner => owner.Animals.Clear()); // Assert - results.Data.Count.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); } - [Fact] - public void ResultEmptyIfSourceIsClearedEnum() + [Test] + public async Task ResultEmptyIfSourceIsClearedEnum() { // Arrange var obs = GetEnumerableObservable(); @@ -182,10 +175,10 @@ public void ResultEmptyIfSourceIsClearedEnum() _animalOwners.ForEach(owner => owner.Animals.Clear()); // Assert - results.Data.Count.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); } - [Fact] + [Test] public async Task ResultContainsChildrenAddedWithAddRangeObs() { // Arrange @@ -196,11 +189,11 @@ public async Task ResultContainsChildrenAddedWithAddRangeObs() var added = (await ForOwnersAsync(UseAddRange)).SelectMany(list => list).ToList(); // Assert - added.Should().BeSubsetOf(results.Data.Items); - CheckResultContents(_animalOwners, results); + await Assert.That(added.Except(results.Data.Items).Any()).IsFalse(); + await CheckResultContents(_animalOwners, results); } - [Fact] + [Test] public async Task ResultContainsChildrenAddedWithAddRangeEnum() { // Arrange @@ -211,11 +204,11 @@ public async Task ResultContainsChildrenAddedWithAddRangeEnum() var added = (await ForOwnersAsync(UseAddRange)).SelectMany(list => list).ToList(); // Assert - added.Should().BeSubsetOf(results.Data.Items); - CheckResultContents(_animalOwners, results); + await Assert.That(added.Except(results.Data.Items).Any()).IsFalse(); + await CheckResultContents(_animalOwners, results); } - [Fact] + [Test] public async Task ResultContainsChildrenAddedWithAddObs() { // Arrange @@ -226,11 +219,11 @@ public async Task ResultContainsChildrenAddedWithAddObs() var added = await ForOwnersAsync(UseAdd); // Assert - added.Should().BeSubsetOf(results.Data.Items); - CheckResultContents(_animalOwners, results); + await Assert.That(added.Except(results.Data.Items).Any()).IsFalse(); + await CheckResultContents(_animalOwners, results); } - [Fact] + [Test] public async Task ResultContainsChildrenAddedWithAddEnum() { // Arrange @@ -241,9 +234,9 @@ public async Task ResultContainsChildrenAddedWithAddEnum() await ForOwnersAsync(owner => owner.Animals.Add(_animalFaker.Generate())); // Assert - CheckResultContents(_animalOwners, results); + await CheckResultContents(_animalOwners, results); } - [Fact] + [Test] public async Task ResultContainsChildrenAddedWithInsertObs() { // Arrange @@ -254,11 +247,11 @@ public async Task ResultContainsChildrenAddedWithInsertObs() var added = await ForOwnersAsync(UseInsert); // Assert - added.Should().BeSubsetOf(results.Data.Items); - CheckResultContents(_animalOwners, results); + await Assert.That(added.Except(results.Data.Items).Any()).IsFalse(); + await CheckResultContents(_animalOwners, results); } - [Fact] + [Test] public async Task ResultContainsChildrenAddedWithInsertEnum() { // Arrange @@ -269,12 +262,11 @@ public async Task ResultContainsChildrenAddedWithInsertEnum() var added = await ForOwnersAsync(UseInsert); // Assert - added.Should().BeSubsetOf(results.Data.Items); - CheckResultContents(_animalOwners, results); + await Assert.That(added.Except(results.Data.Items).Any()).IsFalse(); + await CheckResultContents(_animalOwners, results); } - - [Fact] + [Test] public async Task ResultContainsCorrectItemsAfterChildReplacementObs() { // Arrange @@ -285,12 +277,12 @@ public async Task ResultContainsCorrectItemsAfterChildReplacementObs() var replacements = await ForOwnersAsync(ReplaceAnimal); // Assert - replacements.Select(r => r.New).Should().BeSubsetOf(results.Data.Items); - replacements.Select(r => r.Old).ForEach(old => results.Data.Items.Should().NotContain(old)); - CheckResultContents(_animalOwners, results); + await Assert.That(replacements.Select(r => r.New).Except(results.Data.Items).Any()).IsFalse(); + await Assert.That(replacements.Select(r => r.Old).All(old => !results.Data.Items.Contains(old))).IsTrue(); + await CheckResultContents(_animalOwners, results); } - [Fact] + [Test] public async Task ResultContainsCorrectItemsAfterChildReplacementEnum() { // Arrange @@ -301,13 +293,13 @@ public async Task ResultContainsCorrectItemsAfterChildReplacementEnum() var replacements = await ForOwnersAsync(ReplaceAnimal); // Assert - replacements.Select(r => r.New).Should().BeSubsetOf(results.Data.Items); - replacements.Select(r => r.Old).ForEach(old => results.Data.Items.Should().NotContain(old)); - CheckResultContents(_animalOwners, results); + await Assert.That(replacements.Select(r => r.New).Except(results.Data.Items).Any()).IsFalse(); + await Assert.That(replacements.Select(r => r.Old).All(old => !results.Data.Items.Contains(old))).IsTrue(); + await CheckResultContents(_animalOwners, results); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange var expectedError = new Exception("Expected"); @@ -318,11 +310,11 @@ public void ResultFailsIfSourceFails() using var results = obs.Concat(throwObservable).MergeChangeSets().AsAggregator(); // Assert - results.Exception.Should().Be(expectedError); + await Assert.That(results.Exception).IsEqualTo(expectedError); } - [Fact] - public void ResultFailsIfAnyChildChangeSetFails() + [Test] + public async Task ResultFailsIfAnyChildChangeSetFails() { // Arrange var expectedError = new Exception("Test exception"); @@ -333,13 +325,13 @@ public void ResultFailsIfAnyChildChangeSetFails() using var results = obs.MergeChangeSets().AsAggregator(); // Assert - results.Exception.Should().Be(expectedError); + await Assert.That(results.Exception).IsEqualTo(expectedError); } - [Theory] - [InlineData(false)] - [InlineData(true)] - public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeAll) + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeAll) { // Arrange var obs = GetObservableObservable(); @@ -349,15 +341,15 @@ public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeAll _animalOwners.Skip(completeAll ? 0 : 1).ForEach(owner => owner.Animals.Dispose()); // Assert - results.IsCompleted.Should().Be(completeAll); + await Assert.That(results.IsCompleted).IsEqualTo(completeAll); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void MergedObservableRespectsCompletableFlag(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task MergedObservableRespectsCompletableFlag(bool completeSource, bool completeChildren) { // Arrange var obs = GetEnumerableObservable(); @@ -367,13 +359,13 @@ public void MergedObservableRespectsCompletableFlag(bool completeSource, bool co _animalOwners.Skip(completeChildren ? 0 : 1).ForEach(owner => owner.Animals.Dispose()); // Assert - results.IsCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(results.IsCompleted).IsEqualTo(completeSource && completeChildren); } - [Theory] - [InlineData(false)] - [InlineData(true)] - public void EnumObservableUsesTheScheduler(bool advance) + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task EnumObservableUsesTheScheduler(bool advance) { // Arrange var scheduler = new TestScheduler(); @@ -389,12 +381,12 @@ public void EnumObservableUsesTheScheduler(bool advance) // Assert if (advance) { - CheckResultContents(_animalOwners, results); + await CheckResultContents(_animalOwners, results); } else { - results.Data.Count.Should().Be(0); - results.Messages.Count.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Messages.Count).IsEqualTo(0); } } @@ -403,13 +395,13 @@ public void Dispose() _animalOwners.ForEach(owner => owner.Dispose()); } - private static void CheckResultContents(IList expectedOwners, ChangeSetAggregator animalResults) + private static async Task CheckResultContents(IList expectedOwners, ChangeSetAggregator animalResults) { var expectedAnimals = expectedOwners.SelectMany(owner => owner.Animals.Items).ToList(); // These should be subsets of each other, so check one subset and the size - expectedAnimals.Should().BeSubsetOf(animalResults.Data.Items); - animalResults.Data.Items.Count.Should().Be(expectedAnimals.Count); + await Assert.That(expectedAnimals.Except(animalResults.Data.Items).Any()).IsFalse(); + await Assert.That(animalResults.Data.Items.Count).IsEqualTo(expectedAnimals.Count); } Task ForOwnersAsync(Action action) => Task.WhenAll(_animalOwners.Select(owner => Task.Run(() => action(owner)))); diff --git a/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs b/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs index bdac643d9..896559300 100644 --- a/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive; -using System.Reactive.Linq; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.List; @@ -23,9 +15,9 @@ public sealed class MergeManyChangeSetsCacheFixture : IDisposable const int PricesPerMarket = 5; const int RemoveCount = 2; #else - const int MarketCount = 101; - const int PricesPerMarket = 103; - const int RemoveCount = 53; + const int MarketCount = 101; + const int PricesPerMarket = 103; + const int RemoveCount = 53; #endif const int ItemIdStride = 1000; const decimal BasePrice = 10m; @@ -44,18 +36,17 @@ public sealed class MergeManyChangeSetsCacheFixture : IDisposable public MergeManyChangeSetsCacheFixture() { _randomizer = new(0x03251976); - _marketFaker = Fakers.Market.WithSeed(_randomizer); + _marketFaker = Fakers.Market.Clone().WithSeed(_randomizer); _marketListResults = _marketList.Connect().AsAggregator(); } - - [Theory] - [InlineData(5, 7)] - [InlineData(10, 50)] + [Test] + [Arguments(5, 7)] + [Arguments(10, 50)] #if !DEBUG - [InlineData(10, 1_000)] - [InlineData(200, 500)] - [InlineData(1_000, 10)] + [Arguments(10, 1_000)] + [Arguments(200, 500)] + [Arguments(1_000, 10)] #endif public async Task MultiThreadedStressTest(int marketCount, int priceCount) { @@ -120,11 +111,12 @@ IObservable AddRemovePrices(Market market, int priceCount, int para while (adding); // Verify the results - CheckResultContents(_marketListResults, priceResults); + await WaitForResultContentsAsync(_marketListResults, priceResults, TimeSpan.FromSeconds(5)); + await CheckResultContents(_marketListResults, priceResults); } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // having var emptyChangeSetObs = Observable.Empty>(); @@ -146,25 +138,25 @@ public void NullChecks() var actionMergeChangeSets0 = () => nullListOfCacheChangeSets.MergeChangeSets(comparer: emptyChildComparer); // then - emptyChangeSetObs.Should().NotBeNull(); - emptyChildComparer.Should().NotBeNull(); - emptyEqualityComparer.Should().NotBeNull(); - emptySelector.Should().NotBeNull(); - emptyListOfCacheChangeSets.Should().NotBeNull(); - nullChangeSetObs.Should().BeNull(); - nullChildComparer.Should().BeNull(); - nullSelector.Should().BeNull(); - nullListOfCacheChangeSets.Should().BeNull(); - - actionDefault0.Should().Throw(); - actionDefault1.Should().Throw(); - actionComparer0.Should().Throw(); - actionComparer1.Should().Throw(); - actionComparer2.Should().Throw(); - } - - [Fact] - public void AbleToInvokeFactory() + await Assert.That(emptyChangeSetObs).IsNotNull(); + await Assert.That(emptyChildComparer).IsNotNull(); + await Assert.That(emptyEqualityComparer).IsNotNull(); + await Assert.That(emptySelector).IsNotNull(); + await Assert.That(emptyListOfCacheChangeSets).IsNotNull(); + await Assert.That(nullChangeSetObs).IsNull(); + await Assert.That(nullChildComparer).IsNull(); + await Assert.That(nullSelector).IsNull(); + await Assert.That(nullListOfCacheChangeSets).IsNull(); + + await Assert.That(actionDefault0).Throws(); + await Assert.That(actionDefault1).Throws(); + await Assert.That(actionComparer0).Throws(); + await Assert.That(actionComparer1).Throws(); + await Assert.That(actionComparer2).Throws(); + } + + [Test] + public async Task AbleToInvokeFactory() { // having var invoked = false; @@ -179,12 +171,12 @@ IObservable> factory(IMarket m) _marketList.Add(new Market(0)); // then - _marketListResults.Data.Count.Should().Be(1); - invoked.Should().BeTrue(); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(1); + await Assert.That(invoked).IsTrue(); } - [Fact] - public void AllExistingSubItemsPresentInResult() + [Test] + public async Task AllExistingSubItemsPresentInResult() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -195,17 +187,17 @@ public void AllExistingSubItemsPresentInResult() _marketList.AddRange(markets); // then - _marketListResults.Data.Count.Should().Be(MarketCount); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AllNewSubItemsPresentInResult() + [Test] + public async Task AllNewSubItemsPresentInResult() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -216,17 +208,17 @@ public void AllNewSubItemsPresentInResult() markets.ForEach((m, index) => m.AddUniquePrices(index, PricesPerMarket, ItemIdStride, GetRandomPrice)); // then - _marketListResults.Data.Count.Should().Be(MarketCount); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AllRefreshedSubItemsAreRefreshed() + [Test] + public async Task AllRefreshedSubItemsAreRefreshed() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -238,17 +230,17 @@ public void AllRefreshedSubItemsAreRefreshed() markets.ForEach(m => m.RefreshAllPrices(GetRandomPrice)); // then - _marketListResults.Data.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * PricesPerMarket); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(MarketCount * PricesPerMarket); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(MarketCount * PricesPerMarket); } - [Fact] - public void AnyDuplicateKeyValuesShouldBeHidden() + [Test] + public async Task AnyDuplicateKeyValuesShouldBeHidden() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -260,38 +252,38 @@ public void AnyDuplicateKeyValuesShouldBeHidden() markets[1].SetPrices(0, PricesPerMarket, GetRandomPrice); // then - _marketListResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Data.Items.Zip(markets[0].PricesCache.Items).All(pair => Equals(pair.First, pair.Second))).IsTrue(); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeNoOpWhenRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeNoOpWhenRemoved() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); using var results = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); - _marketList.AddRange(markets); - markets[0].SetPrices(0, PricesPerMarket, GetRandomPrice); + _marketList.AddRange(markets); + markets[0].SetPrices(0, PricesPerMarket, GetRandomPrice); markets[1].SetPrices(0, PricesPerMarket, GetRandomPrice); // when markets[1].RemoveAllPrices(); // then - _marketListResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Data.Items.Zip(markets[0].PricesCache.Items).All(pair => Equals(pair.First, pair.Second))).IsTrue(); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } - [Fact] - public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() + [Test] + public async Task AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -304,15 +296,15 @@ public void AnyDuplicateValuesShouldBeUnhiddenWhenOtherIsRemoved() _marketList.Remove(markets[0]); // then - _marketListResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Data.Items.Zip(markets[1].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); - results.Messages.Count.Should().Be(2); - results.Messages[1].Updates.Should().Be(PricesPerMarket); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Data.Items.Zip(markets[1].PricesCache.Items).All(pair => Equals(pair.First, pair.Second))).IsTrue(); + await Assert.That(results.Messages.Count).IsEqualTo(2); + await Assert.That(results.Messages[1].Updates).IsEqualTo(PricesPerMarket); } - [Fact] - public void AnyDuplicateValuesShouldNotRefreshWhenHidden() + [Test] + public async Task AnyDuplicateValuesShouldNotRefreshWhenHidden() { // having var markets = Enumerable.Range(0, 2).Select(n => new Market(n)).ToArray(); @@ -325,14 +317,14 @@ public void AnyDuplicateValuesShouldNotRefreshWhenHidden() markets[1].RefreshAllPrices(GetRandomPrice); // then - _marketListResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Refreshes.Should().Be(0); - results.Data.Items.Zip(markets[0].PricesCache.Items).ForEach(pair => pair.First.Should().Be(pair.Second)); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(results.Data.Items.Zip(markets[0].PricesCache.Items).All(pair => Equals(pair.First, pair.Second))).IsTrue(); } - [Fact] - public void AnyRemovedSubItemIsRemoved() + [Test] + public async Task AnyRemovedSubItemIsRemoved() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -344,16 +336,16 @@ public void AnyRemovedSubItemIsRemoved() markets.ForEach(m => m.PricesCache.Edit(updater => updater.RemoveKeys(updater.Keys.Take(RemoveCount)))); // then - _marketListResults.Data.Count.Should().Be(MarketCount); - results.Data.Count.Should().Be(MarketCount * (PricesPerMarket - RemoveCount)); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Messages[0].Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(MarketCount * RemoveCount); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(MarketCount); + await Assert.That(results.Data.Count).IsEqualTo(MarketCount * (PricesPerMarket - RemoveCount)); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Messages[0].Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(MarketCount * RemoveCount); } - [Fact] - public void AnySourceItemRemovedRemovesAllSourceValues() + [Test] + public async Task AnySourceItemRemovedRemovesAllSourceValues() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -365,14 +357,14 @@ public void AnySourceItemRemovedRemovesAllSourceValues() _marketList.RemoveRange(0, RemoveCount); // then - _marketListResults.Data.Count.Should().Be(MarketCount - RemoveCount); - results.Data.Count.Should().Be((MarketCount - RemoveCount) * PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket * RemoveCount); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(MarketCount - RemoveCount); + await Assert.That(results.Data.Count).IsEqualTo((MarketCount - RemoveCount) * PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket * RemoveCount); } - [Fact] - public void ChangingSourceByAddRemoveRemovesPreviousAndAddsNewValues() + [Test] + public async Task ChangingSourceByAddRemoveRemovesPreviousAndAddsNewValues() { // having using var results = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); @@ -387,22 +379,22 @@ public void ChangingSourceByAddRemoveRemovesPreviousAndAddsNewValues() _marketList.Remove(market); // then - _marketListResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket * 2); - results.Messages.Count.Should().Be(3); - results.Messages[0].Adds.Should().Be(PricesPerMarket * 2); - results.Messages[1].Adds.Should().Be(PricesPerMarket); - results.Messages[2].Updates.Should().Be(PricesPerMarket); - results.Messages[2].Removes.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * 3); - results.Summary.Overall.Updates.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket); - results.Data.Items.Should().BeSubsetOf(otherMarket.PricesCache.Items); - otherMarket.PricesCache.Items.Should().BeSubsetOf(results.Data.Items); - } - - [Fact] - public void ChangingSourceByRemoveAddRemovesPreviousAndAddsNewValues() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Adds).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Messages[1].Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages[2].Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages[2].Removes).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * 3); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket); + await Assert.That(results.Data.Items.Except(otherMarket.PricesCache.Items).Any()).IsFalse(); + await Assert.That(otherMarket.PricesCache.Items.Except(results.Data.Items).Any()).IsFalse(); + } + + [Test] + public async Task ChangingSourceByRemoveAddRemovesPreviousAndAddsNewValues() { // having using var results = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); @@ -417,21 +409,21 @@ public void ChangingSourceByRemoveAddRemovesPreviousAndAddsNewValues() _marketList.Add(otherMarket); // then - _marketListResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket * 2); - results.Messages.Count.Should().Be(3); - results.Messages[0].Adds.Should().Be(PricesPerMarket * 2); - results.Messages[1].Removes.Should().Be(PricesPerMarket * 2); - results.Messages[2].Adds.Should().Be(PricesPerMarket * 2); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * 4); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Removes.Should().Be(PricesPerMarket * 2); - results.Data.Items.Should().BeSubsetOf(otherMarket.PricesCache.Items); - otherMarket.PricesCache.Items.Should().BeSubsetOf(results.Data.Items); - } - - [Fact] - public void ChangingSourceByReplaceRemovesPreviousAndAddsNewValues() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[0].Adds).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Messages[1].Removes).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Messages[2].Adds).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * 4); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Data.Items.Except(otherMarket.PricesCache.Items).Any()).IsFalse(); + await Assert.That(otherMarket.PricesCache.Items.Except(results.Data.Items).Any()).IsFalse(); + } + + [Test] + public async Task ChangingSourceByReplaceRemovesPreviousAndAddsNewValues() { // having using var results = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); @@ -445,14 +437,14 @@ public void ChangingSourceByReplaceRemovesPreviousAndAddsNewValues() _marketList.Replace(market, otherMarket); // then - _marketListResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket * 2); - results.Data.Items.Should().BeSubsetOf(otherMarket.PricesCache.Items); - otherMarket.PricesCache.Items.Should().BeSubsetOf(results.Data.Items); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * 2); + await Assert.That(results.Data.Items.Except(otherMarket.PricesCache.Items).Any()).IsFalse(); + await Assert.That(otherMarket.PricesCache.Items.Except(results.Data.Items).Any()).IsFalse(); } - [Fact] - public void ComparerOnlyAddsBetterAddedValues() + [Test] + public async Task ComparerOnlyAddsBetterAddedValues() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -470,19 +462,19 @@ public void ComparerOnlyAddsBetterAddedValues() marketHigh.SetPrices(0, PricesPerMarket, HighestPrice); // then - _marketListResults.Data.Count.Should().Be(3); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(3); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketLow.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketHigh.Id))).IsTrue(); } - [Fact] - public void ComparerOnlyAddsBetterExistingValues() + [Test] + public async Task ComparerOnlyAddsBetterExistingValues() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -500,19 +492,19 @@ public void ComparerOnlyAddsBetterExistingValues() _marketList.Add(marketHigh); // then - _marketListResults.Data.Count.Should().Be(3); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(3); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketLow.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketHigh.Id))).IsTrue(); } - [Fact] - public void ComparerOnlyAddsBetterValuesOnSourceReplace() + [Test] + public async Task ComparerOnlyAddsBetterValuesOnSourceReplace() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -530,21 +522,21 @@ public void ComparerOnlyAddsBetterValuesOnSourceReplace() _marketList.Replace(marketLow, marketLowLow); // then - _marketListResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLowLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnRefresh() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketLowLow.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnRefresh() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -560,23 +552,23 @@ public void ComparerUpdatesToCorrectValueOnRefresh() marketFlipFlop.RefreshAllPrices(LowestPrice); // then - _marketListResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketFlipFlop.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnRemove() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketFlipFlop.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnRemove() { // having using var results = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer).AsAggregator(); @@ -596,25 +588,25 @@ public void ComparerUpdatesToCorrectValueOnRemove() _marketList.Remove(marketLow); // then - _marketListResults.Data.Count.Should().Be(2); - results.Data.Count.Should().Be(PricesPerMarket); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(0); - results.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketHigh.Id)); - } - - [Fact] - public void ComparerUpdatesToCorrectValueOnUpdate() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketHigh.Id))).IsTrue(); + } + + [Test] + public async Task ComparerUpdatesToCorrectValueOnUpdate() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -630,23 +622,23 @@ public void ComparerUpdatesToCorrectValueOnUpdate() marketFlipFlop.UpdateAllPrices(LowestPrice); // then - _marketListResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketFlipFlop.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerOnlyUpdatesVisibleValuesOnUpdate() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketFlipFlop.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + } + + [Test] + public async Task ComparerOnlyUpdatesVisibleValuesOnUpdate() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.HighPriceCompare).AsAggregator(); @@ -662,23 +654,23 @@ public void ComparerOnlyUpdatesVisibleValuesOnUpdate() marketLow.UpdateAllPrices(LowestPrice - 1); // then - _marketListResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket * 2); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(0); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void ComparerOnlyRefreshesVisibleValues() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket * 2); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketLow.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + } + + [Test] + public async Task ComparerOnlyRefreshesVisibleValues() { // having using var highPriceResults = _marketList.Connect().MergeManyChangeSets(m => m.LatestPrices, MarketPrice.EqualityComparer, MarketPrice.HighPriceCompare).AsAggregator(); @@ -694,23 +686,23 @@ public void ComparerOnlyRefreshesVisibleValues() marketLow.RefreshAllPrices(LowestPrice - 1); // then - _marketListResults.Data.Count.Should().Be(2); - lowPriceResults.Data.Count.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Removes.Should().Be(0); - lowPriceResults.Summary.Overall.Updates.Should().Be(PricesPerMarket); - lowPriceResults.Summary.Overall.Refreshes.Should().Be(PricesPerMarket); - lowPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketLow.Id)); - highPriceResults.Data.Count.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Adds.Should().Be(PricesPerMarket); - highPriceResults.Summary.Overall.Removes.Should().Be(0); - highPriceResults.Summary.Overall.Updates.Should().Be(0); - highPriceResults.Summary.Overall.Refreshes.Should().Be(0); - highPriceResults.Data.Items.Select(cp => cp.MarketId).ForEach(guid => guid.Should().Be(marketOriginal.Id)); - } - - [Fact] - public void EqualityComparerHidesUpdatesWithoutChanges() + await Assert.That(_marketListResults.Data.Count).IsEqualTo(2); + await Assert.That(lowPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(lowPriceResults.Summary.Overall.Updates).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Summary.Overall.Refreshes).IsEqualTo(PricesPerMarket); + await Assert.That(lowPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketLow.Id))).IsTrue(); + await Assert.That(highPriceResults.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(highPriceResults.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(highPriceResults.Summary.Overall.Refreshes).IsEqualTo(0); + await Assert.That(highPriceResults.Data.Items.Select(cp => cp.MarketId).All(guid => guid.Equals(marketOriginal.Id))).IsTrue(); + } + + [Test] + public async Task EqualityComparerHidesUpdatesWithoutChanges() { // having var market = new Market(0); @@ -722,17 +714,17 @@ public void EqualityComparerHidesUpdatesWithoutChanges() market.UpdateAllPrices(LowestPrice); // then - _marketListResults.Data.Count.Should().Be(1); - results.Data.Count.Should().Be(PricesPerMarket); - results.Messages.Count.Should().Be(1); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(1); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket); + await Assert.That(results.Messages.Count).IsEqualTo(1); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Fact] - public void EveryItemVisibleWhenSequenceCompletes() + [Test] + public async Task EveryItemVisibleWhenSequenceCompletes() { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket))); @@ -742,19 +734,19 @@ public void EveryItemVisibleWhenSequenceCompletes() DisposeMarkets(); // then - results.Data.Count.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Adds.Should().Be(PricesPerMarket * MarketCount); - results.Summary.Overall.Removes.Should().Be(0); - results.Summary.Overall.Updates.Should().Be(0); - results.Summary.Overall.Refreshes.Should().Be(0); + await Assert.That(results.Data.Count).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(PricesPerMarket * MarketCount); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); + await Assert.That(results.Summary.Overall.Refreshes).IsEqualTo(0); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { // having _marketList.AddRange(Enumerable.Range(0, MarketCount).Select(n => new FixedMarket(GetRandomPrice, n * ItemIdStride, (n * ItemIdStride) + PricesPerMarket, completable: completeChildren))); @@ -771,12 +763,12 @@ public void MergedObservableCompletesOnlyWhenSourceAndAllChildrenComplete(bool c } // then - hasSourceSequenceCompleted.Should().Be(completeSource); - hasMergedSequenceCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(hasSourceSequenceCompleted).IsEqualTo(completeSource); + await Assert.That(hasMergedSequenceCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void MergedObservableWillFailIfSourceFails() + [Test] + public async Task MergedObservableWillFailIfSourceFails() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -792,11 +784,11 @@ public void MergedObservableWillFailIfSourceFails() DisposeMarkets(); // then - receivedError.Should().Be(expectedError); + await Assert.That(receivedError).IsEqualTo(expectedError); } - [Fact] - public void SourceListMergeCacheChangeSets() + [Test] + public async Task SourceListMergeCacheChangeSets() { // having var markets = Enumerable.Range(0, MarketCount).Select(n => new Market(n)).ToArray(); @@ -809,40 +801,63 @@ public void SourceListMergeCacheChangeSets() markets.ForEach(m => _marketList.Remove(m)); // then - _marketListResults.Data.Count.Should().Be(0); - markets.Sum(m => m.PricesCache.Count).Should().Be(MarketCount * PricesPerMarket); - results.Data.Count.Should().Be(0); - results.Messages.Count.Should().Be(MarketCount * 2); - results.Summary.Overall.Adds.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Removes.Should().Be(MarketCount * PricesPerMarket); - results.Summary.Overall.Updates.Should().Be(0); + await Assert.That(_marketListResults.Data.Count).IsEqualTo(0); + await Assert.That(markets.Sum(m => m.PricesCache.Count)).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Data.Count).IsEqualTo(0); + await Assert.That(results.Messages.Count).IsEqualTo(MarketCount * 2); + await Assert.That(results.Summary.Overall.Adds).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Removes).IsEqualTo(MarketCount * PricesPerMarket); + await Assert.That(results.Summary.Overall.Updates).IsEqualTo(0); } public void Dispose() { _marketListResults.Dispose(); DisposeMarkets(); + _marketList.Dispose(); } - private void CheckResultContents(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults) + private async Task CheckResultContents(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults) { var expectedMarkets = _marketList.Items.ToList(); var expectedPrices = expectedMarkets.SelectMany(market => ((Market)market).PricesCache.Items).ToList(); // These should be subsets of each other - expectedMarkets.Should().BeSubsetOf(marketResults.Data.Items); - marketResults.Data.Items.Count.Should().Be(expectedMarkets.Count); + await Assert.That(expectedMarkets.Except(marketResults.Data.Items).Any()).IsFalse(); + await Assert.That(marketResults.Data.Items.Count).IsEqualTo(expectedMarkets.Count); // These should be subsets of each other - expectedPrices.Should().BeSubsetOf(priceResults.Data.Items); - priceResults.Data.Items.Count.Should().Be(expectedPrices.Count); + await Assert.That(expectedPrices.Except(priceResults.Data.Items).Any()).IsFalse(); + await Assert.That(priceResults.Data.Items.Count).IsEqualTo(expectedPrices.Count); + } + + private async Task WaitForResultContentsAsync(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults, TimeSpan timeout) + { + var deadline = DateTimeOffset.UtcNow + timeout; + while (!ResultContentsMatch(marketResults, priceResults) && DateTimeOffset.UtcNow < deadline) + { + await Task.Delay(TimeSpan.FromMilliseconds(10)); + } + } + + private bool ResultContentsMatch(ChangeSetAggregator marketResults, ChangeSetAggregator priceResults) + { + var expectedMarkets = _marketList.Items.ToList(); + var expectedPrices = expectedMarkets.SelectMany(market => ((Market)market).PricesCache.Items).ToList(); + var actualMarkets = marketResults.Data.Items; + var actualPrices = priceResults.Data.Items; + + return actualMarkets.Count == expectedMarkets.Count && + actualPrices.Count == expectedPrices.Count && + expectedMarkets.All(actualMarkets.Contains) && + expectedPrices.All(actualPrices.Contains); } private void DisposeMarkets() { - _marketList.Items.ForEach(m => (m as IDisposable)?.Dispose()); + var markets = _marketList.Items.ToArray(); + markets.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/MergeManyChangeSetsFixture.cs b/src/DynamicData.Tests/List/MergeManyChangeSetsFixture.cs index ea8019ea4..c72af641c 100644 --- a/src/DynamicData.Tests/List/MergeManyChangeSetsFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyChangeSetsFixture.cs @@ -1,14 +1,9 @@ -using System.Linq; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class MergeManyChangeSetsFixture { - [Fact] - public void MergeManyShouldWork() + [Test] + public async Task MergeManyShouldWork() { var a = new SourceList(); var b = new SourceList(); @@ -21,35 +16,33 @@ public void MergeManyShouldWork() var d = parent.Connect().MergeMany(e => e.Connect().RemoveIndex()).AsObservableList(); - d.Count.Should().Be(0); + await Assert.That(d.Count).IsEqualTo(0); a.Add(1); - d.Count.Should().Be(1); + await Assert.That(d.Count).IsEqualTo(1); a.Add(2); - d.Count.Should().Be(2); + await Assert.That(d.Count).IsEqualTo(2); b.Add(3); - d.Count.Should().Be(3); + await Assert.That(d.Count).IsEqualTo(3); b.Add(5); - d.Count.Should().Be(4); - new[] { 1, 2, 3, 5 }.Should().BeEquivalentTo(d.Items); + await Assert.That(d.Count).IsEqualTo(4); + await Assert.That(new[] { 1, 2, 3, 5 }).IsEquivalentTo(d.Items); b.Clear(); // Fails below - d.Count.Should().Be(2); - new[] { 1, 2 }.Should().BeEquivalentTo(d.Items); - - a.ReplaceAt(0,100); - new[] { 2, 100 }.Should().BeEquivalentTo(d.Items); + await Assert.That(d.Count).IsEqualTo(2); + await Assert.That(new[] { 1, 2 }).IsEquivalentTo(d.Items); + a.ReplaceAt(0, 100); + await Assert.That(new[] { 2, 100 }).IsEquivalentTo(d.Items); var f = new SourceList(); - f.AddRange(Enumerable.Range(10,5)); - parent.ReplaceAt(2,f); - + f.AddRange(Enumerable.Range(10, 5)); + parent.ReplaceAt(2, f); - new[] { 2, 100, 10,11,12,13,14 }.Should().BeEquivalentTo(d.Items); + await Assert.That(new[] { 2, 100, 10, 11, 12, 13, 14 }).IsEquivalentTo(d.Items); } } diff --git a/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs b/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs index 41cec34e1..3cea64fc0 100644 --- a/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs @@ -1,17 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Threading.Tasks; using Bogus; +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.List; @@ -45,13 +38,13 @@ public MergeManyChangeSetsListFixture() _animalResults = _animalOwners.Connect().MergeManyChangeSets(owner => owner.Animals.Connect()).AsAggregator(); } - [Theory] - [InlineData(5, 7)] - [InlineData(10, 50)] + [Test] + [Arguments(5, 7)] + [Arguments(10, 50)] #if !DEBUG - [InlineData(10, 1_000)] - [InlineData(200, 500)] - [InlineData(1_000, 10)] + [Arguments(10, 1_000)] + [Arguments(200, 500)] + [Arguments(1_000, 10)] #endif public async Task MultiThreadedStressTest(int ownerCount, int animalCount) { @@ -115,11 +108,11 @@ IObservable AddRemoveAnimals(AnimalOwner owner, int animalCount, int par while (addingAnimals); // Verify the results - CheckResultContents(); + await CheckResultContents(); } - [Fact] - public void NullChecks() + [Test] + public async Task NullChecks() { // Arrange var emptyChangeSetObs = Observable.Empty>(); @@ -132,30 +125,30 @@ public void NullChecks() var checkParam2 = () => emptyChangeSetObs.MergeManyChangeSets(nullSelector); // Assert - emptyChangeSetObs.Should().NotBeNull(); - emptySelector.Should().NotBeNull(); - nullChangeSetObs.Should().BeNull(); - nullSelector.Should().BeNull(); + await Assert.That(emptyChangeSetObs).IsNotNull(); + await Assert.That(emptySelector).IsNotNull(); + await Assert.That(nullChangeSetObs).IsNull(); + await Assert.That(nullSelector).IsNull(); - checkParam1.Should().Throw(); - checkParam2.Should().Throw(); + await Assert.That(checkParam1).Throws(); + await Assert.That(checkParam2).Throws(); } - [Fact] - public void ResultContainsAllInitialChildren() + [Test] + public async Task ResultContainsAllInitialChildren() { // Arrange // Act // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(1); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenFromParentsAddedWithAddRange() + [Test] + public async Task ResultContainsChildrenFromParentsAddedWithAddRange() { // Arrange var addThese = _animalOwnerFaker.Generate(AddRangeSize); @@ -164,14 +157,14 @@ public void ResultContainsChildrenFromParentsAddedWithAddRange() _animalOwners.AddRange(addThese); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount + AddRangeSize); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for additional add - addThese.SelectMany(added => added.Animals.Items).ForEach(added => _animalResults.Data.Items.Should().Contain(added)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount + AddRangeSize); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for additional add + await Assert.That(addThese.SelectMany(added => added.Animals.Items).All(added => _animalResults.Data.Items.Contains(added))).IsTrue(); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenFromParentsAddedWithAdd() + [Test] + public async Task ResultContainsChildrenFromParentsAddedWithAdd() { // Arrange var addThis = _animalOwnerFaker.Generate(); @@ -180,14 +173,14 @@ public void ResultContainsChildrenFromParentsAddedWithAdd() _animalOwners.Add(addThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount + 1); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for additional add - addThis.Animals.Items.ForEach(added => _animalResults.Data.Items.Should().Contain(added)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount + 1); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for additional add + await Assert.That(addThis.Animals.Items.All(added => _animalResults.Data.Items.Contains(added))).IsTrue(); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenFromParentsAddedWithInsert() + [Test] + public async Task ResultContainsChildrenFromParentsAddedWithInsert() { // Arrange var insertIndex = _randomizer.Number(_animalOwners.Count); @@ -197,15 +190,15 @@ public void ResultContainsChildrenFromParentsAddedWithInsert() _animalOwners.Insert(insertIndex, insertThis); // Assert - _animalOwners.Items.ElementAt(insertIndex).Should().Be(insertThis); - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount + 1); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for additional add - insertThis.Animals.Items.ForEach(added => _animalResults.Data.Items.Should().Contain(added)); - CheckResultContents(); + await Assert.That(_animalOwners.Items.ElementAt(insertIndex)).IsEqualTo(insertThis); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount + 1); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for additional add + await Assert.That(insertThis.Animals.Items.All(added => _animalResults.Data.Items.Contains(added))).IsTrue(); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenFromParentsRemovedWithRemove() + [Test] + public async Task ResultDoesNotContainChildrenFromParentsRemovedWithRemove() { // Arrange var removeThis = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -214,15 +207,15 @@ public void ResultDoesNotContainChildrenFromParentsRemovedWithRemove() _animalOwners.Remove(removeThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - 1); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - removeThis.Animals.Items.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - 1); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(removeThis.Animals.Items.All(removed => !_animalResults.Data.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); removeThis.Dispose(); } - [Fact] - public void ResultDoesNotContainChildrenFromParentsRemovedWithRemoveAt() + [Test] + public async Task ResultDoesNotContainChildrenFromParentsRemovedWithRemoveAt() { // Arrange var removeIndex = _randomizer.Number(_animalOwners.Count - 1); @@ -232,15 +225,15 @@ public void ResultDoesNotContainChildrenFromParentsRemovedWithRemoveAt() _animalOwners.RemoveAt(removeIndex); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - 1); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - removeThis.Animals.Items.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - 1); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(removeThis.Animals.Items.All(removed => !_animalResults.Data.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); removeThis.Dispose(); } - [Fact] - public void ResultDoesNotContainChildrenFromParentsRemovedWithRemoveRange() + [Test] + public async Task ResultDoesNotContainChildrenFromParentsRemovedWithRemoveRange() { // Arrange var removeIndex = _randomizer.Number(_animalOwners.Count - RemoveRangeSize - 1); @@ -250,15 +243,15 @@ public void ResultDoesNotContainChildrenFromParentsRemovedWithRemoveRange() _animalOwners.RemoveRange(removeIndex, RemoveRangeSize); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - RemoveRangeSize); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - removeThese.SelectMany(owner => owner.Animals.Items).ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - RemoveRangeSize); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(removeThese.SelectMany(owner => owner.Animals.Items).All(removed => !_animalResults.Data.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); removeThese.ForEach(owner => owner.Dispose()); } - [Fact] - public void ResultDoesNotContainChildrenFromParentsRemovedWithRemoveMany() + [Test] + public async Task ResultDoesNotContainChildrenFromParentsRemovedWithRemoveMany() { // Arrange var removeThese = _randomizer.ListItems(_animalOwners.Items.ToList(), RemoveRangeSize); @@ -267,15 +260,15 @@ public void ResultDoesNotContainChildrenFromParentsRemovedWithRemoveMany() _animalOwners.RemoveMany(removeThese); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount - RemoveRangeSize); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - removeThese.SelectMany(owner => owner.Animals.Items).ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount - RemoveRangeSize); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(removeThese.SelectMany(owner => owner.Animals.Items).All(removed => !_animalResults.Data.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); removeThese.ForEach(owner => owner.Dispose()); } - [Fact] - public void ResultContainsCorrectItemsAfterParentReplacement() + [Test] + public async Task ResultContainsCorrectItemsAfterParentReplacement() { // Arrange var replaceThis = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -285,16 +278,16 @@ public void ResultContainsCorrectItemsAfterParentReplacement() _animalOwners.Replace(replaceThis, withThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); // Owner Count should not change - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - replaceThis.Animals.Items.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - withThis.Animals.Items.ForEach(added => _animalResults.Data.Items.Should().Contain(added)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); // Owner Count should not change + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(replaceThis.Animals.Items.All(removed => !_animalResults.Data.Items.Contains(removed))).IsTrue(); + await Assert.That(withThis.Animals.Items.All(added => _animalResults.Data.Items.Contains(added))).IsTrue(); + await CheckResultContents(); replaceThis.Dispose(); } - [Fact] - public void ResultEmptyIfSourceIsCleared() + [Test] + public async Task ResultEmptyIfSourceIsCleared() { // Arrange var items = _animalOwners.Items.ToList(); @@ -303,15 +296,15 @@ public void ResultEmptyIfSourceIsCleared() _animalOwners.Clear(); // Assert - _animalOwnerResults.Data.Count.Should().Be(0); - _animalResults.Data.Count.Should().Be(0); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(0); + await Assert.That(_animalResults.Data.Count).IsEqualTo(0); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await CheckResultContents(); items.ForEach(owner => owner.Dispose()); } - [Fact] - public void ResultContainsChildrenAddedWithAddRange() + [Test] + public async Task ResultContainsChildrenAddedWithAddRange() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -322,15 +315,15 @@ public void ResultContainsChildrenAddedWithAddRange() randomOwner.Animals.AddRange(addThese); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for additional add - addThese.ForEach(animal => _animalResults.Data.Items.Should().Contain(animal)); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount + AddRangeSize); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for additional add + await Assert.That(addThese.All(animal => _animalResults.Data.Items.Contains(animal))).IsTrue(); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount + AddRangeSize); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenAddedWithAdd() + [Test] + public async Task ResultContainsChildrenAddedWithAdd() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -341,15 +334,15 @@ public void ResultContainsChildrenAddedWithAdd() randomOwner.Animals.Add(addThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - _animalResults.Data.Items.Should().Contain(addThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount + 1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(_animalResults.Data.Items).Contains(addThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount + 1); + await CheckResultContents(); } - [Fact] - public void ResultContainsChildrenAddedWithInsert() + [Test] + public async Task ResultContainsChildrenAddedWithInsert() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -361,16 +354,16 @@ public void ResultContainsChildrenAddedWithInsert() randomOwner.Animals.Insert(insertIndex, insertThis); // Assert - randomOwner.Animals.Items.ElementAt(insertIndex).Should().Be(insertThis); - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for additional add - _animalResults.Data.Items.Should().Contain(insertThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount + 1); - CheckResultContents(); + await Assert.That(randomOwner.Animals.Items.ElementAt(insertIndex)).IsEqualTo(insertThis); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for additional add + await Assert.That(_animalResults.Data.Items).Contains(insertThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount + 1); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemove() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemove() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -381,15 +374,15 @@ public void ResultDoesNotContainChildrenRemovedWithRemove() randomOwner.Animals.Remove(removeThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - _animalResults.Data.Items.Should().NotContain(removeThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount - 1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(_animalResults.Data.Items).DoesNotContain(removeThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount - 1); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemoveAt() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemoveAt() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -401,15 +394,15 @@ public void ResultDoesNotContainChildrenRemovedWithRemoveAt() randomOwner.Animals.RemoveAt(removeIndex); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - _animalResults.Data.Items.Should().NotContain(removeThis); - _animalOwners.Items.Sum(owner => owner.Animals.Count).Should().Be(initialCount - 1); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(_animalResults.Data.Items).DoesNotContain(removeThis); + await Assert.That(_animalOwners.Items.Sum(owner => owner.Animals.Count)).IsEqualTo(initialCount - 1); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemoveRange() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemoveRange() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -421,14 +414,14 @@ public void ResultDoesNotContainChildrenRemovedWithRemoveRange() randomOwner.Animals.RemoveRange(removeIndex, removeCount); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - removeThese.ForEach(removed => randomOwner.Animals.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(removeThese.All(removed => !randomOwner.Animals.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); } - [Fact] - public void ResultDoesNotContainChildrenRemovedWithRemoveMany() + [Test] + public async Task ResultDoesNotContainChildrenRemovedWithRemoveMany() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -439,14 +432,14 @@ public void ResultDoesNotContainChildrenRemovedWithRemoveMany() randomOwner.Animals.RemoveMany(removeThese); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - removeThese.ForEach(removed => randomOwner.Animals.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(removeThese.All(removed => !randomOwner.Animals.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); } - [Fact] - public void ResultContainsCorrectItemsAfterChildReplacement() + [Test] + public async Task ResultContainsCorrectItemsAfterChildReplacement() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -457,15 +450,15 @@ public void ResultContainsCorrectItemsAfterChildReplacement() randomOwner.Animals.Replace(replaceThis, withThis); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for update - randomOwner.Animals.Items.Should().NotContain(replaceThis); - randomOwner.Animals.Items.Should().Contain(withThis); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for update + await Assert.That(randomOwner.Animals.Items).DoesNotContain(replaceThis); + await Assert.That(randomOwner.Animals.Items).Contains(withThis); + await CheckResultContents(); } - [Fact] - public void ResultContainsCorrectItemsAfterChildClear() + [Test] + public async Task ResultContainsCorrectItemsAfterChildClear() { // Arrange var randomOwner = _randomizer.ListItem(_animalOwners.Items.ToList()); @@ -475,19 +468,19 @@ public void ResultContainsCorrectItemsAfterChildClear() randomOwner.Animals.Clear(); // Assert - _animalOwnerResults.Data.Count.Should().Be(InitialOwnerCount); - _animalResults.Messages.Count.Should().Be(2); // 1 for initial add, 1 for removing - randomOwner.Animals.Count.Should().Be(0); - removedAnimals.ForEach(removed => _animalResults.Data.Items.Should().NotContain(removed)); - CheckResultContents(); + await Assert.That(_animalOwnerResults.Data.Count).IsEqualTo(InitialOwnerCount); + await Assert.That(_animalResults.Messages.Count).IsEqualTo(2); // 1 for initial add, 1 for removing + await Assert.That(randomOwner.Animals.Count).IsEqualTo(0); + await Assert.That(removedAnimals.All(removed => !_animalResults.Data.Items.Contains(removed))).IsTrue(); + await CheckResultContents(); } - [Theory] - [InlineData(false, false)] - [InlineData(false, true)] - [InlineData(true, false)] - [InlineData(true, true)] - public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) + [Test] + [Arguments(false, false)] + [Arguments(false, true)] + [Arguments(true, false)] + [Arguments(true, true)] + public async Task ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSource, bool completeChildren) { // Arrange @@ -499,12 +492,12 @@ public void ResultCompletesOnlyWhenSourceAndAllChildrenComplete(bool completeSou } // Assert - _animalOwnerResults.IsCompleted.Should().Be(completeSource); - _animalResults.IsCompleted.Should().Be(completeSource && completeChildren); + await Assert.That(_animalOwnerResults.IsCompleted).IsEqualTo(completeSource); + await Assert.That(_animalResults.IsCompleted).IsEqualTo(completeSource && completeChildren); } - [Fact] - public void ResultFailsIfSourceFails() + [Test] + public async Task ResultFailsIfSourceFails() { // Arrange var expectedError = new Exception("Expected"); @@ -515,34 +508,35 @@ public void ResultFailsIfSourceFails() _animalOwners.Dispose(); // Assert - results.Exception.Should().Be(expectedError); + await Assert.That(results.Exception).IsEqualTo(expectedError); } - private void CheckResultContents() => CheckResultContents(_animalOwners.Items, _animalOwnerResults, _animalResults); + private Task CheckResultContents() => CheckResultContents(_animalOwners.Items, _animalOwnerResults, _animalResults); - private static void CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults) + private static async Task CheckResultContents(IEnumerable owners, ChangeSetAggregator ownerResults, ChangeSetAggregator animalResults) { var expectedOwners = owners.ToList(); // These should be subsets of each other - expectedOwners.Should().BeSubsetOf(ownerResults.Data.Items); - ownerResults.Data.Items.Count.Should().Be(expectedOwners.Count); + await Assert.That(expectedOwners.Except(ownerResults.Data.Items).Any()).IsFalse(); + await Assert.That(ownerResults.Data.Items.Count).IsEqualTo(expectedOwners.Count); // All owner animals should be in the results foreach (var owner in owners) { - owner.Animals.Items.Should().BeSubsetOf(animalResults.Data.Items); + await Assert.That(owner.Animals.Items.Except(animalResults.Data.Items).Any()).IsFalse(); } // Results should not have more than the total number of animals - animalResults.Data.Count.Should().Be(owners.Sum(owner => owner.Animals.Count)); + await Assert.That(animalResults.Data.Count).IsEqualTo(owners.Sum(owner => owner.Animals.Count)); } public void Dispose() { - _animalOwners.Items.ForEach(owner => owner.Dispose()); + var owners = _animalOwners.Items.ToArray(); _animalOwnerResults.Dispose(); _animalResults.Dispose(); + owners.ForEach(owner => owner.Dispose()); _animalOwners.Dispose(); } } diff --git a/src/DynamicData.Tests/List/MergeManyFixture.cs b/src/DynamicData.Tests/List/MergeManyFixture.cs index 997e91f9f..49b89cba5 100644 --- a/src/DynamicData.Tests/List/MergeManyFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class MergeManyFixture : IDisposable @@ -16,8 +8,8 @@ public class MergeManyFixture : IDisposable public void Dispose() => _source.Dispose(); - [Fact] - public void EverythingIsUnsubscribedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsUnsubscribedWhenStreamIsDisposed() { var invoked = false; var stream = _source.Connect().MergeMany(o => o.Observable).Subscribe(o => { invoked = true; }); @@ -28,14 +20,14 @@ public void EverythingIsUnsubscribedWhenStreamIsDisposed() stream.Dispose(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); } /// /// Invocations the only when child is invoked. /// - [Fact] - public void InvocationOnlyWhenChildIsInvoked() + [Test] + public async Task InvocationOnlyWhenChildIsInvoked() { var invoked = false; @@ -44,15 +36,15 @@ public void InvocationOnlyWhenChildIsInvoked() var item = new ObjectWithObservable(1); _source.Add(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); stream.Dispose(); } - [Fact] - public void RemovedItemWillNotCauseInvocation() + [Test] + public async Task RemovedItemWillNotCauseInvocation() { var invoked = false; var stream = _source.Connect().MergeMany(o => o.Observable).Subscribe(o => { invoked = true; }); @@ -60,18 +52,18 @@ public void RemovedItemWillNotCauseInvocation() var item = new ObjectWithObservable(1); _source.Add(item); _source.Remove(item); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); item.InvokeObservable(true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); stream.Dispose(); } /// /// Merged stream does not complete if a child stream is still active. /// - [Fact] - public void MergedStreamDoesNotCompleteWhileItemStreamActive() + [Test] + public async Task MergedStreamDoesNotCompleteWhileItemStreamActive() { var streamCompleted = false; var sourceCompleted = false; @@ -84,15 +76,15 @@ public void MergedStreamDoesNotCompleteWhileItemStreamActive() _source.Dispose(); - sourceCompleted.Should().BeTrue(); - streamCompleted.Should().BeFalse(); + await Assert.That(sourceCompleted).IsTrue(); + await Assert.That(streamCompleted).IsFalse(); } /// /// Stream completes only when source and all child are complete. /// - [Fact] - public void MergedStreamCompletesWhenSourceAndItemsComplete() + [Test] + public async Task MergedStreamCompletesWhenSourceAndItemsComplete() { var streamCompleted = false; var sourceCompleted = false; @@ -106,15 +98,15 @@ public void MergedStreamCompletesWhenSourceAndItemsComplete() _source.Dispose(); item.CompleteObservable(); - sourceCompleted.Should().BeTrue(); - streamCompleted.Should().BeTrue(); + await Assert.That(sourceCompleted).IsTrue(); + await Assert.That(streamCompleted).IsTrue(); } /// /// Stream completes even if one of the children fails. /// - [Fact] - public void MergedStreamCompletesIfLastItemFails() + [Test] + public async Task MergedStreamCompletesIfLastItemFails() { var receivedError = default(Exception); var streamCompleted = false; @@ -129,16 +121,16 @@ public void MergedStreamCompletesIfLastItemFails() _source.Dispose(); item.FailObservable(new Exception("Test exception")); - receivedError.Should().Be(default); - sourceCompleted.Should().BeTrue(); - streamCompleted.Should().BeTrue(); + await Assert.That(receivedError).IsNull(); + await Assert.That(sourceCompleted).IsTrue(); + await Assert.That(streamCompleted).IsTrue(); } /// /// If the source stream has an error, the merged steam should also. /// - [Fact] - public void MergedStreamFailsWhenSourceFails() + [Test] + public async Task MergedStreamFailsWhenSourceFails() { var receivedError = default(Exception); var expectedError = new Exception("Test exception"); @@ -151,12 +143,12 @@ public void MergedStreamFailsWhenSourceFails() _source.Dispose(); - receivedError.Should().Be(expectedError); + await Assert.That(receivedError).IsEqualTo(expectedError); } - private class ObjectWithObservable(int id) + private class ObjectWithObservable(int id) : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly ReactiveUI.Primitives.Signals.ISignal _changed = new ReactiveUI.Primitives.Signals.Signal(); private bool _value; @@ -173,5 +165,7 @@ public void InvokeObservable(bool value) _value = value; _changed.OnNext(value); } + + public void Dispose() => _changed.Dispose(); } } diff --git a/src/DynamicData.Tests/List/OnItemAddedFixture.cs b/src/DynamicData.Tests/List/OnItemAddedFixture.cs index 3585426cb..fe2d2ffa8 100644 --- a/src/DynamicData.Tests/List/OnItemAddedFixture.cs +++ b/src/DynamicData.Tests/List/OnItemAddedFixture.cs @@ -1,24 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public class OnItemAddedFixture { - [Theory] - [InlineData(0, 0)] - [InlineData(1, 0)] - [InlineData(1, 1)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 5)] - public void ItemIsAdded_AddActionIsInvoked( + [Test] + [Arguments(0, 0)] + [Arguments(1, 0)] + [Arguments(1, 1)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 5)] + public async Task ItemIsAdded_AddActionIsInvoked( int initialItemCount, int insertionIndex) { @@ -28,59 +19,55 @@ public void ItemIsAdded_AddActionIsInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (initialItemCount is 0) - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to be published"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to be published"); else - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - + if (initialItemCount is 0) - addActionInvocations.Should().BeEmpty("no initial items were added to the collection"); + await Assert.That(addActionInvocations).IsEmpty().Because("no initial items were added to the collection"); else - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.Insert( - index: insertionIndex, - item: initialItemCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was added to the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEquivalentTo(new[] { initialItemCount }, "an item was added to the collection"); + index: insertionIndex, + item: initialItemCount); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was added to the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEquivalentTo(new[] { initialItemCount }).Because("an item was added to the collection"); } - [Theory] - [InlineData(2, 0, 1)] - [InlineData(2, 1, 0)] - [InlineData(5, 0, 4)] - [InlineData(5, 4, 0)] - [InlineData(5, 1, 3)] - [InlineData(5, 3, 1)] - public void ItemIsMoved_AddActionIsNotInvoked( + [Test] + [Arguments(2, 0, 1)] + [Arguments(2, 1, 0)] + [Arguments(5, 0, 4)] + [Arguments(5, 4, 0)] + [Arguments(5, 1, 3)] + [Arguments(5, 3, 1)] + public async Task ItemIsMoved_AddActionIsNotInvoked( int initialItemCount, int originalIndex, int destinationIndex) @@ -90,51 +77,47 @@ public void ItemIsMoved_AddActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.Move( - original: originalIndex, - destination: destinationIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was moved within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + original: originalIndex, + destination: destinationIndex); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was moved within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsRefreshed_AddActionIsNotInvoked( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsRefreshed_AddActionIsNotInvoked( int initialItemCount, int refreshIndex) { @@ -143,49 +126,45 @@ public void ItemIsRefreshed_AddActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.Refresh(refreshIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was refreshed within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was refreshed within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsRemoved_AddActionIsNotInvoked( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsRemoved_AddActionIsNotInvoked( int initialItemCount, int removalIndex) { @@ -195,49 +174,45 @@ public void ItemIsRemoved_AddActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.RemoveAt(removalIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was removed from the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was removed from the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsReplaced_AddActionIsInvokedForNewItem( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsReplaced_AddActionIsInvokedForNewItem( int initialItemCount, int replacementIndex) { @@ -246,52 +221,48 @@ public void ItemIsReplaced_AddActionIsInvokedForNewItem( source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.ReplaceAt( - index: replacementIndex, - item: initialItemCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was replaced within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEquivalentTo(new[] { initialItemCount }, "an item was replaced within the collection"); + index: replacementIndex, + item: initialItemCount); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was replaced within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEquivalentTo(new[] { initialItemCount }).Because("an item was replaced within the collection"); } - [Theory] - [InlineData(1, 0, 1)] - [InlineData(5, 0, 1)] - [InlineData(5, 2, 1)] - [InlineData(5, 1, 3)] - [InlineData(5, 0, 5)] - public void ItemRangeIsRemoved_AddActionIsNotInvoked( + [Test] + [Arguments(1, 0, 1)] + [Arguments(5, 0, 1)] + [Arguments(5, 2, 1)] + [Arguments(5, 1, 3)] + [Arguments(5, 0, 5)] + public async Task ItemRangeIsRemoved_AddActionIsNotInvoked( int initialItemCount, int removalIndex, int removalCount) @@ -301,94 +272,86 @@ public void ItemRangeIsRemoved_AddActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.RemoveRange( index: removalIndex, count: removalCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Theory] - [InlineData(1)] - [InlineData(5)] - public void ItemsAreCleared_AddActionIsNotInvoked(int initialItemCount) + [Test] + [Arguments(1)] + [Arguments(5)] + public async Task ItemsAreCleared_AddActionIsNotInvoked(int initialItemCount) { using var source = new TestSourceList(); source.AddRange(Enumerable.Range(1, initialItemCount)); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.Clear(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("all items in the collection should have been removed"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("all items in the collection should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Fact] - public void SourceCompletesAsynchronously_CompletionPropagates() + [Test] + public async Task SourceCompletesAsynchronously_CompletionPropagates() { using var source = new TestSourceList(); @@ -400,41 +363,38 @@ public void SourceCompletesAsynchronously_CompletionPropagates() }); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action source.Complete(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedChangeSets.Should().BeEmpty("no changes were made to the collection"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no changes were made to the collection"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Fact] - public void SourceCompletesImmediately_CompletionPropagates() + [Test] + public async Task SourceCompletesImmediately_CompletionPropagates() { using var source = new TestSourceList(); @@ -445,32 +405,30 @@ public void SourceCompletesImmediately_CompletionPropagates() 3 }); source.Complete(); - + var addActionInvocations = new List(); - + // UUT Construction & Action using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); } - [Fact] - public void SourceFailsAsynchronously_CompletionPropagates() + [Test] + public async Task SourceFailsAsynchronously_CompletionPropagates() { using var source = new TestSourceList(); @@ -482,41 +440,38 @@ public void SourceFailsAsynchronously_CompletionPropagates() }); var addActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemAdded(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - addActionInvocations.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithoutStrictOrdering(), - because: "the collection contained initial items"); + + await Assert.That(addActionInvocations).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the collection contained initial items"); addActionInvocations.Clear(); - // UUT Action var error = new Exception(); source.SetError(error); - - results.Error.Should().BeSameAs(error, "errors within the stream should propagate"); - results.RecordedChangeSets.Should().BeEmpty("no changes were made to the collection"); - - addActionInvocations.Should().BeEmpty("no items were added to the collection"); + + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors within the stream should propagate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no changes were made to the collection"); + + await Assert.That(addActionInvocations).IsEmpty().Because("no items were added to the collection"); } - [Fact] - public void SourceFailsImmediately_CompletionPropagates() + [Test] + public async Task SourceFailsImmediately_CompletionPropagates() { using var source = new TestSourceList(); @@ -528,18 +483,18 @@ public void SourceFailsImmediately_CompletionPropagates() }); var error = new Exception(); source.SetError(error); - + var addActionInvocations = new List(); - + // UUT Construction & Action using var subscription = source.Connect() .OnItemRemoved(addActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeSameAs(error, "errors within the stream should propagate"); - results.RecordedChangeSets.Should().BeEmpty("an error occurred during subscription"); - - addActionInvocations.Should().BeEmpty("an error occurred during subscription"); + + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors within the stream should propagate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during subscription"); + + await Assert.That(addActionInvocations).IsEmpty().Because("an error occurred during subscription"); } } diff --git a/src/DynamicData.Tests/List/OnItemRefreshedFixture.cs b/src/DynamicData.Tests/List/OnItemRefreshedFixture.cs index c044d8e89..c6de6ef88 100644 --- a/src/DynamicData.Tests/List/OnItemRefreshedFixture.cs +++ b/src/DynamicData.Tests/List/OnItemRefreshedFixture.cs @@ -1,24 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public class OnItemRefreshedFixture { - [Theory] - [InlineData(0, 0)] - [InlineData(1, 0)] - [InlineData(1, 1)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 5)] - public void ItemIsAdded_RefreshActionIsNotInvoked( + [Test] + [Arguments(0, 0)] + [Arguments(1, 0)] + [Arguments(1, 1)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 5)] + public async Task ItemIsAdded_RefreshActionIsNotInvoked( int initialItemCount, int insertionIndex) { @@ -28,52 +19,49 @@ public void ItemIsAdded_RefreshActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (initialItemCount is 0) - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to be published"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to be published"); else - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action source.Insert( - index: insertionIndex, - item: initialItemCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was refreshed within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + index: insertionIndex, + item: initialItemCount); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was refreshed within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Theory] - [InlineData(2, 0, 1)] - [InlineData(2, 1, 0)] - [InlineData(5, 0, 4)] - [InlineData(5, 4, 0)] - [InlineData(5, 1, 3)] - [InlineData(5, 3, 1)] - public void ItemIsMoved_RefreshActionIsNotInvoked( + [Test] + [Arguments(2, 0, 1)] + [Arguments(2, 1, 0)] + [Arguments(5, 0, 4)] + [Arguments(5, 4, 0)] + [Arguments(5, 1, 3)] + [Arguments(5, 3, 1)] + public async Task ItemIsMoved_RefreshActionIsNotInvoked( int initialItemCount, int originalIndex, int destinationIndex) @@ -83,47 +71,44 @@ public void ItemIsMoved_RefreshActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action source.Move( - original: originalIndex, - destination: destinationIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was moved within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were removed from the collection"); + original: originalIndex, + destination: destinationIndex); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was moved within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were removed from the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsRefreshed_RefreshActionIsNotInvoked( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsRefreshed_RefreshActionIsNotInvoked( int initialItemCount, int refreshIndex) { @@ -132,46 +117,43 @@ public void ItemIsRefreshed_RefreshActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action var refreshedItem = source.Items[refreshIndex]; source.Refresh(refreshIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was refreshed within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEquivalentTo(new[] { refreshedItem } ,"1 item were refreshed within the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was refreshed within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEquivalentTo(new[] { refreshedItem }).Because("1 item were refreshed within the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsRemoved_RefreshActionIsInvoked( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsRemoved_RefreshActionIsInvoked( int initialItemCount, int removalIndex) { @@ -181,46 +163,43 @@ public void ItemIsRemoved_RefreshActionIsInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action var removedItem = source.Items[removalIndex]; source.RemoveAt(removalIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was removed from the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was removed from the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsReplaced_RefreshActionIsInvokedForOldItem( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsReplaced_RefreshActionIsInvokedForOldItem( int initialItemCount, int replacementIndex) { @@ -229,48 +208,45 @@ public void ItemIsReplaced_RefreshActionIsInvokedForOldItem( source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action source.ReplaceAt( - index: replacementIndex, - item: initialItemCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was replaced within the collection"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + index: replacementIndex, + item: initialItemCount); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was replaced within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Theory] - [InlineData(1, 0, 1)] - [InlineData(5, 0, 1)] - [InlineData(5, 2, 1)] - [InlineData(5, 1, 3)] - [InlineData(5, 0, 5)] - public void ItemRangeIsRemoved_RefreshActionIsInvokedForEachItem( + [Test] + [Arguments(1, 0, 1)] + [Arguments(5, 0, 1)] + [Arguments(5, 2, 1)] + [Arguments(5, 1, 3)] + [Arguments(5, 0, 5)] + public async Task ItemRangeIsRemoved_RefreshActionIsInvokedForEachItem( int initialItemCount, int removalIndex, int removalCount) @@ -280,86 +256,80 @@ public void ItemRangeIsRemoved_RefreshActionIsInvokedForEachItem( source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action source.RemoveRange( index: removalIndex, count: removalCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Theory] - [InlineData(1)] - [InlineData(5)] - public void ItemsAreCleared_RefreshActionIsInvokedForEachItem(int initialItemCount) + [Test] + [Arguments(1)] + [Arguments(5)] + public async Task ItemsAreCleared_RefreshActionIsInvokedForEachItem(int initialItemCount) { using var source = new TestSourceList(); source.AddRange(Enumerable.Range(1, initialItemCount)); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); // UUT Action source.Clear(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("all items in the collection should have been removed"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("all items in the collection should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Fact] - public void SourceCompletesAsynchronously_CompletionPropagates() + [Test] + public async Task SourceCompletesAsynchronously_CompletionPropagates() { using var source = new TestSourceList(); @@ -371,37 +341,35 @@ public void SourceCompletesAsynchronously_CompletionPropagates() }); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action source.Complete(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedChangeSets.Should().BeEmpty("no changes were made to the collection"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no changes were made to the collection"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Fact] - public void SourceCompletesImmediately_CompletionPropagates() + [Test] + public async Task SourceCompletesImmediately_CompletionPropagates() { using var source = new TestSourceList(); @@ -412,28 +380,27 @@ public void SourceCompletesImmediately_CompletionPropagates() 3 }); source.Complete(); - + var refreshActionInvocations = new List(); - + // UUT Construction & Action using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Fact] - public void SourceFailsAsynchronously_CompletionPropagates() + [Test] + public async Task SourceFailsAsynchronously_CompletionPropagates() { using var source = new TestSourceList(); @@ -445,37 +412,35 @@ public void SourceFailsAsynchronously_CompletionPropagates() }); var refreshActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo( - expectation: source.Items, - config: options => options.WithStrictOrdering(), - because: "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo( + source.Items, + TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - refreshActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action var error = new Exception(); source.SetError(error); - - results.Error.Should().BeSameAs(error, "errors within the stream should propagate"); - results.RecordedChangeSets.Should().BeEmpty("no changes were made to the collection"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors within the stream should propagate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no changes were made to the collection"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } - [Fact] - public void SourceFailsImmediately_CompletionPropagates() + [Test] + public async Task SourceFailsImmediately_CompletionPropagates() { using var source = new TestSourceList(); @@ -487,18 +452,18 @@ public void SourceFailsImmediately_CompletionPropagates() }); var error = new Exception(); source.SetError(error); - + var refreshActionInvocations = new List(); - + // UUT Construction & Action using var subscription = source.Connect() .OnItemRefreshed(refreshActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeSameAs(error, "errors within the stream should propagate"); - results.RecordedChangeSets.Should().BeEmpty("an error occurred during subscription"); - - refreshActionInvocations.Should().BeEmpty("no items were refreshed within the collection"); + + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors within the stream should propagate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during subscription"); + + await Assert.That(refreshActionInvocations).IsEmpty().Because("no items were refreshed within the collection"); } } diff --git a/src/DynamicData.Tests/List/OnItemRemovedFixture.cs b/src/DynamicData.Tests/List/OnItemRemovedFixture.cs index 6b91fc11d..1d57e93f8 100644 --- a/src/DynamicData.Tests/List/OnItemRemovedFixture.cs +++ b/src/DynamicData.Tests/List/OnItemRemovedFixture.cs @@ -1,49 +1,38 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public class OnItemRemovedFixture { // https://github.com/reactivemarbles/DynamicData/issues/1061 - [Theory] - [InlineData(true)] - [InlineData(false)] - public void SubscriberDoesNotHandleErrors_ErrorBubblesUpstream(bool invokeOnUnsubscribe) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task SubscriberDoesNotHandleErrors_ErrorBubblesUpstream(bool invokeOnUnsubscribe) { using var source = new TestSourceList(); using var subscription = source.Connect() .OnItemRemoved( - removeAction: static _ => { }, - invokeOnUnsubscribe: invokeOnUnsubscribe) + removeAction: static _ => { }, + invokeOnUnsubscribe: invokeOnUnsubscribe) .Subscribe(); - + var error = new Exception("Test"); - FluentActions.Invoking(() => source.SetError(error)) - .Should() - .Throw("errors not handled by the subscriber should propagate upstream to the caller") - .Which - .Should().BeSameAs(error); + var exception = await Assert.That(() => source.SetError(error)) + .Throws().Because("errors not handled by the subscriber should propagate upstream to the caller"); + + await Assert.That(exception).IsSameReferenceAs(error); } - [Theory] - [InlineData(0, 0, 0)] - [InlineData(1, 0, 0)] - [InlineData(1, 0, 1)] - [InlineData(5, 0, 1)] - [InlineData(5, 2, 1)] - [InlineData(5, 1, 3)] - [InlineData(5, 0, 5)] - public void InvokeOnUnsubscribeIsRequested_RemoveActionIsInvokedForEachRemainingItemOnCompletion( + [Test] + [Arguments(0, 0, 0)] + [Arguments(1, 0, 0)] + [Arguments(1, 0, 1)] + [Arguments(5, 0, 1)] + [Arguments(5, 2, 1)] + [Arguments(5, 1, 3)] + [Arguments(5, 0, 5)] + public async Task InvokeOnUnsubscribeIsRequested_RemoveActionIsInvokedForEachRemainingItemOnCompletion( int initialItemCount, int removalIndex, int removalCount) @@ -54,26 +43,25 @@ public void InvokeOnUnsubscribeIsRequested_RemoveActionIsInvokedForEachRemaining source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: true) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: true) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (initialItemCount is 0) - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to be published"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to be published"); else - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Setup: Remove some items, to ensure correct tracking of remaining items. var removedItems = source.Items @@ -85,33 +73,33 @@ public void InvokeOnUnsubscribeIsRequested_RemoveActionIsInvokedForEachRemaining source.RemoveRange( index: removalIndex, count: removalCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (removalCount is 0) - results.RecordedChangeSets.Should().BeEmpty("no items should have been removed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no items should have been removed"); else - results.RecordedChangeSets.Should().ContainSingle($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().BeEquivalentTo(removedItems, options => options.WithoutStrictOrdering(), "the removal action should be invoked for every removed item"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEquivalentTo(removedItems, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the removal action should be invoked for every removed item"); removeActionInvocations.Clear(); - + // UUT Action subscription.Dispose(); - - removeActionInvocations.Should().BeEquivalentTo(source.Items, options => options.WithoutStrictOrdering(), "the removal action should be invoked for all all remaining items"); + + await Assert.That(removeActionInvocations).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the removal action should be invoked for all all remaining items"); } - [Theory] - [InlineData(0, 0, 0)] - [InlineData(1, 0, 0)] - [InlineData(1, 0, 1)] - [InlineData(5, 0, 1)] - [InlineData(5, 2, 1)] - [InlineData(5, 1, 3)] - [InlineData(5, 0, 5)] - public void InvokeOnUnsubscribeIsNotRequested_RemoveActionIsNotInvokedOnCompletion( + [Test] + [Arguments(0, 0, 0)] + [Arguments(1, 0, 0)] + [Arguments(1, 0, 1)] + [Arguments(5, 0, 1)] + [Arguments(5, 2, 1)] + [Arguments(5, 1, 3)] + [Arguments(5, 0, 5)] + public async Task InvokeOnUnsubscribeIsNotRequested_RemoveActionIsNotInvokedOnCompletion( int initialItemCount, int removalIndex, int removalCount) @@ -122,26 +110,25 @@ public void InvokeOnUnsubscribeIsNotRequested_RemoveActionIsNotInvokedOnCompleti source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: false) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: false) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (initialItemCount is 0) - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to be published"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to be published"); else - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Setup: Remove some items, to ensure correct tracking of remaining items. var removedItems = source.Items @@ -153,32 +140,32 @@ public void InvokeOnUnsubscribeIsNotRequested_RemoveActionIsNotInvokedOnCompleti source.RemoveRange( index: removalIndex, count: removalCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (removalCount is 0) - results.RecordedChangeSets.Should().BeEmpty("no items should have been removed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no items should have been removed"); else - results.RecordedChangeSets.Should().ContainSingle($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().BeEquivalentTo(removedItems, options => options.WithoutStrictOrdering(), "the removal action should be invoked for every removed item"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEquivalentTo(removedItems, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the removal action should be invoked for every removed item"); removeActionInvocations.Clear(); - + // UUT Action subscription.Dispose(); - - removeActionInvocations.Should().BeEmpty("the removal action should not be invoked upon unsubscription"); + + await Assert.That(removeActionInvocations).IsEmpty().Because("the removal action should not be invoked upon unsubscription"); } - [Theory] - [InlineData(0, 0)] - [InlineData(1, 0)] - [InlineData(1, 1)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 5)] - public void ItemIsAdded_RemoveActionIsNotInvoked( + [Test] + [Arguments(0, 0)] + [Arguments(1, 0)] + [Arguments(1, 1)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 5)] + public async Task ItemIsAdded_RemoveActionIsNotInvoked( int initialItemCount, int insertionIndex) { @@ -188,46 +175,45 @@ public void ItemIsAdded_RemoveActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved(removeActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); if (initialItemCount is 0) - results.RecordedChangeSets.Should().BeEmpty("there were no initial items to be published"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("there were no initial items to be published"); else - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action source.Insert( - index: insertionIndex, - item: initialItemCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was refreshed within the collection"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().BeEmpty("no items were removed from the collection"); + index: insertionIndex, + item: initialItemCount); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was refreshed within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items were removed from the collection"); } - [Theory] - [InlineData(2, 0, 1)] - [InlineData(2, 1, 0)] - [InlineData(5, 0, 4)] - [InlineData(5, 4, 0)] - [InlineData(5, 1, 3)] - [InlineData(5, 3, 1)] - public void ItemIsMoved_RemoveActionIsNotInvoked( + [Test] + [Arguments(2, 0, 1)] + [Arguments(2, 1, 0)] + [Arguments(5, 0, 4)] + [Arguments(5, 4, 0)] + [Arguments(5, 1, 3)] + [Arguments(5, 3, 1)] + public async Task ItemIsMoved_RemoveActionIsNotInvoked( int initialItemCount, int originalIndex, int destinationIndex) @@ -237,41 +223,40 @@ public void ItemIsMoved_RemoveActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved(removeActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action source.Move( - original: originalIndex, - destination: destinationIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was moved within the collection"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().BeEmpty("no items were removed from the collection"); + original: originalIndex, + destination: destinationIndex); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was moved within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items were removed from the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsRemoved_RemoveActionIsInvoked( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsRemoved_RemoveActionIsInvoked( int initialItemCount, int removalIndex) { @@ -281,41 +266,40 @@ public void ItemIsRemoved_RemoveActionIsInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved(removeActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action var removedItem = source.Items[removalIndex]; source.RemoveAt(removalIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was removed from the collection"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().ContainSingle("an item was removed from the collection"); - removeActionInvocations.ElementAt(0).Should().Be(removedItem, "an item was removed from the collection"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was removed from the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).HasSingleItem().Because("an item was removed from the collection"); + await Assert.That(removeActionInvocations.ElementAt(0)).IsEqualTo(removedItem).Because("an item was removed from the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsRefreshed_RemoveActionIsNotInvoked( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsRefreshed_RemoveActionIsNotInvoked( int initialItemCount, int refreshIndex) { @@ -324,39 +308,38 @@ public void ItemIsRefreshed_RemoveActionIsNotInvoked( source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved(removeActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action source.Refresh(refreshIndex); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was refreshed within the collection"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - removeActionInvocations.Should().BeEmpty("no items were removed from the collection"); + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was refreshed within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items were removed from the collection"); } - [Theory] - [InlineData(1, 0)] - [InlineData(5, 0)] - [InlineData(5, 2)] - [InlineData(5, 4)] - public void ItemIsReplaced_RemoveActionIsInvokedForOldItem( + [Test] + [Arguments(1, 0)] + [Arguments(5, 0)] + [Arguments(5, 2)] + [Arguments(5, 4)] + public async Task ItemIsReplaced_RemoveActionIsInvokedForOldItem( int initialItemCount, int replacementIndex) { @@ -365,44 +348,43 @@ public void ItemIsReplaced_RemoveActionIsInvokedForOldItem( source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved(removeActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action var replacedItem = source.Items[replacementIndex]; source.ReplaceAt( - index: replacementIndex, - item: initialItemCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("an item was replaced within the collection"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().ContainSingle("an item was replaced within the collection"); - removeActionInvocations.ElementAt(0).Should().Be(replacedItem, "an item was replaced within the collection"); + index: replacementIndex, + item: initialItemCount); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("an item was replaced within the collection"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).HasSingleItem().Because("an item was replaced within the collection"); + await Assert.That(removeActionInvocations.ElementAt(0)).IsEqualTo(replacedItem).Because("an item was replaced within the collection"); } - [Theory] - [InlineData(1, 0, 1)] - [InlineData(5, 0, 1)] - [InlineData(5, 2, 1)] - [InlineData(5, 1, 3)] - [InlineData(5, 0, 5)] - public void ItemRangeIsRemoved_RemoveActionIsInvokedForEachItem( + [Test] + [Arguments(1, 0, 1)] + [Arguments(5, 0, 1)] + [Arguments(5, 2, 1)] + [Arguments(5, 1, 3)] + [Arguments(5, 0, 5)] + public async Task ItemRangeIsRemoved_RemoveActionIsInvokedForEachItem( int initialItemCount, int removalIndex, int removalCount) @@ -412,23 +394,22 @@ public void ItemRangeIsRemoved_RemoveActionIsInvokedForEachItem( source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: true) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: true) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action var removedItems = source.Items @@ -439,59 +420,58 @@ public void ItemRangeIsRemoved_RemoveActionIsInvokedForEachItem( source.RemoveRange( index: removalIndex, count: removalCount); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().BeEquivalentTo(removedItems, options => options.WithoutStrictOrdering(), "the removal action should be invoked for every removed item"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because($"{removalCount} item{((removalCount is 1) ? "" : "s")} should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEquivalentTo(removedItems, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the removal action should be invoked for every removed item"); } - [Theory] - [InlineData(1)] - [InlineData(5)] - public void ItemsAreCleared_RemoveActionIsInvokedForEachItem(int initialItemCount) + [Test] + [Arguments(1)] + [Arguments(5)] + public async Task ItemsAreCleared_RemoveActionIsInvokedForEachItem(int initialItemCount) { using var source = new TestSourceList(); source.AddRange(Enumerable.Range(1, initialItemCount)); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved(removeActionInvocations.Add) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action var clearedItems = source.Items .ToArray(); source.Clear(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("all items in the collection should have been removed"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - - removeActionInvocations.Should().BeEquivalentTo(clearedItems, options => options.WithoutStrictOrdering(), "the removal action should be invoked for every removed item"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("all items in the collection should have been removed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + + await Assert.That(removeActionInvocations).IsEquivalentTo(clearedItems, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the removal action should be invoked for every removed item"); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void SourceCompletesAsynchronously_CompletionPropagates(bool invokeOnUnsubscribe) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task SourceCompletesAsynchronously_CompletionPropagates(bool invokeOnUnsubscribe) { using var source = new TestSourceList(); @@ -503,41 +483,40 @@ public void SourceCompletesAsynchronously_CompletionPropagates(bool invokeOnUnsu }); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: invokeOnUnsubscribe) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: invokeOnUnsubscribe) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action source.Complete(); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedChangeSets.Should().BeEmpty("no changes were made to the collection"); - + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no changes were made to the collection"); + if (invokeOnUnsubscribe) - removeActionInvocations.Should().BeEquivalentTo(source.Items, options => options.WithoutStrictOrdering(), "the operator was instructed to invoke the removal action all remaining items, upon stream completion"); + await Assert.That(removeActionInvocations).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the operator was instructed to invoke the removal action all remaining items, upon stream completion"); else - removeActionInvocations.Should().BeEmpty("the operator was instructed to not invoke the removal action, upon stream completion"); + await Assert.That(removeActionInvocations).IsEmpty().Because("the operator was instructed to not invoke the removal action, upon stream completion"); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void SourceCompletesImmediately_CompletionPropagates(bool invokeOnUnsubscribe) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task SourceCompletesImmediately_CompletionPropagates(bool invokeOnUnsubscribe) { using var source = new TestSourceList(); @@ -548,32 +527,32 @@ public void SourceCompletesImmediately_CompletionPropagates(bool invokeOnUnsubsc 3 }); source.Complete(); - + var removeActionInvocations = new List(); - + // UUT Construction & Action using var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: invokeOnUnsubscribe) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: invokeOnUnsubscribe) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeTrue("the source has completed"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); - + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); + if (invokeOnUnsubscribe) - removeActionInvocations.Should().BeEquivalentTo(source.Items, options => options.WithoutStrictOrdering(), "the operator was instructed to invoke the removal action all remaining items, upon stream completion"); + await Assert.That(removeActionInvocations).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the operator was instructed to invoke the removal action all remaining items, upon stream completion"); else - removeActionInvocations.Should().BeEmpty("the operator was instructed to not invoke the removal action, upon stream completion"); + await Assert.That(removeActionInvocations).IsEmpty().Because("the operator was instructed to not invoke the removal action, upon stream completion"); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void SourceFailsAsynchronously_CompletionPropagates(bool invokeOnUnsubscribe) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task SourceFailsAsynchronously_CompletionPropagates(bool invokeOnUnsubscribe) { using var source = new TestSourceList(); @@ -585,41 +564,40 @@ public void SourceFailsAsynchronously_CompletionPropagates(bool invokeOnUnsubscr }); var removeActionInvocations = new List(); - + // UUT Construction using var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: invokeOnUnsubscribe) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: invokeOnUnsubscribe) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeNull("no errors should have occurred"); - results.HasCompleted.Should().BeFalse("the source can still publish notifications"); - results.RecordedChangeSets.Should().ContainSingle("the initial items should have been published"); - results.RecordedItems.Should().BeEquivalentTo(source.Items, options => options.WithStrictOrdering(), "all collection changes should propagate downstream"); + + await Assert.That(results.Error).IsNull().Because("no errors should have occurred"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source can still publish notifications"); + await Assert.That(results.RecordedChangeSets).HasSingleItem().Because("the initial items should have been published"); + await Assert.That(results.RecordedItems).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all collection changes should propagate downstream"); results.ClearChangeSets(); - - removeActionInvocations.Should().BeEmpty("no items have been removed from the collection"); - + + await Assert.That(removeActionInvocations).IsEmpty().Because("no items have been removed from the collection"); // UUT Action var error = new Exception(); source.SetError(error); - - results.Error.Should().BeSameAs(error, "errors within the stream should propagate"); - results.RecordedChangeSets.Should().BeEmpty("no changes were made to the collection"); - + + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors within the stream should propagate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("no changes were made to the collection"); + if (invokeOnUnsubscribe) - removeActionInvocations.Should().BeEquivalentTo(source.Items, options => options.WithoutStrictOrdering(), "the operator was instructed to invoke the removal action all remaining items, upon stream failure"); + await Assert.That(removeActionInvocations).IsEquivalentTo(source.Items, TUnit.Assertions.Enums.CollectionOrdering.Any).Because("the operator was instructed to invoke the removal action all remaining items, upon stream failure"); else - removeActionInvocations.Should().BeEmpty("the operator was instructed to not invoke the removal action, upon stream failure"); + await Assert.That(removeActionInvocations).IsEmpty().Because("the operator was instructed to not invoke the removal action, upon stream failure"); } - [Theory] - [InlineData(true)] - [InlineData(false)] - public void SourceFailsImmediately_CompletionPropagates(bool invokeOnUnsubscribe) + [Test] + [Arguments(true)] + [Arguments(false)] + public async Task SourceFailsImmediately_CompletionPropagates(bool invokeOnUnsubscribe) { using var source = new TestSourceList(); @@ -631,21 +609,21 @@ public void SourceFailsImmediately_CompletionPropagates(bool invokeOnUnsubscribe }); var error = new Exception(); source.SetError(error); - + var removeActionInvocations = new List(); - + // UUT Construction & Action using var subscription = source.Connect() .OnItemRemoved( - removeAction: removeActionInvocations.Add, - invokeOnUnsubscribe: invokeOnUnsubscribe) + removeAction: removeActionInvocations.Add, + invokeOnUnsubscribe: invokeOnUnsubscribe) .ValidateChangeSets() .RecordListItems(out var results); - - results.Error.Should().BeSameAs(error, "errors within the stream should propagate"); - results.RecordedChangeSets.Should().BeEmpty("an error occurred during subscription"); - - removeActionInvocations.Should().BeEmpty(invokeOnUnsubscribe + + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors within the stream should propagate"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during subscription"); + + await Assert.That(removeActionInvocations).IsEmpty().Because(invokeOnUnsubscribe ? "the initial items in the collection were never published" : "the operator was instructed to not invoke the removal action, upon stream failure"); } diff --git a/src/DynamicData.Tests/List/OrFixture.cs b/src/DynamicData.Tests/List/OrFixture.cs index c4c973aa2..c16d0f7a9 100644 --- a/src/DynamicData.Tests/List/OrFixture.cs +++ b/src/DynamicData.Tests/List/OrFixture.cs @@ -1,18 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; +[InheritsTests] public class OrFixture : OrFixtureBase { protected override IObservable> CreateObservable() => _source1.Connect().Or(_source2.Connect()); } +[InheritsTests] public class OrCollectionFixture : OrFixtureBase { protected override IObservable> CreateObservable() @@ -24,8 +18,8 @@ protected override IObservable> CreateObservable() public class OrRefreshFixture { - [Fact] - public void RefreshPassesThrough() + [Test] + public async Task RefreshPassesThrough() { SourceList source1 = new(); source1.Add(new Item("A")); @@ -36,17 +30,17 @@ public void RefreshPassesThrough() var results = list.Or().AsAggregator(); source1.Items.ElementAt(0).Name = "Test"; - results.Data.Count.Should().Be(2); - results.Messages.Count.Should().Be(3); - results.Messages[2].Refreshes.Should().Be(1); - results.Messages[2].First().Item.Current.Should().Be(source1.Items[0]); + await Assert.That(results.Data.Count).IsEqualTo(2); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Messages[2].Refreshes).IsEqualTo(1); + await Assert.That(results.Messages[2].First().Item.Current).IsEqualTo(source1.Items[0]); } } public class OrReplaceFixture { - [Fact] - public void ItemIsReplaced() + [Test] + public async Task ItemIsReplaced() { var item1 = new Item("A"); var item2 = new Item("B"); @@ -61,9 +55,9 @@ public void ItemIsReplaced() var results = list.Or().AsAggregator(); source1.ReplaceAt(0, item1Replacement); - results.Data.Count.Should().Be(2); - results.Messages.Count.Should().Be(3); - results.Data.Items.Should().BeEquivalentTo(new[] { item1Replacement, item2}); + await Assert.That(results.Data.Count).IsEqualTo(2); + await Assert.That(results.Messages.Count).IsEqualTo(3); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { item1Replacement, item2 }); } } @@ -83,23 +77,23 @@ protected OrFixtureBase() _results = CreateObservable().AsAggregator(); } - [Fact] - public void ClearOnlyClearsOneSource() + [Test] + public async Task ClearOnlyClearsOneSource() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(6, 5)); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 10)); } public void Dispose() @@ -109,30 +103,30 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void IncludedWhenItemIsInOneSource() + [Test] + public async Task IncludedWhenItemIsInOneSource() { _source1.Add(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } - [Fact] - public void IncludedWhenItemIsInTwoSources() + [Test] + public async Task IncludedWhenItemIsInTwoSources() { _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } - [Fact] - public void RemovedWhenNoLongerInEither() + [Test] + public async Task RemovedWhenNoLongerInEither() { _source1.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/List/PageFixture.cs b/src/DynamicData.Tests/List/PageFixture.cs index 5091b06b7..66ce87409 100644 --- a/src/DynamicData.Tests/List/PageFixture.cs +++ b/src/DynamicData.Tests/List/PageFixture.cs @@ -1,23 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class PageFixture : IDisposable { private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _requestSubject = new BehaviorSubject(new PageRequest(1, 25)); + private readonly ReactiveUI.Primitives.Signals.ISignal _requestSubject = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(1, 25)); private readonly ChangeSetAggregator _results; @@ -34,21 +28,22 @@ public void Dispose() _requestSubject.OnCompleted(); _source.Dispose(); _results.Dispose(); + _requestSubject.Dispose(); } - [Fact] - public void InsertAfterPageProducesNothing() + [Test] + public async Task InsertAfterPageProducesNothing() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); var expected = people.Take(25).ToArray(); _source.InsertRange(_generator.Take(100), 50); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); } - [Fact] - public void InsertInPageReflectsChange() + [Test] + public async Task InsertInPageReflectsChange() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -59,24 +54,24 @@ public void InsertInPageReflectsChange() var message = _results.Messages[1].ElementAt(0); var removedPerson = people.ElementAt(24); - _results.Data.Items.ElementAt(10).Should().Be(newPerson); - message.Item.Current.Should().Be(removedPerson); - message.Reason.Should().Be(ListChangeReason.Remove); + await Assert.That(_results.Data.Items.ElementAt(10)).IsEqualTo(newPerson); + await Assert.That(message.Item.Current).IsEqualTo(removedPerson); + await Assert.That(message.Reason).IsEqualTo(ListChangeReason.Remove); } - [Fact] - public void MoveToNextPage() + [Test] + public async Task MoveToNextPage() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); _requestSubject.OnNext(new PageRequest(2, 25)); var expected = people.Skip(25).Take(25).ToArray(); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); } - [Fact] - public void MoveWithinSamePage() + [Test] + public async Task MoveWithinSamePage() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -84,11 +79,11 @@ public void MoveWithinSamePage() _source.Move(0, 10); var actualPersonAtIndex10 = _results.Data.Items.ElementAt(10); - actualPersonAtIndex10.Should().Be(personToMove); + await Assert.That(actualPersonAtIndex10).IsEqualTo(personToMove); } - [Fact] - public void MoveWithinSamePage2() + [Test] + public async Task MoveWithinSamePage2() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -96,11 +91,11 @@ public void MoveWithinSamePage2() _source.Move(10, 0); var actualPersonAtIndex0 = _results.Data.Items.ElementAt(0); - actualPersonAtIndex0.Should().Be(personToMove); + await Assert.That(actualPersonAtIndex0).IsEqualTo(personToMove); } - [Fact] - public void RemoveBeforeShiftsPage() + [Test] + public async Task RemoveBeforeShiftsPage() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -108,26 +103,26 @@ public void RemoveBeforeShiftsPage() _source.RemoveAt(0); var expected = people.Skip(26).Take(25).ToArray(); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); var removedMessage = _results.Messages[2].ElementAt(0); var removedPerson = people.ElementAt(25); - removedMessage.Item.Current.Should().Be(removedPerson); - removedMessage.Reason.Should().Be(ListChangeReason.Remove); + await Assert.That(removedMessage.Item.Current).IsEqualTo(removedPerson); + await Assert.That(removedMessage.Reason).IsEqualTo(ListChangeReason.Remove); var addedMessage = _results.Messages[2].ElementAt(1); var addedPerson = people.ElementAt(50); - addedMessage.Item.Current.Should().Be(addedPerson); - addedMessage.Reason.Should().Be(ListChangeReason.Add); + await Assert.That(addedMessage.Item.Current).IsEqualTo(addedPerson); + await Assert.That(addedMessage.Reason).IsEqualTo(ListChangeReason.Add); } - [Fact] - public void VirtualiseInitial() + [Test] + public async Task VirtualiseInitial() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); var expected = people.Take(25).ToArray(); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); } } @@ -147,30 +142,29 @@ public class PageFixtureWithNoInitialData new("Sharon", "Red Backed Shrike", AnimalFamily.Bird), ]; - [Fact] - public void SimplePaging() + [Test] + public async Task SimplePaging() { - using var pager = new BehaviorSubject(new PageRequest(0, 0)); + using var pager = new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(0, 0)); using var sourceList = new SourceList(); using var sut = new SimplePaging(sourceList, pager); // Add items to source sourceList.AddRange(_items); - sut.Paged.Count.Should().Be(0); + await Assert.That(sut.Paged.Count).IsEqualTo(0); pager.OnNext(new PageRequest(1, 2)); - sut.Paged.Count.Should().Be(2); + await Assert.That(sut.Paged.Count).IsEqualTo(2); pager.OnNext(new PageRequest(1, 4)); - sut.Paged.Count.Should().Be(4); + await Assert.That(sut.Paged.Count).IsEqualTo(4); pager.OnNext(new PageRequest(2, 3)); - sut.Paged.Count.Should().Be(3); + await Assert.That(sut.Paged.Count).IsEqualTo(3); } - - [Fact] - public void DoesNotThrowWithDuplicates() + [Test] + public async Task DoesNotThrowWithDuplicates() { // see https://github.com/reactivemarbles/DynamicData/issues/540 @@ -179,11 +173,11 @@ public void DoesNotThrowWithDuplicates() var source = new SourceList(); source.AddRange(Enumerable.Repeat("item", 10)); source.Connect() - .Page(new BehaviorSubject(new PageRequest(0, 3))) + .Page(new ReactiveUI.Primitives.Signals.StateSignal(new PageRequest(0, 3))) .Clone(result) .Subscribe(); - result.Count.Should().Be(1); + await Assert.That(result.Count).IsEqualTo(1); } } diff --git a/src/DynamicData.Tests/List/QueryWhenChangedFixture.cs b/src/DynamicData.Tests/List/QueryWhenChangedFixture.cs index 49c5cd27e..d900b35a1 100644 --- a/src/DynamicData.Tests/List/QueryWhenChangedFixture.cs +++ b/src/DynamicData.Tests/List/QueryWhenChangedFixture.cs @@ -1,11 +1,5 @@ -using System; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class QueryWhenChangedFixture : IDisposable @@ -20,8 +14,8 @@ public QueryWhenChangedFixture() _results = new ChangeSetAggregator(_source.Connect(p => p.Age > 20)); } - [Fact] - public void CanHandleAddsAndUpdates() + [Test] + public async Task CanHandleAddsAndUpdates() { var invoked = false; var subscription = _source.Connect().QueryWhenChanged(q => q.Count).Subscribe(query => invoked = true); @@ -30,57 +24,57 @@ public void CanHandleAddsAndUpdates() _source.Add(person); _source.Remove(person); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnNext() + [Test] + public async Task ChangeInvokedOnNext() { var invoked = false; var subscription = _source.Connect().QueryWhenChanged().Subscribe(x => invoked = true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); _source.Add(new Person("A", 1)); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnNext_WithSelector() + [Test] + public async Task ChangeInvokedOnNext_WithSelector() { var invoked = false; var subscription = _source.Connect().QueryWhenChanged(query => query.Count).Subscribe(x => invoked = true); - invoked.Should().BeFalse(); + await Assert.That(invoked).IsFalse(); _source.Add(new Person("A", 1)); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnSubscriptionIfItHasData() + [Test] + public async Task ChangeInvokedOnSubscriptionIfItHasData() { var invoked = false; _source.Add(new Person("A", 1)); var subscription = _source.Connect().QueryWhenChanged().Subscribe(x => invoked = true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } - [Fact] - public void ChangeInvokedOnSubscriptionIfItHasData_WithSelector() + [Test] + public async Task ChangeInvokedOnSubscriptionIfItHasData_WithSelector() { var invoked = false; _source.Add(new Person("A", 1)); var subscription = _source.Connect().QueryWhenChanged(query => query.Count).Subscribe(x => invoked = true); - invoked.Should().BeTrue(); + await Assert.That(invoked).IsTrue(); subscription.Dispose(); } diff --git a/src/DynamicData.Tests/List/RecursiveTransformManyFixture.cs b/src/DynamicData.Tests/List/RecursiveTransformManyFixture.cs index 1d79be23e..ebdca4b13 100644 --- a/src/DynamicData.Tests/List/RecursiveTransformManyFixture.cs +++ b/src/DynamicData.Tests/List/RecursiveTransformManyFixture.cs @@ -1,11 +1,4 @@ -using System; - using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.List; @@ -22,8 +15,8 @@ public RecursiveTransformManyFixture() _results = _source.Connect().TransformMany(p => p.Relations.RecursiveSelect(r => r.Relations)).AsAggregator(); } - [Fact] - public void ChildrenAreRemovedWhenParentIsRemoved() + [Test] + public async Task ChildrenAreRemovedWhenParentIsRemoved() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -34,7 +27,7 @@ public void ChildrenAreRemovedWhenParentIsRemoved() _source.Add(mother); _source.Remove(mother); - _results.Data.Count.Should().Be(0, "Should be 4 in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 4 in the cache"); } public void Dispose() @@ -43,8 +36,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RecursiveChildrenCanBeAdded() + [Test] + public async Task RecursiveChildrenCanBeAdded() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -55,10 +48,10 @@ public void RecursiveChildrenCanBeAdded() _source.Add(mother); - _results.Data.Count.Should().Be(4, "Should be 4 in the cache"); - _results.Data.Items.IndexOfOptional(child1).HasValue.Should().BeTrue(); - _results.Data.Items.IndexOfOptional(child2).HasValue.Should().BeTrue(); - _results.Data.Items.IndexOfOptional(child3).HasValue.Should().BeTrue(); - _results.Data.Items.IndexOfOptional(frientofchild1).HasValue.Should().BeTrue(); + await Assert.That(_results.Data.Count).IsEqualTo(4).Because("Should be 4 in the cache"); + await Assert.That(_results.Data.Items.IndexOfOptional(child1).HasValue).IsTrue(); + await Assert.That(_results.Data.Items.IndexOfOptional(child2).HasValue).IsTrue(); + await Assert.That(_results.Data.Items.IndexOfOptional(child3).HasValue).IsTrue(); + await Assert.That(_results.Data.Items.IndexOfOptional(frientofchild1).HasValue).IsTrue(); } } diff --git a/src/DynamicData.Tests/List/RefCountFixture.cs b/src/DynamicData.Tests/List/RefCountFixture.cs index c0d86e06d..f17762706 100644 --- a/src/DynamicData.Tests/List/RefCountFixture.cs +++ b/src/DynamicData.Tests/List/RefCountFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Threading.Tasks; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class RefCountFixture : IDisposable @@ -17,8 +8,8 @@ public class RefCountFixture : IDisposable public RefCountFixture() => _source = new SourceList(); - [Fact] - public void CanResubscribe() + [Test] + public async Task CanResubscribe() { var created = 0; var disposals = 0; @@ -35,12 +26,12 @@ public void CanResubscribe() subscriber = longChain.Subscribe(); subscriber.Dispose(); - created.Should().Be(2); - disposals.Should().Be(2); + await Assert.That(created).IsEqualTo(2); + await Assert.That(disposals).IsEqualTo(2); } - [Fact] - public void ChainIsInvokedOnceForMultipleSubscribers() + [Test] + public async Task ChainIsInvokedOnceForMultipleSubscribers() { var created = 0; var disposals = 0; @@ -57,8 +48,8 @@ public void ChainIsInvokedOnceForMultipleSubscribers() suscriber2.Dispose(); suscriber3.Dispose(); - created.Should().Be(1); - disposals.Should().Be(1); + await Assert.That(created).IsEqualTo(1); + await Assert.That(disposals).IsEqualTo(1); } public void Dispose() => _source.Dispose(); @@ -66,7 +57,7 @@ public void ChainIsInvokedOnceForMultipleSubscribers() // This test is probabilistic, it could be cool to be able to prove RefCount's thread-safety // more accurately but I don't think that there is an easy way to do this. // At least this test can catch some bugs in the old implementation. - //[Fact] + //[Test] private async Task IsHopefullyThreadSafe() { var refCount = _source.Connect().RefCount(); diff --git a/src/DynamicData.Tests/List/RemoveManyFixture.cs b/src/DynamicData.Tests/List/RemoveManyFixture.cs index b0809011e..184e3c39b 100644 --- a/src/DynamicData.Tests/List/RemoveManyFixture.cs +++ b/src/DynamicData.Tests/List/RemoveManyFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class RemoveManyFixture @@ -14,30 +6,30 @@ public class RemoveManyFixture public RemoveManyFixture() => _list = new List(); - [Fact] - public void DoesNotRemoveDuplicates() + [Test] + public async Task DoesNotRemoveDuplicates() { _list.AddRange(new[] { 1, 1, 1, 5, 6, 7 }); _list.RemoveMany(new[] { 1, 1, 7 }); - _list.Should().BeEquivalentTo(new[] { 1, 5, 6 }); + await Assert.That(_list).IsEquivalentTo(new[] { 1, 5, 6 }); } - [Fact] - public void RemoveLargeBatch() + [Test] + public async Task RemoveLargeBatch() { var toAdd = Enumerable.Range(1, 10000).ToArray(); _list.AddRange(toAdd); var toRemove = _list.Take(_list.Count / 2).OrderBy(x => Guid.NewGuid()).ToArray(); _list.RemoveMany(toRemove); - _list.Should().BeEquivalentTo(toAdd.Except(toRemove)); + await Assert.That(_list).IsEquivalentTo(toAdd.Except(toRemove)); } - [Fact] - public void RemoveManyWillRemoveARange() + [Test] + public async Task RemoveManyWillRemoveARange() { _list.AddRange(Enumerable.Range(1, 10)); _list.RemoveMany(Enumerable.Range(2, 8)); - _list.Should().BeEquivalentTo(new[] { 1, 10 }); + await Assert.That(_list).IsEquivalentTo(new[] { 1, 10 }); } } diff --git a/src/DynamicData.Tests/List/ReverseFixture.cs b/src/DynamicData.Tests/List/ReverseFixture.cs index 68cb3685d..25b2716b4 100644 --- a/src/DynamicData.Tests/List/ReverseFixture.cs +++ b/src/DynamicData.Tests/List/ReverseFixture.cs @@ -1,10 +1,3 @@ -using System; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class ReverseFixture : IDisposable @@ -19,8 +12,8 @@ public ReverseFixture() _results = _source.Connect().Reverse().AsAggregator(); } - [Fact] - public void AddInSucession() + [Test] + public async Task AddInSucession() { _source.Add(1); _source.Add(2); @@ -28,22 +21,22 @@ public void AddInSucession() _source.Add(4); _source.Add(5); - _results.Data.Items.Should().BeEquivalentTo(new[] { 5, 4, 3, 2, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 5, 4, 3, 2, 1 }); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { _source.AddRange(Enumerable.Range(1, 5)); - _results.Data.Items.Should().BeEquivalentTo(new[] { 5, 4, 3, 2, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 5, 4, 3, 2, 1 }); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { _source.AddRange(Enumerable.Range(1, 5)); _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() @@ -52,53 +45,53 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void Move() + [Test] + public async Task Move() { _source.AddRange(Enumerable.Range(1, 5)); _source.Move(4, 1); - _results.Data.Items.Should().BeEquivalentTo(new[] { 4, 3, 2, 5, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 4, 3, 2, 5, 1 }); } - [Fact] - public void Move2() + [Test] + public async Task Move2() { _source.AddRange(Enumerable.Range(1, 5)); _source.Move(1, 4); - _results.Data.Items.Should().BeEquivalentTo(new[] { 2, 5, 4, 3, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 2, 5, 4, 3, 1 }); } - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { _source.AddRange(Enumerable.Range(1, 5)); _source.RemoveRange(1, 3); - _results.Data.Items.Should().BeEquivalentTo(new[] { 5, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 5, 1 }); } - [Fact] - public void RemoveRangeThenInsert() + [Test] + public async Task RemoveRangeThenInsert() { _source.AddRange(Enumerable.Range(1, 5)); _source.RemoveRange(1, 3); _source.Insert(1, 3); - _results.Data.Items.Should().BeEquivalentTo(new[] { 5, 3, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 5, 3, 1 }); } - [Fact] - public void Removes() + [Test] + public async Task Removes() { _source.AddRange(Enumerable.Range(1, 5)); _source.Remove(1); _source.Remove(4); - _results.Data.Items.Should().BeEquivalentTo(new[] { 5, 3, 2 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 5, 3, 2 }); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { _source.AddRange(Enumerable.Range(1, 5)); _source.ReplaceAt(2, 100); - _results.Data.Items.Should().BeEquivalentTo(new[] { 5, 4, 100, 2, 1 }); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { 5, 4, 100, 2, 1 }); } } diff --git a/src/DynamicData.Tests/List/SelectFixture.cs b/src/DynamicData.Tests/List/SelectFixture.cs index 6fd4fe0f7..9a2304f1c 100644 --- a/src/DynamicData.Tests/List/SelectFixture.cs +++ b/src/DynamicData.Tests/List/SelectFixture.cs @@ -1,13 +1,10 @@ -using System; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Alias; +#else using DynamicData.Alias; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class SelectFixture : IDisposable @@ -28,43 +25,43 @@ public SelectFixture() _results = new ChangeSetAggregator(_source.Connect().Select(_transformFactory)); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(person), "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(person)).Because("Should be same person"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var transformed = people.Select(_transformFactory).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(transformed, "Incorrect transform result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(transformed).Because("Incorrect transform result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() @@ -73,8 +70,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -82,27 +79,27 @@ public void Remove() _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name", i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(10, "Should return 10 adds"); - _results.Data.Count.Should().Be(10, "Should result in 10 records"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(10).Because("Should return 10 adds"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should result in 10 records"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -111,8 +108,8 @@ public void Update() _source.Add(newperson); _source.Add(updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[0].Replaced.Should().Be(0, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[0].Replaced).IsEqualTo(0).Because("Should be 1 update"); } } diff --git a/src/DynamicData.Tests/List/SizeLimitFixture.cs b/src/DynamicData.Tests/List/SizeLimitFixture.cs index f07825d14..8c47f0c16 100644 --- a/src/DynamicData.Tests/List/SizeLimitFixture.cs +++ b/src/DynamicData.Tests/List/SizeLimitFixture.cs @@ -1,14 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Microsoft.Reactive.Testing; - -using Xunit; - namespace DynamicData.Tests.List; public class SizeLimitFixture : IDisposable @@ -31,56 +22,56 @@ public SizeLimitFixture() _results = _source.Connect().AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = _generator.Take(1).First(); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddLessThanLimit() + [Test] + public async Task AddLessThanLimit() { var person = _generator.Take(1).First(); _source.Add(person); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(150).Ticks); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(person, "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(person).Because("Should be same person"); } - [Fact] - public void AddMoreThanLimit() + [Test] + public async Task AddMoreThanLimit() { var people = _generator.Take(100).OrderBy(p => p.Name).ToArray(); _source.AddRange(people); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(50).Ticks); _source.Dispose(); - _results.Data.Count.Should().Be(10, "Should be 10 items in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should be 100 adds in the first update"); - _results.Messages[1].Removes.Should().Be(90, "Should be 90 removes in the second update"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should be 10 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should be 100 adds in the first update"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(90).Because("Should be 90 removes in the second update"); } - [Fact] - public void AddMoreThanLimitInBatched() + [Test] + public async Task AddMoreThanLimitInBatched() { _source.AddRange(_generator.Take(10).ToArray()); _source.AddRange(_generator.Take(10).ToArray()); _scheduler.AdvanceBy(TimeSpan.FromMilliseconds(50).Ticks); - _results.Data.Count.Should().Be(10, "Should be 10 items in the cache"); - _results.Messages.Count.Should().Be(3, "Should be 3 updates"); - _results.Messages[0].Adds.Should().Be(10, "Should be 10 adds in the first update"); - _results.Messages[1].Adds.Should().Be(10, "Should be 10 adds in the second update"); - _results.Messages[2].Removes.Should().Be(10, "Should be 10 removes in the third update"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should be 10 items in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(3).Because("Should be 3 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(10).Because("Should be 10 adds in the first update"); + await Assert.That(_results.Messages[1].Adds).IsEqualTo(10).Because("Should be 10 adds in the second update"); + await Assert.That(_results.Messages[2].Removes).IsEqualTo(10).Because("Should be 10 removes in the third update"); } public void Dispose() @@ -90,15 +81,15 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void ForceError() + [Test] + public async Task ForceError() { var person = _generator.Take(1).First(); - Assert.Throws(() => _source.RemoveAt(1)); + await Assert.That(() => _source.RemoveAt(1)).ThrowsExactly(); } - [Fact] - public void ThrowsIfSizeLimitIsZero() => + [Test] + public async Task ThrowsIfSizeLimitIsZero() => // Initialise(); - Assert.Throws(() => new SourceCache(p => p.Key).LimitSizeTo(0)); + await Assert.That(() => new SourceCache(p => p.Key).LimitSizeTo(0)).ThrowsExactly(); } diff --git a/src/DynamicData.Tests/List/SortFixture.cs b/src/DynamicData.Tests/List/SortFixture.cs index 7f2a7dea3..b88ca54ac 100644 --- a/src/DynamicData.Tests/List/SortFixture.cs +++ b/src/DynamicData.Tests/List/SortFixture.cs @@ -1,29 +1,24 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class SortChangedFixture { private static readonly IComparer DefaultComparer = SortExpressionComparer.Ascending(x => x.Number); - /// /// See https://github.com/reactivemarbles/DynamicData/issues/473 /// - [Fact] - public void SortsWithoutError() + [Test] + public async Task SortsWithoutError() { var source = new SourceList(); - var sorter = new Subject>(); + var sorter = new ReactiveUI.Primitives.Signals.Signal>(); source.AddRange(Enumerable.Range(1, 10).Select(i => new ListItem(i))); @@ -32,21 +27,19 @@ public void SortsWithoutError() .Bind(out var bound) .Subscribe(); - bound.Select(x => x.Number).Should().BeInAscendingOrder(); + await Assert.That(bound.Select(x => x.Number)).IsInOrder(); sorter.OnNext(SortExpressionComparer.Descending(x => x.Number)); - - bound.Select(x => x.Number).Should().BeInDescendingOrder(); + await Assert.That(bound.Select(x => x.Number)).IsInDescendingOrder(); } - private class ListItem(int number) : IComparable { public int Number { get; } = number; public int CompareTo(ListItem? other) => DefaultComparer.Compare(this, other); - + } } @@ -72,8 +65,8 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void Insert() + [Test] + public async Task Insert() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -81,13 +74,13 @@ public void Insert() var shouldbefirst = new Person("__A", 99); _source.Add(shouldbefirst); - _results.Data.Count.Should().Be(101, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(101).Because("Should be 100 people in the cache"); - _results.Data.Items[0].Should().Be(shouldbefirst); + await Assert.That(_results.Data.Items[0]).IsEqualTo(shouldbefirst); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var people = _generator.Take(100).ToList(); _source.AddRange(people); @@ -96,17 +89,17 @@ public void Remove() people.RemoveAt(20); _source.RemoveAt(20); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); - _results.Messages[1].First().Item.Current.Should().Be(toRemove, "Incorrect item removed"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); + await Assert.That(_results.Messages[1].First().Item.Current).IsEqualTo(toRemove).Because("Incorrect item removed"); var expectedResult = people.OrderBy(p => p, _comparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void RemoveManyOdds() + [Test] + public async Task RemoveManyOdds() { var people = _generator.Take(100).ToList(); _source.AddRange(people); @@ -115,48 +108,48 @@ public void RemoveManyOdds() _source.RemoveMany(odd); - _results.Data.Count.Should().Be(50, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(50).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); var expectedResult = people.Except(odd).OrderByDescending(p => p, _comparer).ToArray(); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void RemoveManyOrdered() + [Test] + public async Task RemoveManyOrdered() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.RemoveMany(people.OrderBy(p => p, _comparer).Skip(10).Take(90)); - _results.Data.Count.Should().Be(10, "Should be 10 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should be 10 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); var expectedResult = people.OrderBy(p => p, _comparer).Take(10); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void RemoveManyReverseOrdered() + [Test] + public async Task RemoveManyReverseOrdered() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.RemoveMany(people.OrderByDescending(p => p, _comparer).Skip(10).Take(90)); - _results.Data.Count.Should().Be(10, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); var expectedResult = people.OrderByDescending(p => p, _comparer).Take(10); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -164,22 +157,22 @@ public void Replace() var shouldbefirst = new Person("__A", 99); _source.ReplaceAt(10, shouldbefirst); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); - _results.Data.Items[0].Should().Be(shouldbefirst); + await Assert.That(_results.Data.Items[0]).IsEqualTo(shouldbefirst); } - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var expectedResult = people.OrderBy(p => p, _comparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } } diff --git a/src/DynamicData.Tests/List/SortMutableFixture.cs b/src/DynamicData.Tests/List/SortMutableFixture.cs index 63eab9e03..46d32f2cd 100644 --- a/src/DynamicData.Tests/List/SortMutableFixture.cs +++ b/src/DynamicData.Tests/List/SortMutableFixture.cs @@ -1,28 +1,26 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Subjects; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_TESTS +using DynamicData.Reactive.Kernel; +#else using DynamicData.Kernel; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class SortMutableFixture : IDisposable { - private readonly ISubject> _changeComparer; + private readonly ReactiveUI.Primitives.Signals.ISignal> _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 ReactiveUI.Primitives.Signals.ISignal _resort; private readonly ChangeSetAggregator _results; @@ -31,14 +29,14 @@ public class SortMutableFixture : IDisposable public SortMutableFixture() { _source = new SourceList(); - _changeComparer = new BehaviorSubject>(_comparer); - _resort = new Subject(); + _changeComparer = new ReactiveUI.Primitives.Signals.StateSignal>(_comparer); + _resort = new ReactiveUI.Primitives.Signals.Signal(); _results = _source.Connect().Sort(_changeComparer, resetThreshold: 25, resort: _resort).AsAggregator(); } - [Fact] - public void ChangeComparer() + [Test] + public async Task ChangeComparer() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -47,22 +45,24 @@ public void ChangeComparer() _changeComparer.OnNext(newComparer); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var expectedResult = people.OrderBy(p => p, newComparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } public void Dispose() { _results.Dispose(); _source.Dispose(); + _changeComparer.Dispose(); + _resort.Dispose(); } - [Fact] - public void Insert() + [Test] + public async Task Insert() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -70,14 +70,13 @@ public void Insert() var shouldbeLast = new Person("__A", 10000); _source.Add(shouldbeLast); - _results.Data.Count.Should().Be(101); + await Assert.That(_results.Data.Count).IsEqualTo(101); - _results.Data.Items[ - ^1].Should().Be(shouldbeLast); + await Assert.That(_results.Data.Items[^1]).IsEqualTo(shouldbeLast); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var people = _generator.Take(100).ToList(); _source.AddRange(people); @@ -86,17 +85,17 @@ public void Remove() people.RemoveAt(20); _source.RemoveAt(20); - _results.Data.Count.Should().Be(99, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); - _results.Messages[1].First().Item.Current.Should().Be(toRemove, "Incorrect item removed"); + await Assert.That(_results.Data.Count).IsEqualTo(99).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); + await Assert.That(_results.Messages[1].First().Item.Current).IsEqualTo(toRemove).Because("Incorrect item removed"); var expectedResult = people.OrderBy(p => p, _comparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void RemoveManyOdds() + [Test] + public async Task RemoveManyOdds() { var people = _generator.Take(100).ToList(); _source.AddRange(people); @@ -105,48 +104,48 @@ public void RemoveManyOdds() _source.RemoveMany(odd); - _results.Data.Count.Should().Be(50, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(50).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); var expectedResult = people.Except(odd).OrderByDescending(p => p, _comparer).ToArray(); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void RemoveManyOrdered() + [Test] + public async Task RemoveManyOrdered() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.RemoveMany(people.OrderBy(p => p, _comparer).Skip(10).Take(90)); - _results.Data.Count.Should().Be(10, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); var expectedResult = people.OrderBy(p => p, _comparer).Take(10); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void RemoveManyReverseOrdered() + [Test] + public async Task RemoveManyReverseOrdered() { var people = _generator.Take(100).ToList(); _source.AddRange(people); _source.RemoveMany(people.OrderByDescending(p => p, _comparer).Skip(10).Take(90)); - _results.Data.Count.Should().Be(10, "Should be 99 people in the cache"); - _results.Messages.Count.Should().Be(2, "Should be 2 update messages"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should be 99 people in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 update messages"); var expectedResult = people.OrderByDescending(p => p, _comparer).Take(10); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -154,14 +153,13 @@ public void Replace() var shouldbeLast = new Person("__A", 999); _source.ReplaceAt(10, shouldbeLast); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); - _results.Data.Items[ - ^1].Should().Be(shouldbeLast); + await Assert.That(_results.Data.Items[^1]).IsEqualTo(shouldbeLast); } - [Fact] - public void Resort() + [Test] + public async Task Resort() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -170,16 +168,16 @@ public void Resort() _resort.OnNext(Unit.Default); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var expectedResult = people.OrderBy(p => p, _comparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void ResortOnInlineChanges() + [Test] + public async Task ResortOnInlineChanges() { var people = _generator.Take(10).ToList(); _source.AddRange(people); @@ -199,48 +197,48 @@ public void ResortOnInlineChanges() var actualResult = _results.Data.Items.ToArray(); //actualResult.(expectedResult); - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void SortInitialBatch() + [Test] + public async Task SortInitialBatch() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(100); + await Assert.That(_results.Data.Count).IsEqualTo(100); var expectedResult = people.OrderBy(p => p, _comparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); } - [Fact] - public void UpdateMoreThanThreshold() + [Test] + public async Task UpdateMoreThanThreshold() { var allPeople = _generator.Take(1100).ToList(); var people = allPeople.Take(100).ToArray(); _source.AddRange(people); - _results.Data.Count.Should().Be(100, "Should be 100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(100).Because("Should be 100 people in the cache"); var morePeople = allPeople.Skip(100).ToArray(); _source.AddRange(morePeople); - _results.Data.Count.Should().Be(1100, "Should be 1100 people in the cache"); + await Assert.That(_results.Data.Count).IsEqualTo(1100).Because("Should be 1100 people in the cache"); var expectedResult = people.Union(morePeople).OrderBy(p => p, _comparer).ToArray(); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); - _results.Messages.Count.Should().Be(2, "Should be 2 messages"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 messages"); var lastMessage = _results.Messages.Last(); - lastMessage.First().Range.Count.Should().Be(100, "Should be 100 in the range"); - lastMessage.First().Reason.Should().Be(ListChangeReason.Clear); + await Assert.That(lastMessage.First().Range.Count).IsEqualTo(100).Because("Should be 100 in the range"); + await Assert.That(lastMessage.First().Reason).IsEqualTo(ListChangeReason.Clear); - lastMessage.Last().Range.Count.Should().Be(1100, "Should be 1100 in the range"); - lastMessage.Last().Reason.Should().Be(ListChangeReason.AddRange); + await Assert.That(lastMessage.Last().Range.Count).IsEqualTo(1100).Because("Should be 1100 in the range"); + await Assert.That(lastMessage.Last().Reason).IsEqualTo(ListChangeReason.AddRange); } } diff --git a/src/DynamicData.Tests/List/SortPrimitiveFixture.cs b/src/DynamicData.Tests/List/SortPrimitiveFixture.cs index d5e03c2a5..fb0cfe4f8 100644 --- a/src/DynamicData.Tests/List/SortPrimitiveFixture.cs +++ b/src/DynamicData.Tests/List/SortPrimitiveFixture.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.List; @@ -30,19 +26,19 @@ public void Dispose() _source.Dispose(); } - [Fact] - public void RemoveRandomSorts() + [Test] + public async Task RemoveRandomSorts() { //seems an odd test but believe me it catches exceptions when sorting on primitives var items = Enumerable.Range(1, 100).OrderBy(_ => Guid.NewGuid()).ToArray(); _source.AddRange(items); - _results.Data.Count.Should().Be(100); + await Assert.That(_results.Data.Count).IsEqualTo(100); var expectedResult = items.OrderBy(p => p, _comparer); var actualResult = _results.Data.Items; - actualResult.Should().BeEquivalentTo(expectedResult); + await Assert.That(actualResult).IsEquivalentTo(expectedResult); for (var i = 0; i < 50; i++) { diff --git a/src/DynamicData.Tests/List/SourceListFixture.cs b/src/DynamicData.Tests/List/SourceListFixture.cs index 06905c5a4..f6a9d5a46 100644 --- a/src/DynamicData.Tests/List/SourceListFixture.cs +++ b/src/DynamicData.Tests/List/SourceListFixture.cs @@ -1,91 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Disposables; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - -namespace DynamicData.Tests.List; - -public class SourceListFixture -{ - // Covers https://github.com/reactivemarbles/DynamicData/issues/1129 - [Fact] - public void ConnectDuringEditDoesNotDuplicate() - { - using var items = new SourceList(); - - using var subscriptions = new CompositeDisposable(); - - // An initial subscription is required to initiate internal buffering of changes, during the upcoming .Edit(). - // That is, we want there to be changes buffered, internally, when the mid-edit subscription comes in, to - // ensure that they don't get duplicated. This is the scenario that came in up #1129. - subscriptions.Add(items - .Connect() - .Subscribe()); - - ListItemRecordingObserver? results = null; - - items.Edit(inner => - { - inner.Add(1); - - subscriptions.Add(items - .Connect() - .ValidateChangeSets() - .RecordListItems(out results)); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().BeEmpty("no changes should be published in the middle of an edit"); - - inner.Add(2); - - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().BeEmpty("no changes should be published in the middle of an edit"); - }); - - results.Should().NotBeNull("the edit delegate should have been invoked"); - results.Error.Should().BeNull("no errors should have occurred"); - results.RecordedChangeSets.Should().ContainSingle("subscribers should only receive a single initial changeset"); - results.RecordedItems.Should().BeEquivalentTo( - new[] { 1, 2, }, - options => options.WithStrictOrdering(), - "all items in the source should have propagated downstream"); - - results.HasCompleted.Should().BeFalse("the source has not yet completed"); - } - - [Fact] - public void InitialChangeIsRange() - { - var source = new SourceList(); - source.Add("A"); - var changeSets = new List>(); - - source.Connect().Subscribe(changeSets.Add).Dispose(); - - - changeSets[0].First().Type.Should().Be(ChangeType.Range); - changeSets[0].First().Range.Index.Should().Be(0); - } - - [Fact] - public void ConnectContinuesToWorkNormallyAfterAFailedEdit() - { - using var source = new SourceList(); - - source.Add(1); - - source.Invoking(source => source.Edit(_ => throw new Exception("Test"))) - .Should().Throw() - .WithMessage("Test"); - - using var subscription = source.Connect().RecordListItems(out var results); - - results.Error.Should().BeNull("new subscribers should not receive previous errors"); - results.RecordedChangeSets.Should().ContainSingle("an initial changeset should have been published."); - } -} +namespace DynamicData.Tests.List; + +public class SourceListFixture +{ + [Test] + public async Task InitialChangeIsRange() + { + var source = new SourceList(); + source.Add("A"); + var changeSets = new List>(); + + source.Connect().Subscribe(changeSets.Add).Dispose(); + + await Assert.That(changeSets[0].First().Type).IsEqualTo(ChangeType.Range); + await Assert.That(changeSets[0].First().Range.Index).IsEqualTo(0); + } +} diff --git a/src/DynamicData.Tests/List/SourceListPreviewFixture.cs b/src/DynamicData.Tests/List/SourceListPreviewFixture.cs index cb61bbfb5..7c0ad9523 100644 --- a/src/DynamicData.Tests/List/SourceListPreviewFixture.cs +++ b/src/DynamicData.Tests/List/SourceListPreviewFixture.cs @@ -1,8 +1,3 @@ -using System; -using System.Linq; - -using Xunit; - namespace DynamicData.Tests.List; public class SourceListPreviewFixture : IDisposable @@ -11,17 +6,21 @@ public class SourceListPreviewFixture : IDisposable public SourceListPreviewFixture() => _source = new SourceList(); - [Fact] - public void ChangesAreNotYetAppliedDuringPreview() + [Test] + public async Task ChangesAreNotYetAppliedDuringPreview() { _source.Clear(); + var previewWasInvoked = false; + var countDuringPreview = -1; + var hadItemsDuringPreview = true; // On preview, make sure the list is empty var d = _source.Preview().Subscribe( _ => { - Assert.True(_source.Count == 0); - Assert.True(_source.Items.Any() == false); + previewWasInvoked = true; + countDuringPreview = _source.Count; + hadItemsDuringPreview = _source.Items.Any(); }); // Trigger a change @@ -29,10 +28,14 @@ public void ChangesAreNotYetAppliedDuringPreview() // Cleanup d.Dispose(); + + await Assert.That(previewWasInvoked).IsTrue(); + await Assert.That(countDuringPreview).IsEqualTo(0); + await Assert.That(hadItemsDuringPreview).IsFalse(); } - [Fact] - public void ConnectPreviewPredicateIsApplied() + [Test] + public async Task ConnectPreviewPredicateIsApplied() { _source.Clear(); @@ -43,10 +46,10 @@ public void ConnectPreviewPredicateIsApplied() _source.Add(1); _source.Add(2); - Assert.True(aggregator.Messages.Count == 1); - Assert.True(aggregator.Messages[0].Count == 1); - Assert.True(aggregator.Messages[0].First().Item.Current == 2); - Assert.True(aggregator.Messages[0].First().Reason == ListChangeReason.Add); + await Assert.That(aggregator.Messages.Count == 1).IsTrue(); + await Assert.That(aggregator.Messages[0].Count == 1).IsTrue(); + await Assert.That(aggregator.Messages[0].First().Item.Current == 2).IsTrue(); + await Assert.That(aggregator.Messages[0].First().Reason == ListChangeReason.Add).IsTrue(); // Cleanup aggregator.Dispose(); @@ -54,8 +57,8 @@ public void ConnectPreviewPredicateIsApplied() public void Dispose() => _source.Dispose(); - [Fact] - public void FormNewListFromChanges() + [Test] + public async Task FormNewListFromChanges() { _source.Clear(); @@ -70,30 +73,43 @@ public void FormNewListFromChanges() _source.Add(1); _source.Add(2); - Assert.True(aggregator.Messages.Count == 1); - Assert.True(aggregator.Messages[0].Count == 1); - Assert.True(aggregator.Messages[0].First().Item.Current == 2); - Assert.True(aggregator.Messages[0].First().Reason == ListChangeReason.Add); + await Assert.That(aggregator.Messages.Count == 1).IsTrue(); + await Assert.That(aggregator.Messages[0].Count == 1).IsTrue(); + await Assert.That(aggregator.Messages[0].First().Item.Current == 2).IsTrue(); + await Assert.That(aggregator.Messages[0].First().Reason == ListChangeReason.Add).IsTrue(); // Cleanup aggregator.Dispose(); } - [Fact] - public void NoChangesAllowedDuringPreview() + [Test] + public async Task NoChangesAllowedDuringPreview() { // On preview, try adding an arbitrary item - var d = _source.Preview().Subscribe(_ => Assert.Throws(() => _source.Add(1))); + Exception? previewException = null; + var d = _source.Preview().Subscribe(_ => + { + try + { + _source.Add(1); + } + catch (Exception error) + { + previewException = error; + } + }); // Trigger a change _source.Add(1); // Cleanup d.Dispose(); + + await Assert.That(previewException).IsTypeOf(); } - [Fact] - public void PreviewEventsAreCorrect() + [Test] + public async Task PreviewEventsAreCorrect() { var preview = _source.Preview().AsAggregator(); var connect = _source.Connect().AsAggregator(); @@ -107,40 +123,50 @@ public void PreviewEventsAreCorrect() l.Move(1, 0); }); - Assert.True(preview.Messages.SequenceEqual(connect.Messages)); - Assert.True(_source.Items.SequenceEqual(new[] { 3, 1, 4, 5 })); + await Assert.That(preview.Messages.SequenceEqual(connect.Messages)).IsTrue(); + await Assert.That(_source.Items.SequenceEqual(new[] { 3, 1, 4, 5 })).IsTrue(); } - [Fact] - public void RecursiveEditsHavePostponedEvents() + [Test] + public async Task RecursiveEditsHavePostponedEvents() { var preview = _source.Preview().AsAggregator(); var connect = _source.Connect().AsAggregator(); + var previewMessageCountDuringEdit = -1; + var connectMessageCountDuringEdit = -1; + _source.Edit( l => { _source.Edit(l2 => l2.Add(1)); - Assert.Equal(0, preview.Messages.Count); - Assert.Equal(0, connect.Messages.Count); + previewMessageCountDuringEdit = preview.Messages.Count; + connectMessageCountDuringEdit = connect.Messages.Count; }); - Assert.Equal(1, preview.Messages.Count); - Assert.Equal(1, connect.Messages.Count); + await Assert.That(previewMessageCountDuringEdit).IsEqualTo(0); + await Assert.That(connectMessageCountDuringEdit).IsEqualTo(0); + await Assert.That(preview.Messages.Count).IsEqualTo(1); + await Assert.That(connect.Messages.Count).IsEqualTo(1); - Assert.True(_source.Items.SequenceEqual(new[] { 1 })); + await Assert.That(_source.Items.SequenceEqual(new[] { 1 })).IsTrue(); } - [Fact] - public void RecursiveEditsWork() + [Test] + public async Task RecursiveEditsWork() { + int[] sourceItemsDuringEdit = []; + int[] editorItemsDuringEdit = []; + _source.Edit( l => { _source.Edit(l2 => l2.Add(1)); - Assert.True(_source.Items.SequenceEqual(new[] { 1 })); - Assert.True(l.SequenceEqual(new[] { 1 })); + sourceItemsDuringEdit = _source.Items.ToArray(); + editorItemsDuringEdit = l.ToArray(); }); - Assert.True(_source.Items.SequenceEqual(new[] { 1 })); + await Assert.That(sourceItemsDuringEdit).IsEquivalentTo(new[] { 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(editorItemsDuringEdit).IsEquivalentTo(new[] { 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(_source.Items.SequenceEqual(new[] { 1 })).IsTrue(); } } diff --git a/src/DynamicData.Tests/List/SubscribeManyFixture.cs b/src/DynamicData.Tests/List/SubscribeManyFixture.cs index 8f8995a2e..0ed2f5900 100644 --- a/src/DynamicData.Tests/List/SubscribeManyFixture.cs +++ b/src/DynamicData.Tests/List/SubscribeManyFixture.cs @@ -1,11 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class SubscribeManyFixture : IDisposable @@ -26,14 +18,14 @@ public SubscribeManyFixture() })); } - [Fact] - public void AddedItemWillbeSubscribed() + [Test] + public async Task AddedItemWillbeSubscribed() { _source.Add(new SubscribeableObject(1)); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].IsSubscribed.Should().Be(true, "Should be subscribed"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0].IsSubscribed).IsTrue().Because("Should be subscribed"); } public void Dispose() @@ -42,7 +34,7 @@ public void Dispose() _results.Dispose(); } - //[Fact] + //[Test] //public void UpdateUnsubscribesPrevious() //{ // _source.Add(new SubscribeableObject(1)); @@ -54,28 +46,28 @@ public void Dispose() // Assert.AreEqual(false, _results.Messages[1].First().Previous.Value.IsSubscribed, "Previous should not be subscribed"); //} - [Fact] - public void EverythingIsUnsubscribedWhenStreamIsDisposed() + [Test] + public async Task EverythingIsUnsubscribedWhenStreamIsDisposed() { _source.AddRange(Enumerable.Range(1, 10).Select(i => new SubscribeableObject(i))); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); var items = _results.Messages[0].SelectMany(x => x.Range); - items.All(d => !d.IsSubscribed).Should().BeTrue(); + await Assert.That(items.All(d => !d.IsSubscribed)).IsTrue(); } - [Fact] - public void RemoveIsUnsubscribed() + [Test] + public async Task RemoveIsUnsubscribed() { _source.Add(new SubscribeableObject(1)); _source.RemoveAt(0); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Data.Count.Should().Be(0, "Should be 0 items in the cache"); - _results.Messages[1].First().Item.Current.IsSubscribed.Should().Be(false, "Should be be unsubscribed"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be 0 items in the cache"); + await Assert.That(_results.Messages[1].First().Item.Current.IsSubscribed).IsFalse().Because("Should be be unsubscribed"); } private class SubscribeableObject(int id) diff --git a/src/DynamicData.Tests/List/SwitchFixture.cs b/src/DynamicData.Tests/List/SwitchFixture.cs index 5b490f84f..31fd55535 100644 --- a/src/DynamicData.Tests/List/SwitchFixture.cs +++ b/src/DynamicData.Tests/List/SwitchFixture.cs @@ -1,276 +1,56 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading; - -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; - -namespace DynamicData.Tests.List; - -public class SwitchFixture : IDisposable -{ - private readonly ChangeSetAggregator _results; - - private readonly ISourceList _source; - - private readonly ISubject> _switchable; - - public SwitchFixture() - { - _source = new SourceList(); - _switchable = new BehaviorSubject>(_source); - _results = _switchable.Switch().AsAggregator(); - } - - [Fact] - public void ClearsForNewSource() - { - var inital = Enumerable.Range(1, 100).ToArray(); - _source.AddRange(inital); - - _results.Data.Count.Should().Be(100); - - var newSource = new SourceList(); - _switchable.OnNext(newSource); - - _results.Data.Count.Should().Be(0); - - newSource.AddRange(inital); - _results.Data.Count.Should().Be(100); - - var nextUpdates = Enumerable.Range(100, 100).ToArray(); - newSource.AddRange(nextUpdates); - _results.Data.Count.Should().Be(200); - } - - public void Dispose() - { - _source.Dispose(); - _results.Dispose(); - } - - [Fact] - public void PoulatesFirstSource() - { - var inital = Enumerable.Range(1, 100).ToArray(); - _source.AddRange(inital); - - _results.Data.Count.Should().Be(100); - - inital.Should().BeEquivalentTo(_source.Items); - } - - [Fact] - public void PropagatesOuterErrors() - { - using var source = new SourceList(); - using var switchable = new BehaviorSubject>>(source.Connect()); - using var results = switchable.Switch().AsAggregator(); - - source.AddRange(Enumerable.Range(1, 100)); - - var error = new Exception("Test"); - switchable.OnError(error); - - results.Exception.Should().Be(error); - } - - [Fact] - public void PropagatesInnerErrors() - { - using var source = new SourceList(); - using var switchable = new BehaviorSubject>>(source.Connect()); - using var results = switchable.Switch().AsAggregator(); - - source.AddRange(Enumerable.Range(1, 100)); - - using var source2 = new Subject>(); - switchable.OnNext(source2); - - var error = new Exception("Test"); - source2.OnError(error); - - results.Exception.Should().Be(error); - } - - [Fact] - public void CompletesWhenSourcesAndInnerComplete() - { - using var source = new SourceList(); - using var switchable = new BehaviorSubject>>(source.Connect()); - using var results = switchable.Switch().AsAggregator(); - - source.AddRange(Enumerable.Range(1, 100)); - - switchable.OnCompleted(); - results.IsCompleted.Should().BeFalse("the inner sequence is still running"); - - source.Dispose(); - - results.IsCompleted.Should().BeTrue("both the sources and the inner sequence have completed"); - results.Exception.Should().BeNull(); - results.Data.Count.Should().Be(100, "all data should have been received before completion"); - } - - [Fact] - public void DoesNotCompleteWhileInnerIsStillRunning() - { - using var source = new SourceList(); - using var switchable = new BehaviorSubject>>(source.Connect()); - using var results = switchable.Switch().AsAggregator(); - - switchable.OnCompleted(); - source.Add(1); - - results.IsCompleted.Should().BeFalse("the inner sequence has not completed"); - results.Data.Count.Should().Be(1, "changes should still flow after the sources sequence completes"); - } - - [Fact] - public void DoesNotCompleteWhenOnlyASupersededInnerCompletes() - { - using var first = new SourceList(); - using var second = new SourceList(); - using var switchable = new BehaviorSubject>>(first.Connect()); - using var results = switchable.Switch().AsAggregator(); - - switchable.OnNext(second.Connect()); - switchable.OnCompleted(); - - first.Dispose(); - - results.IsCompleted.Should().BeFalse("the superseded sequence is not the current one"); - - second.Add(1); - results.Data.Count.Should().Be(1, "the current sequence should still be delivering"); - - second.Dispose(); - results.IsCompleted.Should().BeTrue("the current sequence has now completed"); - } - - [Fact] - public void CompletesWhenSourcesAndInnerCompleteSynchronously() - { - using var results = Observable.Return(Observable.Empty>()).Switch().AsAggregator(); - - results.IsCompleted.Should().BeTrue("everything completed during subscription"); - results.Exception.Should().BeNull(); - } - - [Fact] - public void DeliversChangesEmittedBeforeSynchronousCompletion() - { - var change = new ChangeSet { new(ListChangeReason.Add, 42) }; - using var results = Observable.Return(Observable.Return((IChangeSet)change)).Switch().AsAggregator(); - - results.Data.Count.Should().Be(1, "changes emitted before a synchronous completion must not be lost"); - results.IsCompleted.Should().BeTrue("the source completed"); - results.Exception.Should().BeNull(); - } - - [Fact] - public void IgnoresChangesFromASupersededSource() - { - using var first = new Subject>(); - using var second = new Subject>(); - using var switchable = new BehaviorSubject>>(first); - using var results = switchable.Switch().AsAggregator(); - - first.OnNext(new ChangeSet { new(ListChangeReason.Add, 1) }); - results.Data.Count.Should().Be(1); - - switchable.OnNext(second); - results.Data.Count.Should().Be(0, "moving to a new source drops what the previous one contributed"); - - first.OnNext(new ChangeSet { new(ListChangeReason.Add, 2) }); - - results.Data.Count.Should().Be(0, "a superseded source must not be able to write into the result"); - results.Exception.Should().BeNull(); - } - - [Fact] - public void PropagatesInnerErrorsRaisedSynchronously() - { - var error = new Exception("Test"); - using var results = Observable.Return(Observable.Throw>(error)).Switch().AsAggregator(); - - results.Exception.Should().Be(error, "the error was raised during subscription"); - } - - [Fact] - public void DoesNotHoldALockWhileDeliveringDownstream() - { - // Observable.Switch holds its gate for the whole of downstream delivery, which is the shape that - // deadlocks when a pipeline crosses into another collection. Delivery has to go through the queue, - // which enqueues and returns, so a producer is never held up by whatever a subscriber is doing. - using var switchable = new Subject>>(); - using var first = new Subject>(); - - using var isDelivering = new ManualResetEventSlim(false); - using var release = new ManualResetEventSlim(false); - - using var subscription = switchable.Switch().Subscribe(_ => - { - isDelivering.Set(); - release.Wait(TimeSpan.FromSeconds(10)); - }); - - switchable.OnNext(first); - - var deliverer = new Thread(() => first.OnNext(new ChangeSet { new Change(ListChangeReason.Add, 1, 0) })) { IsBackground = true }; - deliverer.Start(); - - isDelivering.Wait(TimeSpan.FromSeconds(10)).Should().BeTrue("the subscriber should have been handed the change"); - - var producer = new Thread(() => switchable.OnNext(new Subject>())) { IsBackground = true }; - producer.Start(); - - var producerFinished = producer.Join(TimeSpan.FromSeconds(2)); - - release.Set(); - deliverer.Join(TimeSpan.FromSeconds(10)); - producer.Join(TimeSpan.FromSeconds(10)); - - producerFinished.Should().BeTrue("writing to the source must not block while a subscriber holds onto a notification"); - } - - [Fact] - public void IgnoresErrorsFromASupersededSource() - { - // Switching away from a source means anything it produces afterwards belongs to a source that - // is no longer selected, and that includes its failures. Ordinarily disposal stops a - // superseded source being heard from again, but disposal cannot reach a notification that is - // already in flight, so the operator has to discard it on arrival. The raw observable hands - // back the observer directly, which is how that in-flight failure is reproduced here without - // needing a race to land. - var supersededObserver = default(IObserver>); - var superseded = RawAnonymousObservable.Create>(observer => - { - supersededObserver = observer; - return Disposable.Empty; - }); - - using var switchable = new Subject>>(); - using var current = new Subject>(); - - using var results = switchable.Switch().AsAggregator(); - - switchable.OnNext(superseded); - switchable.OnNext(current); - - supersededObserver.Should().NotBeNull("the superseded source should have been subscribed"); - supersededObserver!.OnError(new Exception("Test")); - - results.Exception.Should().BeNull("the failed source had already been switched away from"); - - current.OnNext(new ChangeSet { new Change(ListChangeReason.Add, 1, 0) }); - - results.Data.Count.Should().Be(1, "the selected source should still be delivering"); - } -} +namespace DynamicData.Tests.List; + +public class SwitchFixture : IDisposable +{ + private readonly ChangeSetAggregator _results; + + private readonly ISourceList _source; + + private readonly ReactiveUI.Primitives.Signals.ISignal> _switchable; + + public SwitchFixture() + { + _source = new SourceList(); + _switchable = new ReactiveUI.Primitives.Signals.StateSignal>(_source); + _results = _switchable.Switch().AsAggregator(); + } + + [Test] + public async Task ClearsForNewSource() + { + var inital = Enumerable.Range(1, 100).ToArray(); + _source.AddRange(inital); + + await Assert.That(_results.Data.Count).IsEqualTo(100); + + var newSource = new SourceList(); + _switchable.OnNext(newSource); + + await Assert.That(_results.Data.Count).IsEqualTo(0); + + newSource.AddRange(inital); + await Assert.That(_results.Data.Count).IsEqualTo(100); + + var nextUpdates = Enumerable.Range(100, 100).ToArray(); + newSource.AddRange(nextUpdates); + await Assert.That(_results.Data.Count).IsEqualTo(200); + } + + public void Dispose() + { + _source.Dispose(); + _results.Dispose(); + _switchable.Dispose(); + } + + [Test] + public async Task PoulatesFirstSource() + { + var inital = Enumerable.Range(1, 100).ToArray(); + _source.AddRange(inital); + + await Assert.That(_results.Data.Count).IsEqualTo(100); + + await Assert.That(inital).IsEquivalentTo(_source.Items); + } +} diff --git a/src/DynamicData.Tests/List/ToCollectionFixture.cs b/src/DynamicData.Tests/List/ToCollectionFixture.cs index a46aa790f..43a6921b3 100644 --- a/src/DynamicData.Tests/List/ToCollectionFixture.cs +++ b/src/DynamicData.Tests/List/ToCollectionFixture.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Linq; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.List; public class ToCollectionFixture { - [Fact] - public void ToCollectionTest() + [Test] + public async Task ToCollectionTest() { var list = new SourceList(); // var collection = Observable.Defer(() => list.Connect().ToCollection()); @@ -20,7 +14,7 @@ public void ToCollectionTest() collection.Subscribe(x => res2 = x); list.Add("1"); list.Add("2"); - res1?.Count.Should().Be(2); - res2?.Count.Should().Be(2); + await Assert.That(res1?.Count).IsEqualTo(2); + await Assert.That(res2?.Count).IsEqualTo(2); } } diff --git a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.IntegrationTests.cs b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.IntegrationTests.cs index 0a60bc356..9a449c012 100644 --- a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.IntegrationTests.cs +++ b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.IntegrationTests.cs @@ -1,14 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public static partial class ToObservableChangeSetFixture @@ -18,65 +7,66 @@ public static partial class Items public class IntegrationTests : IntegrationTestFixtureBase { - [Theory(Timeout = 60_000)] - [InlineData(SchedulerType.Default)] - [InlineData(SchedulerType.NewThread)] - [InlineData(SchedulerType.TaskPool)] - [InlineData(SchedulerType.ThreadPool)] - public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType) + [Test] + [Timeout(60_000)] + [Arguments(SchedulerType.Default)] + [Arguments(SchedulerType.NewThread)] + [Arguments(SchedulerType.TaskPool)] + [Arguments(SchedulerType.ThreadPool)] + public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType, CancellationToken cancellationToken) { IScheduler scheduler = schedulerType switch { - SchedulerType.Default => DefaultScheduler.Instance, - SchedulerType.NewThread => new NewThreadScheduler(), - SchedulerType.TaskPool => TaskPoolScheduler.Default, - SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, - _ => throw new ArgumentOutOfRangeException(nameof(SchedulerType)) + SchedulerType.Default => Scheduler.Default, + SchedulerType.NewThread => new NewThreadScheduler(), + SchedulerType.TaskPool => TaskPoolScheduler.Default, + SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, + _ => throw new ArgumentOutOfRangeException(nameof(SchedulerType)) }; using var subscription1 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new Item() { - Id = (int)(id % 100), - Lifetime = TimeSpan.FromMilliseconds(50) + Id = (int)(id % 100), + Lifetime = TimeSpan.FromMilliseconds(50) }) .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results1); - + using var subscription2 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new Item() { - Id = (int)(id % 100) + 100, - Lifetime = TimeSpan.FromMilliseconds(50) + Id = (int)(id % 100) + 100, + Lifetime = TimeSpan.FromMilliseconds(50) }) .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results2); await Task.WhenAll( results1.WhenFinalized, - results2.WhenFinalized); + results2.WhenFinalized).WaitAsync(cancellationToken); - results1.Error.Should().BeNull(); - results1.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results1.RecordedItems.Should().BeEmpty("all items should have expired"); + await Assert.That(results1.Error).IsNull(); + await Assert.That(results1.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results1.RecordedItems).IsEmpty().Because("all items should have expired"); - results2.Error.Should().BeNull(); - results2.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results2.RecordedItems.Should().BeEmpty("all items should have expired"); + await Assert.That(results2.Error).IsNull(); + await Assert.That(results2.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results2.RecordedItems).IsEmpty().Because("all items should have expired"); } } } diff --git a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.UnitTests.cs b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.UnitTests.cs index 887a230d4..dc8379357 100644 --- a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.UnitTests.cs +++ b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.UnitTests.cs @@ -1,15 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using Microsoft.Reactive.Testing; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public static partial class ToObservableChangeSetFixture @@ -18,15 +6,14 @@ public static partial class Items { public class UnitTests { - [Fact] - public void ExpireAfterThrows_ErrorPropagates() + [Test] + public async Task ExpireAfterThrows_ErrorPropagates() { // Setup - using var source = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal(); var error = new Exception("Test Exception"); - // UUT Initialization using var subscription = source .ToObservableChangeSet(expireAfter: static item => (item.Error is not null) @@ -36,11 +23,10 @@ public void ExpireAfterThrows_ErrorPropagates() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEmpty("no items have been emitted by the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been emitted by the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -48,17 +34,16 @@ public void ExpireAfterThrows_ErrorPropagates() source.OnNext(new Item() { Id = 2, Error = error }); source.OnNext(new Item() { Id = 3 }); - results.Error.Should().BeSameAs(error); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item was emitted before an error occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1 }, "1 item was emitted before an error occurred"); + await Assert.That(results.Error).IsSameReferenceAs(error); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item was emitted before an error occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1 }).Because("1 item was emitted before an error occurred"); } - [Fact] - public void SizeLimitIsExceeded_OldestItemsAreRemoved() + [Test] + public async Task SizeLimitIsExceeded_OldestItemsAreRemoved() { // Setup - using var source = new Subject(); - + using var source = new ReactiveUI.Primitives.Signals.Signal(); // UUT Initialization using var subscription = source @@ -67,11 +52,10 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEmpty("no items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Not enough items to reach the limit var item1 = new Item() { Id = 1 }; @@ -86,261 +70,223 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() var item4 = new Item() { Id = 4 }; source.OnNext(item4); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(4, "4 items were emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2, item3, item4 }, - because: "4 items were emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(4).Because("4 items were emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2, item3, item4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("4 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Limit is reached var item5 = new Item() { Id = 5 }; source.OnNext(item5); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2, item3, item4, item5 }, - because: "1 item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2, item3, item4, item5 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: New item exceeds the limit var item6 = new Item() { Id = 6 }; source.OnNext(item6); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(6).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item2, item3, item4, item5, item6 }, - because: "1 item was emitted, and 1 was evicted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(6).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item2, item3, item4, item5, item6 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted, and 1 was evicted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) { // Setup var item = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(10) }; var source = sourceType switch { - SourceType.Asynchronous => new Subject(), - SourceType.Immediate => Observable.Return(item), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal(), + SourceType.Immediate => Observable.Return(item), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - if (source is Subject subject) + if (source is ReactiveUI.Primitives.Signals.Signal subject) { subject.OnNext(item); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 item was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 item was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item }, - because: "1 item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("1 item has yet to expire"); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("1 item has yet to expire"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(10).Ticks); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 item should have expired"); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 item should have expired"); else - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item should have expired"); - results.RecordedItems.Should().BeEmpty("all items have expired"); - results.HasCompleted.Should().BeTrue("the source, and all outstanding expirations, have completed"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item should have expired"); + await Assert.That(results.RecordedItems).IsEmpty().Because("all items have expired"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source, and all outstanding expirations, have completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) { // Setup var item = new Item() { Id = 1 }; var source = sourceType switch { - SourceType.Asynchronous => new Subject(), - SourceType.Immediate => Observable.Return(item), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal(), + SourceType.Immediate => Observable.Return(item), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - if (source is Subject subject) + if (source is ReactiveUI.Primitives.Signals.Signal subject) { subject.OnNext(item); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 item was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 item was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item }, - because: "1 item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeTrue("the source has completed, and no items remain to be expired"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no items remain to be expired"); } - [Fact] - public void SourceEmitsItems_ItemsAreAddedAndRemovedWhenExpired() + [Test] + public async Task SourceEmitsItems_ItemsAreAddedAndRemovedWhenExpired() { // Setup - using var source = new Subject(); + using var source = new ReactiveUI.Primitives.Signals.Signal(); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEmpty("no items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(3) }; source.OnNext(item1); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1 }, - because: "1 item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item2 = new Item() { Id = 2 }; source.OnNext(item2); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2 }, - because: "1 item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item3 = new Item() { Id = 3, Lifetime = TimeSpan.FromSeconds(1) }; source.OnNext(item3); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 item was emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2, item3 }, - because: "1 item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 item was emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2, item3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(1).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2 }, - because: "1 item expired, and 1 had its lifetime extended", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item expired, and 1 had its lifetime extended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(2).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2 }, - because: "no changes were made", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(3).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(5).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item2 }, - because: "1 item reached its expiration", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(5).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(4).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(6).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item2 }, - because: "no changes were made", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(6)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceFails_ErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceFails_ErrorPropagates(SourceType sourceType) { // Setup var error = new Exception("Test Exception"); var source = sourceType switch - { - SourceType.Asynchronous => new Subject(), - SourceType.Immediate => Observable.Throw(error), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + { + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal(), + SourceType.Immediate => Observable.Throw(error), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - // UUT Initialization & Action using var subscription = source .ToObservableChangeSet() @@ -348,22 +294,22 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) .ValidateChangeSets() .RecordListItems(out var results); - if (source is Subject subject) + if (source is ReactiveUI.Primitives.Signals.Signal subject) subject.OnError(error); - results.Error.Should().BeSameAs(error, "errors should propagate"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors should propagate"); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); else - results.RecordedChangeSets.Should().BeEmpty("an error occurred during initialization"); - results.RecordedItems.Should().BeEmpty("no items were emitted"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during initialization"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items were emitted"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableListEx.ToObservableChangeSet( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableListEx.ToObservableChangeSet( source: (null as IObservable)!)) - .Should().Throw(); + .Throws(); } } } diff --git a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs index 505404290..0a7816ebb 100644 --- a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs +++ b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.IntegrationTests.cs @@ -1,14 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Threading.Tasks; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public static partial class ToObservableChangeSetFixture @@ -18,25 +7,26 @@ public static partial class Sequences public class IntegrationTests : IntegrationTestFixtureBase { - [Theory(Timeout = 60_000)] - [InlineData(SchedulerType.Default)] - [InlineData(SchedulerType.NewThread)] - [InlineData(SchedulerType.TaskPool)] - [InlineData(SchedulerType.ThreadPool)] - public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType) + [Test] + [Timeout(60_000)] + [Arguments(SchedulerType.Default)] + [Arguments(SchedulerType.NewThread)] + [Arguments(SchedulerType.TaskPool)] + [Arguments(SchedulerType.ThreadPool)] + public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe(SchedulerType schedulerType, CancellationToken cancellationToken) { IScheduler scheduler = schedulerType switch { - SchedulerType.Default => DefaultScheduler.Instance, - SchedulerType.NewThread => new NewThreadScheduler(), - SchedulerType.TaskPool => TaskPoolScheduler.Default, - SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, - _ => throw new ArgumentOutOfRangeException(nameof(schedulerType)) + SchedulerType.Default => Scheduler.Default, + SchedulerType.NewThread => new NewThreadScheduler(), + SchedulerType.TaskPool => TaskPoolScheduler.Default, + SchedulerType.ThreadPool => ThreadPoolScheduler.Instance, + _ => throw new ArgumentOutOfRangeException(nameof(schedulerType)) }; using var subscription1 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new[] { @@ -47,15 +37,15 @@ public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe( } }) .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results1); - + using var subscription2 = Observable.Interval( - period: TimeSpan.FromMilliseconds(5), - scheduler: scheduler) + period: TimeSpan.FromMilliseconds(5), + scheduler: scheduler) .Take(IntegrationTestItemCount) .Select(id => new[] { @@ -66,23 +56,23 @@ public async Task MultipleSubscriptionsRunInParallel_SchedulerUsageIsThreadSafe( } }) .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results2); await Task.WhenAll( results1.WhenFinalized, - results2.WhenFinalized); + results2.WhenFinalized).WaitAsync(cancellationToken); - results1.Error.Should().BeNull(); - results1.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results1.RecordedItems.Should().BeEmpty("all items should have expired"); + await Assert.That(results1.Error).IsNull(); + await Assert.That(results1.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results1.RecordedItems).IsEmpty().Because("all items should have expired"); - results2.Error.Should().BeNull(); - results2.HasCompleted.Should().BeTrue("all changes should have been processed successfully"); - results2.RecordedItems.Should().BeEmpty("all items should have expired"); + await Assert.That(results2.Error).IsNull(); + await Assert.That(results2.HasCompleted).IsTrue().Because("all changes should have been processed successfully"); + await Assert.That(results2.RecordedItems).IsEmpty().Because("all items should have expired"); } } } diff --git a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.UnitTests.cs b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.UnitTests.cs index 55b1fdaae..d85c876d7 100644 --- a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.UnitTests.cs +++ b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.UnitTests.cs @@ -1,16 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using Microsoft.Reactive.Testing; - -using FluentAssertions; -using Xunit; - -using DynamicData.Tests.Utilities; - namespace DynamicData.Tests.List; public static partial class ToObservableChangeSetFixture @@ -19,15 +6,14 @@ public static partial class Sequences { public class UnitTests { - [Fact] - public void ExpireAfterThrows_ErrorPropagates() + [Test] + public async Task ExpireAfterThrows_ErrorPropagates() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var error = new Exception("Test Exception"); - // UUT Initialization using var subscription = source .ToObservableChangeSet(expireAfter: static item => (item.Error is not null) @@ -37,11 +23,10 @@ public void ExpireAfterThrows_ErrorPropagates() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEmpty("no items have been emitted by the source"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no items have been emitted by the source"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1 }; @@ -52,17 +37,16 @@ public void ExpireAfterThrows_ErrorPropagates() new Item() { Id = 3 } }); - results.Error.Should().BeSameAs(error); - results.RecordedChangeSets.Skip(1).Should().BeEmpty("an error occurred during processing of the sequence"); - results.RecordedItems.Should().BeEmpty("an error occurred during processing of the sequence"); + await Assert.That(results.Error).IsSameReferenceAs(error); + await Assert.That(results.RecordedChangeSets.Skip(1)).IsEmpty().Because("an error occurred during processing of the sequence"); + await Assert.That(results.RecordedItems).IsEmpty().Because("an error occurred during processing of the sequence"); } - [Fact] - public void SizeLimitIsExceeded_OldestItemsAreRemoved() + [Test] + public async Task SizeLimitIsExceeded_OldestItemsAreRemoved() { // Setup - using var source = new Subject>(); - + using var source = new ReactiveUI.Primitives.Signals.Signal>(); // UUT Initialization using var subscription = source @@ -71,11 +55,10 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEmpty("no source items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no source items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Not enough items to reach the limit var item1 = new Item() { Id = 1 }; @@ -90,42 +73,34 @@ public void SizeLimitIsExceeded_OldestItemsAreRemoved() item4 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2, item3, item4 }, - because: "4 source items were emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2, item3, item4 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("4 source items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: Limit is reached var item5 = new Item() { Id = 5 }; source.OnNext(new[] { item5 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2, item3, item4, item5 }, - because: "1 source item was emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2, item3, item4, item5 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 source item was emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action: New item exceeds the limit var item6 = new Item() { Id = 6 }; source.OnNext(new[] { item6 }); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 source operation was performed"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item2, item3, item4, item5, item6 }, - because: "1 source item was emitted, and 1 was evicted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 source operation was performed"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item2, item3, item4, item5, item6 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 source item was emitted, and 1 was evicted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpirations(SourceType sourceType) { // Setup var items = new[] @@ -137,58 +112,52 @@ public void SourceCompletesWhenExpirationsArePending_CompletionWaitsForExpiratio var source = sourceType switch { - SourceType.Asynchronous => new Subject>(), - SourceType.Immediate => Observable.Return>(items), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal>(), + SourceType.Immediate => Observable.Return>(items), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) { subject.OnNext(items); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 sequence was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 sequence was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEquivalentTo(items, - because: "3 items were emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("2 items have yet to expire"); - + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("2 items have yet to expire"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(30).Ticks); - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Skip(2).Count().Should().Be(2, "2 items should have expired, at different times"); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(2).Because("2 items should have expired, at different times"); else - results.RecordedChangeSets.Skip(1).Count().Should().Be(2, "2 items should have expired, at different times"); - results.RecordedItems.Should().BeEquivalentTo(items.Where(static item => item.Lifetime is null), - because: "all expirable items have expired", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeTrue("the source, and all outstanding expirations, have completed"); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(2).Because("2 items should have expired, at different times"); + await Assert.That(results.RecordedItems).IsEquivalentTo(items.Where(static item => item.Lifetime is null), TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("all expirable items have expired"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source, and all outstanding expirations, have completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(SourceType sourceType) { // Setup var items = new[] @@ -200,63 +169,58 @@ public void SourceCompletesWhenNoExpirationsArePending_CompletionPropagates(Sour var source = sourceType switch { - SourceType.Asynchronous => new Subject>(), - SourceType.Immediate => Observable.Return>(items), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal>(), + SourceType.Immediate => Observable.Return>(items), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - - var scheduler = new TestScheduler(); + var scheduler = new TestScheduler(); // UUT Initialization & Action using var subscription = source .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) { subject.OnNext(items); subject.OnCompleted(); } - results.Error.Should().BeNull(); + await Assert.That(results.Error).IsNull(); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(2, "1 sequence was emitted, after initialization"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(2).Because("1 sequence was emitted, after initialization"); else - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEquivalentTo(items, - because: "3 items were emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeTrue("the source has completed, and no items remain to be expired"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(items, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsTrue().Because("the source has completed, and no items remain to be expired"); } - [Fact] - public void SourceEmitsItems_ItemsAreAddedAndRemovedWhenExpired() + [Test] + public async Task SourceEmitsItems_ItemsAreAddedAndRemovedWhenExpired() { // Setup - using var source = new Subject>(); + using var source = new ReactiveUI.Primitives.Signals.Signal>(); var scheduler = new TestScheduler(); - // UUT Initialization using var subscription = source .ToObservableChangeSet( - expireAfter: Item.SelectLifetime, - scheduler: scheduler) + expireAfter: Item.SelectLifetime, + scheduler: scheduler) .ValidateSynchronization() .ValidateChangeSets() .RecordListItems(out var results); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); - results.RecordedItems.Should().BeEmpty("no source items have been emitted"); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no source items have been emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action var item1 = new Item() { Id = 1, Lifetime = TimeSpan.FromSeconds(3) }; @@ -265,74 +229,59 @@ public void SourceEmitsItems_ItemsAreAddedAndRemovedWhenExpired() source.OnNext(new[] { item1, item2, item3 }); scheduler.AdvanceBy(1); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(1).Count().Should().Be(1, "1 sequence was emitted"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2, item3 }, - because: "3 items were emitted", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(1).Count()).IsEqualTo(1).Because("1 sequence was emitted"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2, item3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("3 items were emitted"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(1).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(2).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2 }, - because: "1 item expired, and 1 had its lifetime extended", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(2).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item expired, and 1 had its lifetime extended"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(2).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item1, item2 }, - because: "no changes were made", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item1, item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(3).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(3).Count().Should().Be(1, "1 expiration should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item2 }, - because: "1 item reached its expiration", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); - + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(3).Count()).IsEqualTo(1).Because("1 expiration should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("1 item reached its expiration"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); // UUT Action scheduler.AdvanceTo(TimeSpan.FromSeconds(4).Ticks); - results.Error.Should().BeNull(); - results.RecordedChangeSets.Skip(4).Should().BeEmpty("no expirations should have occurred"); - results.RecordedItems.Should().BeEquivalentTo(new[] { item2 }, - because: "no changes were made", - config: options => options.WithStrictOrdering()); - results.HasCompleted.Should().BeFalse("the source has not completed"); + await Assert.That(results.Error).IsNull(); + await Assert.That(results.RecordedChangeSets.Skip(4)).IsEmpty().Because("no expirations should have occurred"); + await Assert.That(results.RecordedItems).IsEquivalentTo(new[] { item2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because("no changes were made"); + await Assert.That(results.HasCompleted).IsFalse().Because("the source has not completed"); } - [Theory] - [InlineData(SourceType.Asynchronous)] - [InlineData(SourceType.Immediate)] - public void SourceFails_ErrorPropagates(SourceType sourceType) + [Test] + [Arguments(SourceType.Asynchronous)] + [Arguments(SourceType.Immediate)] + public async Task SourceFails_ErrorPropagates(SourceType sourceType) { // Setup var error = new Exception("Test Exception"); var source = sourceType switch - { - SourceType.Asynchronous => new Subject>(), - SourceType.Immediate => Observable.Throw>(error), - _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) + { + SourceType.Asynchronous => new ReactiveUI.Primitives.Signals.Signal>(), + SourceType.Immediate => Observable.Throw>(error), + _ => throw new ArgumentOutOfRangeException(nameof(sourceType)) }; - // UUT Initialization & Action using var subscription = source .ToObservableChangeSet() @@ -340,22 +289,22 @@ public void SourceFails_ErrorPropagates(SourceType sourceType) .ValidateChangeSets() .RecordListItems(out var results); - if (source is Subject> subject) + if (source is ReactiveUI.Primitives.Signals.Signal> subject) subject.OnError(error); - results.Error.Should().BeSameAs(error, "errors should propagate"); + await Assert.That(results.Error).IsSameReferenceAs(error).Because("errors should propagate"); if (sourceType is SourceType.Asynchronous) - results.RecordedChangeSets.Count.Should().Be(1, "an initial changeset should always be emitted"); + await Assert.That(results.RecordedChangeSets.Count).IsEqualTo(1).Because("an initial changeset should always be emitted"); else - results.RecordedChangeSets.Should().BeEmpty("an error occurred during initialization"); - results.RecordedItems.Should().BeEmpty("no source items were emitted"); + await Assert.That(results.RecordedChangeSets).IsEmpty().Because("an error occurred during initialization"); + await Assert.That(results.RecordedItems).IsEmpty().Because("no source items were emitted"); } - [Fact] - public void SourceIsNull_ThrowsException() - => FluentActions.Invoking(() => ObservableListEx.ToObservableChangeSet( + [Test] + public async Task SourceIsNull_ThrowsException() + => await Assert.That(() => ObservableListEx.ToObservableChangeSet( source: (null as IObservable>)!)) - .Should().Throw(); + .Throws(); } } } diff --git a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.cs b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.cs index e42998264..0abd06962 100644 --- a/src/DynamicData.Tests/List/ToObservableChangeSetFixture.cs +++ b/src/DynamicData.Tests/List/ToObservableChangeSetFixture.cs @@ -1,15 +1,13 @@ -using System; - namespace DynamicData.Tests.List; public static partial class ToObservableChangeSetFixture { public const int IntegrationTestItemCount - #if RELEASE +#if RELEASE = 1_000; - #else +#else = 100; - #endif +#endif public enum SchedulerType { diff --git a/src/DynamicData.Tests/List/TransformAsyncFixture.cs b/src/DynamicData.Tests/List/TransformAsyncFixture.cs index be4b8f623..3c05d368d 100755 --- a/src/DynamicData.Tests/List/TransformAsyncFixture.cs +++ b/src/DynamicData.Tests/List/TransformAsyncFixture.cs @@ -1,11 +1,4 @@ -using System; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using DynamicData.Kernel; using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; namespace DynamicData.Tests.List; @@ -39,21 +32,21 @@ public void Dispose() */ - [Fact] + [Test] public async Task Add() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); var transformed = await _transformFactory(person); - _results.Data.Items[0].Should().Be(transformed, "Should be same person"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(transformed).Because("Should be same person"); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -61,15 +54,15 @@ public void Remove() _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -78,60 +71,60 @@ public void Update() _source.Add(newperson); _source.Add(updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[0].Replaced.Should().Be(0, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[0].Replaced).IsEqualTo(0).Because("Should be 1 update"); } - [Fact] + [Test] public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var tasks = people.Select(_transformFactory); var result = await Task.WhenAll(tasks); var transformed = result.OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(_results.Data.Items.OrderBy(p => p.Age), "Incorrect transform result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(_results.Data.Items.OrderBy(p => p.Age)).Because("Incorrect transform result"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name", i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(10, "Should return 10 adds"); - _results.Data.Count.Should().Be(10, "Should result in 10 records"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(10).Because("Should return 10 adds"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should result in 10 records"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } /// /// This test is disabled as it was flaky. /// https://github.com/reactivemarbles/DynamicData/pull/625 /// - [Fact] - private void TransformOnRefresh() + [Test] + public async Task TransformOnRefresh() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, 1)).ToArray(); @@ -141,34 +134,34 @@ private void TransformOnRefresh() .TransformAsync(Task.FromResult, transformOnRefresh: true).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(1); items[0].Age = 10; - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(2); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(2); - results.Messages[1].First().Reason.Should().Be(ListChangeReason.Replace); + await Assert.That(results.Messages[1].First().Reason).IsEqualTo(ListChangeReason.Replace); //remove an item and check no change is fired var toRemove = items[1]; list.Remove(toRemove); - results.Data.Count.Should().Be(99); - results.Messages.Count.Should().Be(3); + await Assert.That(results.Data.Count).IsEqualTo(99); + await Assert.That(results.Messages.Count).IsEqualTo(3); toRemove.Age = 100; - results.Messages.Count.Should().Be(3); + await Assert.That(results.Messages.Count).IsEqualTo(3); //add it back in and check it updates list.Add(toRemove); - results.Messages.Count.Should().Be(4); + await Assert.That(results.Messages.Count).IsEqualTo(4); toRemove.Age = 101; - results.Messages.Count.Should().Be(5); + await Assert.That(results.Messages.Count).IsEqualTo(5); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Replace); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Replace); } - [Fact] - public void TransformAsyncCancelsTokenOnUnSubscribe() + [Test] + public async Task TransformAsyncCancelsTokenOnUnSubscribe() { using var source = new SourceList(); var tcs = new TaskCompletionSource(); @@ -185,6 +178,6 @@ public void TransformAsyncCancelsTokenOnUnSubscribe() source.Add(new Person()); sub.Dispose(); - Assert.True(tcs.Task.IsCanceled); + await Assert.That(tcs.Task.IsCanceled).IsTrue(); } } diff --git a/src/DynamicData.Tests/List/TransformFixture.cs b/src/DynamicData.Tests/List/TransformFixture.cs index 0841ae4f4..c60d1d3de 100644 --- a/src/DynamicData.Tests/List/TransformFixture.cs +++ b/src/DynamicData.Tests/List/TransformFixture.cs @@ -1,11 +1,5 @@ -using System; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; -using Xunit; - namespace DynamicData.Tests.List; public class TransformFixture : IDisposable @@ -26,43 +20,43 @@ public TransformFixture() _results = new ChangeSetAggregator(_source.Connect().Transform(_transformFactory)); } - [Fact] - public void Add() + [Test] + public async Task Add() { var person = new Person("Adult1", 50); _source.Add(person); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(person), "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(person)).Because("Should be same person"); } - [Fact] - public void BatchOfUniqueUpdates() + [Test] + public async Task BatchOfUniqueUpdates() { var people = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should return 100 adds"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should return 100 adds"); var transformed = people.Select(_transformFactory).OrderBy(p => p.Age).ToArray(); - _results.Data.Items.OrderBy(p => p.Age).Should().BeEquivalentTo(transformed, "Incorrect transform result"); + await Assert.That(_results.Data.Items.OrderBy(p => p.Age)).IsEquivalentTo(transformed).Because("Incorrect transform result"); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var people = Enumerable.Range(1, 100).Select(l => new Person("Name" + l, l)).ToArray(); _source.AddRange(people); _source.Clear(); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(100, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(100, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(100).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(100).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } public void Dispose() @@ -71,8 +65,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { const string key = "Adult1"; var person = new Person(key, 50); @@ -80,15 +74,15 @@ public void Remove() _source.Add(person); _source.Remove(person); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 80 addes"); - _results.Messages[1].Removes.Should().Be(1, "Should be 80 removes"); - _results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 80 addes"); + await Assert.That(_results.Messages[1].Removes).IsEqualTo(1).Because("Should be 80 removes"); + await Assert.That(_results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void RemoveWithoutIndex() + [Test] + public async Task RemoveWithoutIndex() { const string key = "Adult1"; var person = new Person(key, 50); @@ -98,26 +92,26 @@ public void RemoveWithoutIndex() _source.Add(person); _source.Remove(person); - results.Messages.Count.Should().Be(2, "Should be 2 updates"); - results.Messages[0].Adds.Should().Be(1, "Should be 1 addes"); - results.Messages[1].Removes.Should().Be(1, "Should be 1 removes"); - results.Data.Count.Should().Be(0, "Should be nothing cached"); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 addes"); + await Assert.That(results.Messages[1].Removes).IsEqualTo(1).Because("Should be 1 removes"); + await Assert.That(results.Data.Count).IsEqualTo(0).Because("Should be nothing cached"); } - [Fact] - public void SameKeyChanges() + [Test] + public async Task SameKeyChanges() { var people = Enumerable.Range(1, 10).Select(i => new Person("Name", i)).ToArray(); _source.AddRange(people); - _results.Messages.Count.Should().Be(1, "Should be 1 updates"); - _results.Messages[0].Adds.Should().Be(10, "Should return 10 adds"); - _results.Data.Count.Should().Be(10, "Should result in 10 records"); + await Assert.That(_results.Messages.Count).IsEqualTo(1).Because("Should be 1 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(10).Because("Should return 10 adds"); + await Assert.That(_results.Data.Count).IsEqualTo(10).Because("Should result in 10 records"); } - [Fact] - public void Update() + [Test] + public async Task Update() { const string key = "Adult1"; var newperson = new Person(key, 50); @@ -126,14 +120,13 @@ public void Update() _source.Add(newperson); _source.Add(updated); - _results.Messages.Count.Should().Be(2, "Should be 2 updates"); - _results.Messages[0].Adds.Should().Be(1, "Should be 1 adds"); - _results.Messages[0].Replaced.Should().Be(0, "Should be 1 update"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 updates"); + await Assert.That(_results.Messages[0].Adds).IsEqualTo(1).Because("Should be 1 adds"); + await Assert.That(_results.Messages[0].Replaced).IsEqualTo(0).Because("Should be 1 update"); } - - [Fact] - public void MultipleSubscribersShouldNotShareState() + [Test] + public async Task MultipleSubscribersShouldNotShareState() { _source.AddRange(new Person[] { @@ -149,8 +142,8 @@ public void MultipleSubscribersShouldNotShareState() transformed.Transform(o => o).Subscribe(); } - [Fact] - public void TransformOnRefresh() + [Test] + public async Task TransformOnRefresh() { var items = Enumerable.Range(1, 100).Select(i => new Person("Person" + i, 1)).ToArray(); @@ -160,34 +153,34 @@ public void TransformOnRefresh() .Transform(v => v, transformOnRefresh: true).AsAggregator(); list.AddRange(items); - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(1); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(1); items[0].Age = 10; - results.Data.Count.Should().Be(100); - results.Messages.Count.Should().Be(2); + await Assert.That(results.Data.Count).IsEqualTo(100); + await Assert.That(results.Messages.Count).IsEqualTo(2); - results.Messages[1].First().Reason.Should().Be(ListChangeReason.Replace); + await Assert.That(results.Messages[1].First().Reason).IsEqualTo(ListChangeReason.Replace); //remove an item and check no change is fired var toRemove = items[1]; list.Remove(toRemove); - results.Data.Count.Should().Be(99); - results.Messages.Count.Should().Be(3); + await Assert.That(results.Data.Count).IsEqualTo(99); + await Assert.That(results.Messages.Count).IsEqualTo(3); toRemove.Age = 100; - results.Messages.Count.Should().Be(3); + await Assert.That(results.Messages.Count).IsEqualTo(3); //add it back in and check it updates list.Add(toRemove); - results.Messages.Count.Should().Be(4); + await Assert.That(results.Messages.Count).IsEqualTo(4); toRemove.Age = 101; - results.Messages.Count.Should().Be(5); + await Assert.That(results.Messages.Count).IsEqualTo(5); - results.Messages.Last().First().Reason.Should().Be(ListChangeReason.Replace); + await Assert.That(results.Messages.Last().First().Reason).IsEqualTo(ListChangeReason.Replace); } - [Fact] - public void TransformOnReplace() + [Test] + public async Task TransformOnReplace() { // Arrange var person1 = new Person("Bob", 37); @@ -199,13 +192,13 @@ public void TransformOnReplace() _source.Replace(person1, person2); // Assert - _results.Messages.Count.Should().Be(2, "Should be 2 messages"); - _results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - _results.Data.Items[0].Should().Be(_transformFactory(person2), "Should be same person"); + await Assert.That(_results.Messages.Count).IsEqualTo(2).Because("Should be 2 messages"); + await Assert.That(_results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(_results.Data.Items[0]).IsEqualTo(_transformFactory(person2)).Because("Should be same person"); } - [Fact] - public void TransformOnReplaceWithoutIndex() + [Test] + public async Task TransformOnReplaceWithoutIndex() { // Arrange var person1 = new Person("Bob", 37); @@ -217,8 +210,8 @@ public void TransformOnReplaceWithoutIndex() _source.Replace(person1, person2); // Assert - results.Messages.Count.Should().Be(2, "Should be 2 messages"); - results.Data.Count.Should().Be(1, "Should be 1 item in the cache"); - results.Data.Items[0].Should().Be(_transformFactory(person2), "Should be same person"); + await Assert.That(results.Messages.Count).IsEqualTo(2).Because("Should be 2 messages"); + await Assert.That(results.Data.Count).IsEqualTo(1).Because("Should be 1 item in the cache"); + await Assert.That(results.Data.Items[0]).IsEqualTo(_transformFactory(person2)).Because("Should be same person"); } } diff --git a/src/DynamicData.Tests/List/TransformManyFixture.cs b/src/DynamicData.Tests/List/TransformManyFixture.cs index caf8bc6c7..288eb4879 100644 --- a/src/DynamicData.Tests/List/TransformManyFixture.cs +++ b/src/DynamicData.Tests/List/TransformManyFixture.cs @@ -1,13 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; - using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.List; @@ -24,8 +15,8 @@ public TransformManyFixture() _results = _source.Connect().TransformMany(p => p.Relations.RecursiveSelect(r => r.Relations)).AsAggregator(); } - [Fact] - public void Add() + [Test] + public async Task Add() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -36,12 +27,12 @@ public void Add() _source.Add(mother); - _results.Data.Count.Should().Be(4); - _results.Data.Items.Should().BeEquivalentTo(new[] { child1, child2, child3, frientofchild1}); + await Assert.That(_results.Data.Count).IsEqualTo(4); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { child1, child2, child3, frientofchild1 }); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -60,12 +51,12 @@ public void AddRange() var anotherRelative2 = new PersonWithRelations("Another2", 2, new[] { child6, child7 }); _source.AddRange(new[] { anotherRelative1, anotherRelative2 }); - _results.Data.Count.Should().Be(8); - _results.Data.Items.Should().BeEquivalentTo(new[] { child1, child2, child3, frientofchild1, child4, child5, child6, child7}); + await Assert.That(_results.Data.Count).IsEqualTo(8); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { child1, child2, child3, frientofchild1, child4, child5, child6, child7 }); } - [Fact] - public void Clear() + [Test] + public async Task Clear() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -82,7 +73,7 @@ public void Clear() _source.AddRange(new[] { mother, anotherRelative1, anotherRelative2 }); _source.Clear(); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } public void Dispose() @@ -91,10 +82,10 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void Move() + [Test] + public async Task Move() { - //Move should have no effect + //Move should have no effect var child4 = new PersonWithRelations("Child4", 1); var child5 = new PersonWithRelations("Child5", 2); @@ -105,13 +96,13 @@ public void Move() _source.AddRange(new[] { anotherRelative1, anotherRelative2 }); - _results.Messages.Count.Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); _source.Move(1, 0); - _results.Messages.Count.Should().Be(1); + await Assert.That(_results.Messages.Count).IsEqualTo(1); } - [Fact] - public void Remove() + [Test] + public async Task Remove() { var tourProviders = new SourceList(); @@ -128,20 +119,20 @@ public void Remove() tourProviders.AddRange(new[] { tp1, tp2, tp3 }); - allTours.Items.Should().BeEquivalentTo(new[] { tour1_1, tour2_1, tour2_2}); + await Assert.That(allTours.Items).IsEquivalentTo(new[] { tour1_1, tour2_1, tour2_2 }); tp3.Tours.Add(tour3_1); - allTours.Items.Should().BeEquivalentTo(new[] { tour1_1, tour2_1, tour2_2, tour3_1}); + await Assert.That(allTours.Items).IsEquivalentTo(new[] { tour1_1, tour2_1, tour2_2, tour3_1 }); tp2.Tours.Remove(tour2_1); - allTours.Items.Should().BeEquivalentTo(new[] { tour1_1, tour2_2, tour3_1}); + await Assert.That(allTours.Items).IsEquivalentTo(new[] { tour1_1, tour2_2, tour3_1 }); tp2.Tours.Add(tour2_1); - allTours.Items.Should().BeEquivalentTo(new[] { tour1_1, tour2_1, tour2_2, tour3_1}); + await Assert.That(allTours.Items).IsEquivalentTo(new[] { tour1_1, tour2_1, tour2_2, tour3_1 }); } - [Fact] - public void RemoveParent() + [Test] + public async Task RemoveParent() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -151,11 +142,11 @@ public void RemoveParent() _source.Add(mother); _source.Remove(mother); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void RemoveRange() + [Test] + public async Task RemoveRange() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -172,12 +163,12 @@ public void RemoveRange() _source.AddRange(new[] { mother, anotherRelative1, anotherRelative2 }); _source.RemoveRange(0, 2); - _results.Data.Count.Should().Be(2); - _results.Data.Items.Should().BeEquivalentTo(new[] { child6, child7}); + await Assert.That(_results.Data.Count).IsEqualTo(2); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { child6, child7 }); } - [Fact] - public void Replace() + [Test] + public async Task Replace() { var frientofchild1 = new PersonWithRelations("Friend1", 10); var child1 = new PersonWithRelations("Child1", 10, new[] { frientofchild1 }); @@ -192,8 +183,8 @@ public void Replace() _source.Replace(mother, updatedMother); - _results.Data.Count.Should().Be(4); - _results.Data.Items.Should().BeEquivalentTo(new[] { child1, child2, frientofchild1, child4}); + await Assert.That(_results.Data.Count).IsEqualTo(4); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { child1, child2, frientofchild1, child4 }); } public class Tour(string name) diff --git a/src/DynamicData.Tests/List/TransformManyObservableCollectionFixture.cs b/src/DynamicData.Tests/List/TransformManyObservableCollectionFixture.cs index f713c1ee9..48957d1df 100644 --- a/src/DynamicData.Tests/List/TransformManyObservableCollectionFixture.cs +++ b/src/DynamicData.Tests/List/TransformManyObservableCollectionFixture.cs @@ -1,19 +1,11 @@ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class TransformManyObservableCollectionFixture { - [Fact] - public void FlattenObservableCollection() + [Test] + public async Task FlattenObservableCollection() { var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); @@ -37,35 +29,35 @@ public void FlattenObservableCollection() using var aggregator = source.Connect().TransformMany(p => p.Children).AsAggregator(); source.AddRange(parents); - aggregator.Data.Count.Should().Be(100); + await Assert.That(aggregator.Data.Count).IsEqualTo(100); //add a child to an observable collection and check the new item is added parents[0].Children.Add(new Person("NewlyAddded", 100)); - aggregator.Data.Count.Should().Be(101); + await Assert.That(aggregator.Data.Count).IsEqualTo(101); ////remove first parent and check children have gone source.RemoveAt(0); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //check items can be cleared and then added back in var childrenInZero = parents[1].Children.ToArray(); parents[1].Children.Clear(); - aggregator.Data.Count.Should().Be(96); + await Assert.That(aggregator.Data.Count).IsEqualTo(96); parents[1].Children.AddRange(childrenInZero); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //replace produces an update var replacedChild = parents[1].Children[0]; var replacement = new Person("Replacement", 100); parents[1].Children[0] = replacement; - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); - aggregator.Data.Items.Contains(replacement).Should().BeTrue(); - aggregator.Data.Items.Contains(replacedChild).Should().BeFalse(); + await Assert.That(aggregator.Data.Items.Contains(replacement)).IsTrue(); + await Assert.That(aggregator.Data.Items.Contains(replacedChild)).IsFalse(); } - [Fact] - public void FlattenObservableList() + [Test] + public async Task FlattenObservableList() { var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); @@ -91,36 +83,36 @@ public void FlattenObservableList() source.AddRange(parents); - aggregator.Data.Count.Should().Be(100); + await Assert.That(aggregator.Data.Count).IsEqualTo(100); //add a child to an observable collection and check the new item is added parents[0].Children.Add(new Person("NewlyAddded", 100)); - aggregator.Data.Count.Should().Be(101); + await Assert.That(aggregator.Data.Count).IsEqualTo(101); ////remove first parent and check children have gone source.RemoveAt(0); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //check items can be cleared and then added back in var childrenInZero = parents[1].Children.Items.ToArray(); parents[1].Children.Clear(); - aggregator.Data.Count.Should().Be(96); + await Assert.That(aggregator.Data.Count).IsEqualTo(96); parents[1].Children.AddRange(childrenInZero); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //replace produces an update var replacedChild = at(parents[1].Children.Items, 0); var replacement = new Person("Replacement", 100); parents[1].Children.ReplaceAt(0, replacement); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //replace produces an update - aggregator.Data.Items.Contains(replacement).Should().BeTrue(); - aggregator.Data.Items.Contains(replacedChild).Should().BeFalse(); + await Assert.That(aggregator.Data.Items.Contains(replacement)).IsTrue(); + await Assert.That(aggregator.Data.Items.Contains(replacedChild)).IsFalse(); } - [Fact] - public void FlattenReadOnlyObservableCollection() + [Test] + public async Task FlattenReadOnlyObservableCollection() { var children = Enumerable.Range(1, 100).Select(i => new Person("Name" + i, i)).ToArray(); @@ -144,36 +136,36 @@ public void FlattenReadOnlyObservableCollection() using var aggregator = source.Connect().TransformMany(p => p.ChildrenReadonly).AsAggregator(); source.AddRange(parents); - aggregator.Data.Count.Should().Be(100); + await Assert.That(aggregator.Data.Count).IsEqualTo(100); //add a child to an observable collection and check the new item is added parents[0].Children.Add(new Person("NewlyAddded", 100)); - aggregator.Data.Count.Should().Be(101); + await Assert.That(aggregator.Data.Count).IsEqualTo(101); ////remove first parent and check children have gone source.RemoveAt(0); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //check items can be cleared and then added back in var childrenInZero = parents[1].Children.ToArray(); parents[1].Children.Clear(); - aggregator.Data.Count.Should().Be(96); + await Assert.That(aggregator.Data.Count).IsEqualTo(96); parents[1].Children.AddRange(childrenInZero); - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //replace produces an update var replacedChild = parents[1].Children[0]; var replacement = new Person("Replacement", 100); parents[1].Children[0] = replacement; - aggregator.Data.Count.Should().Be(98); + await Assert.That(aggregator.Data.Count).IsEqualTo(98); //replace produces an update - aggregator.Data.Items.Contains(replacement).Should().BeTrue(); - aggregator.Data.Items.Contains(replacedChild).Should().BeFalse(); + await Assert.That(aggregator.Data.Items.Contains(replacement)).IsTrue(); + await Assert.That(aggregator.Data.Items.Contains(replacedChild)).IsFalse(); } - [Fact] - public void ObservableCollectionWithoutInitialData() + [Test] + public async Task ObservableCollectionWithoutInitialData() { using var parents = new SourceList(); var collection = parents.Connect().TransformMany(d => d.Children).AsObservableList(); @@ -181,17 +173,17 @@ public void ObservableCollectionWithoutInitialData() var parent = new Parent(); parents.Add(parent); - collection.Count.Should().Be(0); + await Assert.That(collection.Count).IsEqualTo(0); parent.Children.Add(new Person("child1", 1)); - collection.Count.Should().Be(1); + await Assert.That(collection.Count).IsEqualTo(1); parent.Children.Add(new Person("child2", 2)); - collection.Count.Should().Be(2); + await Assert.That(collection.Count).IsEqualTo(2); } - [Fact] - public void ObservableListWithoutInitialData() + [Test] + public async Task ObservableListWithoutInitialData() { using var parents = new SourceList(); var collection = parents.Connect().TransformMany(d => d.ChildrenObservable).AsObservableList(); @@ -199,17 +191,17 @@ public void ObservableListWithoutInitialData() var parent = new ParentDynamic(); parents.Add(parent); - collection.Count.Should().Be(0); + await Assert.That(collection.Count).IsEqualTo(0); parent.Children.Add(new Person("child1", 1)); - collection.Count.Should().Be(1); + await Assert.That(collection.Count).IsEqualTo(1); parent.Children.Add(new Person("child2", 2)); - collection.Count.Should().Be(2); + await Assert.That(collection.Count).IsEqualTo(2); } - [Fact] - public void ReadOnlyObservableCollectionWithoutInitialData() + [Test] + public async Task ReadOnlyObservableCollectionWithoutInitialData() { using var parents = new SourceList(); var collection = parents.Connect().TransformMany(d => d.ChildrenReadonly).AsObservableList(); @@ -217,13 +209,13 @@ public void ReadOnlyObservableCollectionWithoutInitialData() var parent = new Parent(); parents.Add(parent); - collection.Count.Should().Be(0); + await Assert.That(collection.Count).IsEqualTo(0); parent.Children.Add(new Person("child1", 1)); - collection.Count.Should().Be(1); + await Assert.That(collection.Count).IsEqualTo(1); parent.Children.Add(new Person("child2", 2)); - collection.Count.Should().Be(2); + await Assert.That(collection.Count).IsEqualTo(2); } private class Parent diff --git a/src/DynamicData.Tests/List/TransformManyProjectionFixture.cs b/src/DynamicData.Tests/List/TransformManyProjectionFixture.cs index 49c34de51..a08d0bf03 100644 --- a/src/DynamicData.Tests/List/TransformManyProjectionFixture.cs +++ b/src/DynamicData.Tests/List/TransformManyProjectionFixture.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; - +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; - -using FluentAssertions; - -using Xunit; +#endif namespace DynamicData.Tests.List; @@ -24,8 +19,8 @@ public TransformManyProjectionFixture() _results = _source.Connect().AutoRefreshOnObservable(self => self.Children.ToObservableChangeSet()).TransformMany(parent => parent.Children.Select(c => new ProjectedNestedChild(parent, c)), new ProjectNestedChildEqualityComparer()).AsObservableList(); } - [Fact] - public void AddRange() + [Test] + public async Task AddRange() { var children = new[] { @@ -46,8 +41,8 @@ public void AddRange() _source.AddRange(parents); - _results.Count.Should().Be(5); - _results.Items.Should().BeEquivalentTo(parents.SelectMany(p => p.Children.Take(5).Select(c => new ProjectedNestedChild(p, c)))); + await Assert.That(_results.Count).IsEqualTo(5); + await Assert.That(_results.Items).IsEquivalentTo(parents.SelectMany(p => p.Children.Take(5).Select(c => new ProjectedNestedChild(p, c)))); } public void Dispose() @@ -56,8 +51,8 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void RemoveChild() + [Test] + public async Task RemoveChild() { var children = new[] { @@ -80,12 +75,12 @@ public void RemoveChild() //remove a child parents[1].Children.Remove(children[3]); - _results.Count.Should().Be(4); - _results.Items.Should().BeEquivalentTo(parents.SelectMany(p => p.Children.Where(child => child.Name != "D").Select(c => new ProjectedNestedChild(p, c)))); + await Assert.That(_results.Count).IsEqualTo(4); + await Assert.That(_results.Items).IsEquivalentTo(parents.SelectMany(p => p.Children.Where(child => child.Name != "D").Select(c => new ProjectedNestedChild(p, c)))); } - [Fact] - public void RemoveParent() + [Test] + public async Task RemoveParent() { var children = new[] { @@ -108,8 +103,8 @@ public void RemoveParent() //remove a parent and check children have moved _source.Remove(parents[0]); - _results.Count.Should().Be(3); - _results.Items.Should().BeEquivalentTo(parents.Skip(1).SelectMany(p => p.Children.Select(c => new ProjectedNestedChild(p, c)))); + await Assert.That(_results.Count).IsEqualTo(3); + await Assert.That(_results.Items).IsEquivalentTo(parents.Skip(1).SelectMany(p => p.Children.Select(c => new ProjectedNestedChild(p, c)))); } private class ClassWithNestedObservableCollection(int id, IEnumerable animals) diff --git a/src/DynamicData.Tests/List/TransformManyRefreshFixture.cs b/src/DynamicData.Tests/List/TransformManyRefreshFixture.cs index f77aa95eb..1f64b4082 100644 --- a/src/DynamicData.Tests/List/TransformManyRefreshFixture.cs +++ b/src/DynamicData.Tests/List/TransformManyRefreshFixture.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; - using DynamicData.Tests.Domain; -using DynamicData.Tests.Utilities; - -using FluentAssertions; - -using Xunit; namespace DynamicData.Tests.List; @@ -23,8 +15,8 @@ public TransformManyRefreshFixture() _results = _source.Connect().AutoRefresh().TransformMany(p => p.Friends.RecursiveSelect(r => r.Friends)).AsAggregator(); } - [Fact] - public void AutoRefresh() + [Test] + public async Task AutoRefresh() { var friend1 = new PersonWithFriends("Friend1", 40); var friend2 = new PersonWithFriends("Friend2", 45); @@ -34,12 +26,12 @@ public void AutoRefresh() person.Friends = new[] { friend1, friend2 }; - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Items.Should().BeEquivalentTo(new[] { friend1, friend2}); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { friend1, friend2 }); } - [Fact] - public void AutoRefreshOnOtherProperty() + [Test] + public async Task AutoRefreshOnOtherProperty() { var friend1 = new PersonWithFriends("Friend1", 40); var friend2 = new PersonWithFriends("Friend2", 45); @@ -50,12 +42,12 @@ public void AutoRefreshOnOtherProperty() friends.Add(friend2); person.Age = 55; - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Items.Should().BeEquivalentTo(new[] { friend1, friend2}); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { friend1, friend2 }); } - [Fact] - public void AutoRefreshRecursive() + [Test] + public async Task AutoRefreshRecursive() { var friend1 = new PersonWithFriends("Friend1", 30); var friend2 = new PersonWithFriends("Friend2", 35); @@ -67,8 +59,8 @@ public void AutoRefreshRecursive() person.Friends = new[] { friend4 }; - _results.Data.Count.Should().Be(2, "Should be 2 in the cache"); - _results.Data.Items.Should().BeEquivalentTo(new[] { friend4, friend2}); + await Assert.That(_results.Data.Count).IsEqualTo(2).Because("Should be 2 in the cache"); + await Assert.That(_results.Data.Items).IsEquivalentTo(new[] { friend4, friend2 }); } public void Dispose() diff --git a/src/DynamicData.Tests/List/VirtualisationFixture.cs b/src/DynamicData.Tests/List/VirtualisationFixture.cs index 66f681bff..5d3d37799 100644 --- a/src/DynamicData.Tests/List/VirtualisationFixture.cs +++ b/src/DynamicData.Tests/List/VirtualisationFixture.cs @@ -1,21 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Subjects; - using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; public class VirtualisationFixture : IDisposable { private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _requestSubject = new BehaviorSubject(new VirtualRequest(0, 25)); + private readonly ReactiveUI.Primitives.Signals.ISignal _requestSubject = new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 25)); private readonly ChangeSetAggregator _results; @@ -31,10 +22,11 @@ public void Dispose() { _source.Dispose(); _results.Dispose(); + _requestSubject.Dispose(); } - [Fact] - public void InsertAfterPageProducesNothing() + [Test] + public async Task InsertAfterPageProducesNothing() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -42,11 +34,11 @@ public void InsertAfterPageProducesNothing() var expected = people.Take(25).ToArray(); _source.InsertRange(_generator.Take(100), 50); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); } - [Fact] - public void InsertInPageReflectsChange() + [Test] + public async Task InsertInPageReflectsChange() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -57,24 +49,24 @@ public void InsertInPageReflectsChange() var message = _results.Messages[1].ElementAt(0); var removedPerson = people.ElementAt(24); - _results.Data.Items.ElementAt(10).Should().Be(newPerson); - message.Item.Current.Should().Be(removedPerson); - message.Reason.Should().Be(ListChangeReason.Remove); + await Assert.That(_results.Data.Items.ElementAt(10)).IsEqualTo(newPerson); + await Assert.That(message.Item.Current).IsEqualTo(removedPerson); + await Assert.That(message.Reason).IsEqualTo(ListChangeReason.Remove); } - [Fact] - public void MoveToNextPage() + [Test] + public async Task MoveToNextPage() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); _requestSubject.OnNext(new VirtualRequest(25, 25)); var expected = people.Skip(25).Take(25).ToArray(); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); } - [Fact] - public void MoveWithinSamePage() + [Test] + public async Task MoveWithinSamePage() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -82,11 +74,11 @@ public void MoveWithinSamePage() _source.Move(0, 10); var actualPersonAtIndex10 = _results.Data.Items.ElementAt(10); - actualPersonAtIndex10.Should().Be(personToMove); + await Assert.That(actualPersonAtIndex10).IsEqualTo(personToMove); } - [Fact] - public void MoveWithinSamePage2() + [Test] + public async Task MoveWithinSamePage2() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -94,11 +86,11 @@ public void MoveWithinSamePage2() _source.Move(10, 0); var actualPersonAtIndex0 = _results.Data.Items.ElementAt(0); - actualPersonAtIndex0.Should().Be(personToMove); + await Assert.That(actualPersonAtIndex0).IsEqualTo(personToMove); } - [Fact] - public void RemoveBeforeShiftsPage() + [Test] + public async Task RemoveBeforeShiftsPage() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); @@ -106,33 +98,32 @@ public void RemoveBeforeShiftsPage() _source.RemoveAt(0); var expected = people.Skip(26).Take(25).ToArray(); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); var removedMessage = _results.Messages[2].ElementAt(0); var removedPerson = people.ElementAt(25); - removedMessage.Item.Current.Should().Be(removedPerson); - removedMessage.Reason.Should().Be(ListChangeReason.Remove); + await Assert.That(removedMessage.Item.Current).IsEqualTo(removedPerson); + await Assert.That(removedMessage.Reason).IsEqualTo(ListChangeReason.Remove); var addedMessage = _results.Messages[2].ElementAt(1); var addedPerson = people.ElementAt(50); - addedMessage.Item.Current.Should().Be(addedPerson); - addedMessage.Reason.Should().Be(ListChangeReason.Add); + await Assert.That(addedMessage.Item.Current).IsEqualTo(addedPerson); + await Assert.That(addedMessage.Reason).IsEqualTo(ListChangeReason.Add); } - [Fact] - public void VirtualiseInitial() + [Test] + public async Task VirtualiseInitial() { var people = _generator.Take(100).ToArray(); _source.AddRange(people); var expected = people.Take(25).ToArray(); - _results.Data.Items.Should().BeEquivalentTo(expected); + await Assert.That(_results.Data.Items).IsEquivalentTo(expected); } - - [Fact] - public void DoesNotThrowWithDuplicates() + [Test] + public async Task DoesNotThrowWithDuplicates() { // see https://github.com/reactivemarbles/DynamicData/issues/540 @@ -141,10 +132,10 @@ public void DoesNotThrowWithDuplicates() var source = new SourceList(); source.AddRange(Enumerable.Repeat("item", 10)); source.Connect() - .Virtualise(new BehaviorSubject(new VirtualRequest(0, 3))) + .Virtualise(new ReactiveUI.Primitives.Signals.StateSignal(new VirtualRequest(0, 3))) .Clone(result) .Subscribe(); - result.Count.Should().Be(1); + await Assert.That(result.Count).IsEqualTo(1); } } diff --git a/src/DynamicData.Tests/List/XOrFixture.cs b/src/DynamicData.Tests/List/XOrFixture.cs index 8f66b0d20..c1732b7f7 100644 --- a/src/DynamicData.Tests/List/XOrFixture.cs +++ b/src/DynamicData.Tests/List/XOrFixture.cs @@ -1,18 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests.List; +[InheritsTests] public class XOrFixture : XOrFixtureBase { protected override IObservable> CreateObservable() => _source1.Connect().Xor(_source2.Connect()); } +[InheritsTests] public class XOrCollectionFixture : XOrFixtureBase { protected override IObservable> CreateObservable() @@ -38,23 +32,23 @@ protected XOrFixtureBase() _results = CreateObservable().AsAggregator(); } - [Fact] - public void ClearOnlyClearsOneSource() + [Test] + public async Task ClearOnlyClearsOneSource() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); _source1.Clear(); - _results.Data.Count.Should().Be(5); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(6, 5)); + await Assert.That(_results.Data.Count).IsEqualTo(5); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(6, 5)); } - [Fact] - public void CombineRange() + [Test] + public async Task CombineRange() { _source1.AddRange(Enumerable.Range(1, 5)); _source2.AddRange(Enumerable.Range(6, 5)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 10)); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 10)); } public void Dispose() @@ -64,47 +58,47 @@ public void Dispose() _results.Dispose(); } - [Fact] - public void IncludedWhenItemIsInOneSource() + [Test] + public async Task IncludedWhenItemIsInOneSource() { _source1.Add(1); - _results.Data.Count.Should().Be(1); - _results.Data.Items[0].Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); + await Assert.That(_results.Data.Items[0]).IsEqualTo(1); } - [Fact] - public void NotIncludedWhenItemIsInTwoSources() + [Test] + public async Task NotIncludedWhenItemIsInTwoSources() { _source1.Add(1); _source2.Add(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } - [Fact] - public void OverlappingRangeExludesInteresct() + [Test] + public async Task OverlappingRangeExludesInteresct() { _source1.AddRange(Enumerable.Range(1, 10)); _source2.AddRange(Enumerable.Range(6, 10)); - _results.Data.Count.Should().Be(10); - _results.Data.Items.Should().BeEquivalentTo(Enumerable.Range(1, 5).Union(Enumerable.Range(11, 5))); + await Assert.That(_results.Data.Count).IsEqualTo(10); + await Assert.That(_results.Data.Items).IsEquivalentTo(Enumerable.Range(1, 5).Union(Enumerable.Range(11, 5))); } - [Fact] - public void RemovedWhenNoLongerInBoth() + [Test] + public async Task RemovedWhenNoLongerInBoth() { _source1.Add(1); _source2.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(1); + await Assert.That(_results.Data.Count).IsEqualTo(1); } - [Fact] - public void RemovedWhenNoLongerInEither() + [Test] + public async Task RemovedWhenNoLongerInEither() { _source1.Add(1); _source1.Remove(1); - _results.Data.Count.Should().Be(0); + await Assert.That(_results.Data.Count).IsEqualTo(0); } protected abstract IObservable> CreateObservable(); diff --git a/src/DynamicData.Tests/NumericAndValueBoundaryCoverageFixture.cs b/src/DynamicData.Tests/NumericAndValueBoundaryCoverageFixture.cs new file mode 100644 index 000000000..badebbb23 --- /dev/null +++ b/src/DynamicData.Tests/NumericAndValueBoundaryCoverageFixture.cs @@ -0,0 +1,288 @@ +using System.Collections; + +#if REACTIVE_TESTS +using DynamicData.Reactive.Aggregation; +using DynamicData.Reactive.Diagnostics; +using DynamicData.Reactive.Kernel; +using RxUnit = System.Reactive.Unit; +#else +using DynamicData.Aggregation; +using DynamicData.Diagnostics; +using DynamicData.Kernel; +using RxUnit = ReactiveUI.Primitives.RxVoid; +#endif + +namespace DynamicData.Tests; + +public sealed class NumericAndValueBoundaryCoverageFixture +{ + [Test] + public async Task ListNumericAggregatesEmitExactBoundaryValues() + { + using var source = new SourceList(); + + var averageInt = new List(); + var averageNullableInt = new List(); + var averageLong = new List(); + var averageNullableLong = new List(); + var averageDouble = new List(); + var averageNullableDouble = new List(); + var averageDecimal = new List(); + var averageNullableDecimal = new List(); + var averageFloat = new List(); + var averageNullableFloat = new List(); + var counts = new List(); + var empty = new List(); + var notEmpty = new List(); + var accumulated = new List(); + + using var subscriptions = new CompositeDisposable( + source.Connect().Avg(item => item.IntValue, -1).Subscribe(averageInt.Add), + source.Connect().Avg(item => item.NullableIntValue, -2).Subscribe(averageNullableInt.Add), + source.Connect().Avg(item => item.LongValue, -3L).Subscribe(averageLong.Add), + source.Connect().Avg(item => item.NullableLongValue, -4L).Subscribe(averageNullableLong.Add), + source.Connect().Avg(item => item.DoubleValue, -5D).Subscribe(averageDouble.Add), + source.Connect().Avg(item => item.NullableDoubleValue, -6D).Subscribe(averageNullableDouble.Add), + source.Connect().Avg(item => item.DecimalValue, -7M).Subscribe(averageDecimal.Add), + source.Connect().Avg(item => item.NullableDecimalValue, -8M).Subscribe(averageNullableDecimal.Add), + source.Connect().Avg(item => item.FloatValue, -9F).Subscribe(averageFloat.Add), + source.Connect().Avg(item => item.NullableFloatValue, -10F).Subscribe(averageNullableFloat.Add), + CountEx.Count(source.Connect()).Subscribe(counts.Add), + CountEx.IsEmpty(source.Connect()).Subscribe(empty.Add), + CountEx.IsNotEmpty(source.Connect()).Subscribe(notEmpty.Add), + source.Connect().Accumulate(0, item => item.IntValue, (current, value) => current + value, (current, value) => current - value).Subscribe(accumulated.Add)); + + source.AddRange( + new[] + { + new NumericSample("A", 2, 4L, 6D, 8M, 10F, 1), + new NumericSample("B", 4, 8L, 10D, 12M, 14F, 2, UseNullNullableValues: true) + }); + source.Clear(); + + await Assert.That(averageInt).IsEquivalentTo(new[] { 3D, -1D }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageNullableInt).IsEquivalentTo(new[] { 1D, -2D }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageLong).IsEquivalentTo(new[] { 6D, -3D }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageNullableLong).IsEquivalentTo(new[] { 2D, -4D }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageDouble).IsEquivalentTo(new[] { 8D, -5D }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageNullableDouble).IsEquivalentTo(new[] { 3D, -6D }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageDecimal).IsEquivalentTo(new[] { 10M, -7M }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageNullableDecimal).IsEquivalentTo(new[] { 4M, -8M }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageFloat).IsEquivalentTo(new[] { 12F, -9F }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(averageNullableFloat).IsEquivalentTo(new[] { 5F, -10F }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(counts).IsEquivalentTo(new[] { 2, 0 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(empty).IsEquivalentTo(new[] { true, false, true }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notEmpty).IsEquivalentTo(new[] { false, true, false }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(accumulated).IsEquivalentTo(new[] { 6, 0 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task ListMaximumAndMinimumResetWhenCurrentBoundaryIsRemoved() + { + using var source = new SourceList(); + + var maximum = new List(); + var minimum = new List(); + + using var subscriptions = new CompositeDisposable( + source.Connect().Maximum(item => item.IntValue, 99).Subscribe(maximum.Add), + source.Connect().Minimum(item => item.IntValue, -99).Subscribe(minimum.Add)); + + var two = new NumericSample("Two", 2, 2, 2, 2, 2, 1); + var five = new NumericSample("Five", 5, 5, 5, 5, 5, 1); + var three = new NumericSample("Three", 3, 3, 3, 3, 3, 1); + + source.Add(two); + source.Add(five); + source.Add(three); + source.Remove(five); + source.Clear(); + + await Assert.That(maximum).IsEquivalentTo(new[] { 2, 5, 3, 99 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(minimum).IsEquivalentTo(new[] { 2, -99 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task CacheCountDistinctCountAndAggregationReflectUpdatesAndRemoves() + { + using var source = new SourceCache(item => item.Key); + + var counts = new List(); + var empty = new List(); + var notEmpty = new List(); + var distinctCounts = new List(); + var accumulated = new List(); + var aggregateEvents = new List>(); + + using var subscriptions = new CompositeDisposable( + CountEx.Count(source.Connect()).Subscribe(counts.Add), + CountEx.IsEmpty(source.Connect()).Subscribe(empty.Add), + CountEx.IsNotEmpty(source.Connect()).Subscribe(notEmpty.Add), + CountEx.Count(source.Connect().DistinctValues(item => item.Group)).Subscribe(distinctCounts.Add), + source.Connect().Accumulate(0, item => item.IntValue, (current, value) => current + value, (current, value) => current - value).Subscribe(accumulated.Add), + source.Connect().ForAggregation().Subscribe(changes => aggregateEvents.AddRange(changes))); + + var first = new NumericSample("A", 10, 10, 10, 10, 10, 1); + var second = new NumericSample("B", 20, 20, 20, 20, 20, 1); + var updatedFirst = new NumericSample("A", 11, 11, 11, 11, 11, 2); + + source.AddOrUpdate(first); + source.AddOrUpdate(second); + source.AddOrUpdate(updatedFirst); + source.Remove("B"); + + await Assert.That(counts).IsEquivalentTo(new[] { 1, 2, 2, 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(empty).IsEquivalentTo(new[] { true, false, false, false, false }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(notEmpty).IsEquivalentTo(new[] { false, true, true, true, true }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(distinctCounts).IsEquivalentTo(new[] { 1, 2, 1 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(accumulated).IsEquivalentTo(new[] { 10, 30, 31, 11 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(aggregateEvents.Select(item => item.Type).ToArray()) + .IsEquivalentTo(new[] { AggregateType.Add, AggregateType.Add, AggregateType.Remove, AggregateType.Add, AggregateType.Remove }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(aggregateEvents.Select(item => item.Item.IntValue).ToArray()).IsEquivalentTo(new[] { 10, 20, 10, 11, 20 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task InvalidateWhenResubscribesAndSuppressesUnchangedValues() + { + using var invalidate = new ReactiveUI.Primitives.Signals.Signal(); + using var genericInvalidate = new ReactiveUI.Primitives.Signals.Signal(); + + var unitValues = new List(); + var genericValues = new List(); + var unitSubscriptions = 0; + var genericSubscriptions = 0; + + using var subscriptions = new CompositeDisposable( + Observable.Defer(() => Observable.Return(++unitSubscriptions)).InvalidateWhen(invalidate).Subscribe(unitValues.Add), + Observable.Defer(() => Observable.Return(++genericSubscriptions)).InvalidateWhen(genericInvalidate).Subscribe(genericValues.Add)); + + invalidate.OnNext(default); + invalidate.OnNext(default); + genericInvalidate.OnNext("first"); + genericInvalidate.OnNext(null); + + await Assert.That(unitValues).IsEquivalentTo(new[] { 1, 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(genericValues).IsEquivalentTo(new[] { 1, 2, 3 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task DiagnosticsValueObjectsCompareHashAndFormatTheirCounts() + { + var latest = new ChangeStatistics(Index: 3, Adds: 4, Updates: 5, Removes: 6, Refreshes: 7, Moves: 8, Count: 9); + var overall = new ChangeStatistics(Index: 3, Adds: 10, Updates: 11, Removes: 12, Refreshes: 13, Moves: 14, Count: 15); + var summary = new ChangeSummary(index: 3, latest, overall); + var same = new ChangeSummary(index: 3, latest, overall); + var different = new ChangeSummary(index: 4, latest, overall); + + await Assert.That(summary.Equals(null)).IsFalse(); + await Assert.That(summary.Equals(summary)).IsTrue(); + await Assert.That(summary.Equals(new object())).IsFalse(); + await Assert.That(summary.Equals(same)).IsTrue(); + await Assert.That(summary.Equals(different)).IsFalse(); + await Assert.That(summary.GetHashCode()).IsEqualTo(same.GetHashCode()); + await Assert.That(summary.ToString()).IsEqualTo("CurrentIndex: 3, Latest Count: 9, Overall Count: 15"); + await Assert.That(latest.GetHashCode()).IsNotEqualTo(0); + await Assert.That(latest.ToString()).Contains("CurrentIndex: 3, Adds: 4, Updates: 5, Removes: 6, Refreshes: 7, Count: 9, Timestamp:"); + } + + [Test] + public async Task OptionHelpersExposePresentMissingAndThrowingBoundaries() + { + var values = new[] { "one", "two" }; + var matched = values.FirstOrOptional(value => value.StartsWith("t", StringComparison.Ordinal)); + var missing = values.FirstOrOptional(value => value.StartsWith("z", StringComparison.Ordinal)); + ReactiveUI.Primitives.Optional? nullableNone = ReactiveUI.Primitives.Optional.None; + ReactiveUI.Primitives.Optional? nullableSome = ReactiveUI.Primitives.Optional.Some("present"); + + var noneActionCalled = false; + var someActionValue = string.Empty; + nullableNone.IfHasValue(_ => noneActionCalled = true); + nullableSome.IfHasValue(value => someActionValue = value); + + await Assert.That(matched.HasValue).IsTrue(); + await Assert.That(matched.Value).IsEqualTo("two"); + await Assert.That(missing.HasValue).IsFalse(); + await Assert.That(noneActionCalled).IsFalse(); + await Assert.That(someActionValue).IsEqualTo("present"); + await Assert.That(() => ((IEnumerable?)null)!.FirstOrOptional(value => value.Length > 0)).Throws(); + await Assert.That(() => values.FirstOrOptional(null!)).Throws(); + await Assert.That(() => ReactiveUI.Primitives.Optional.None.ValueOrThrow(() => new InvalidOperationException("missing"))).Throws(); + } + + [Test] + public async Task EnumerableIListForwardsListArrayAndChangeSetBoundaries() + { + EnumerableIList fromList = new List { 1, 2 }; + EnumerableIList fromArray = new[] { 3, 4 }; + var empty = EnumerableIList.Empty; + var copy = new int[2]; + var nonGenericItems = new List(); + var genericItems = new List(); + var changeSet = new ChangeSet { new(ChangeReason.Add, "A", new NumericSample("A", 1, 1, 1, 1, 1, 1)) }; + var changeSetList = EnumerableIList.Create((IChangeSet)changeSet); + + fromList[0] = 5; + fromList.CopyTo(copy, 0); + foreach (var item in (IEnumerable)fromList) + { + nonGenericItems.Add((int)item); + } + + foreach (var item in (IEnumerable)fromList) + { + genericItems.Add(item); + } + + await Assert.That(empty.Equals(default(EnumerableIList))).IsTrue(); + await Assert.That(fromList.IsReadOnly).IsFalse(); + await Assert.That(fromList.Contains(5)).IsTrue(); + await Assert.That(copy).IsEquivalentTo(new[] { 5, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(nonGenericItems).IsEquivalentTo(new[] { 5, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(genericItems).IsEquivalentTo(new[] { 5, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(fromArray.IsReadOnly).IsTrue(); + await Assert.That(fromArray[1]).IsEqualTo(4); + await Assert.That(changeSetList.Count).IsEqualTo(1); + await Assert.That(changeSetList[0].Current.Key).IsEqualTo("A"); + } + + [Test] + public async Task SmallValueStructsHashAndFormatNullAndNonNullValues() + { + var aggregateWithNull = new AggregateItem(AggregateType.Add, null); + var aggregateWithValue = new AggregateItem(AggregateType.Remove, "value"); + var indexedWithNull = new ItemWithIndex(null, 4); + var indexedWithValue = new ItemWithIndex("item", 5); + var valuedWithNulls = new ItemWithValue(null, null); + var valuedWithValues = new ItemWithValue("item", 6); + + await Assert.That(aggregateWithNull.GetHashCode()).IsNotEqualTo(aggregateWithValue.GetHashCode()); + await Assert.That(indexedWithNull.GetHashCode()).IsEqualTo(0); + await Assert.That(indexedWithNull.ToString()).IsEqualTo(" (4)"); + await Assert.That(indexedWithValue.GetHashCode()).IsEqualTo(EqualityComparer.Default.GetHashCode("item")); + await Assert.That(indexedWithValue.ToString()).IsEqualTo("item (5)"); + await Assert.That(valuedWithNulls.GetHashCode()).IsEqualTo(0); + await Assert.That(valuedWithNulls.ToString()).IsEqualTo(" ()"); + await Assert.That(valuedWithValues.ToString()).IsEqualTo("item (6)"); + } + + private sealed record NumericSample( + string Key, + int IntValue, + long LongValue, + double DoubleValue, + decimal DecimalValue, + float FloatValue, + int Group, + bool UseNullNullableValues = false) + { + public int? NullableIntValue => UseNullNullableValues ? null : IntValue; + + public long? NullableLongValue => UseNullNullableValues ? null : LongValue; + + public double? NullableDoubleValue => UseNullNullableValues ? null : DoubleValue; + + public decimal? NullableDecimalValue => UseNullNullableValues ? null : DecimalValue; + + public float? NullableFloatValue => UseNullNullableValues ? null : FloatValue; + } +} diff --git a/src/DynamicData.Tests/ObservableCollectionExFixture.cs b/src/DynamicData.Tests/ObservableCollectionExFixture.cs index 0d93711a9..8b627c261 100644 --- a/src/DynamicData.Tests/ObservableCollectionExFixture.cs +++ b/src/DynamicData.Tests/ObservableCollectionExFixture.cs @@ -1,12 +1,10 @@ - -using System.Collections.ObjectModel; +#if REACTIVE_TESTS +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif using DynamicData.Tests.Domain; -using FluentAssertions; - -using Xunit; - namespace DynamicData.Tests; public class ObservableCollectionExFixture @@ -17,33 +15,32 @@ public class ObservableCollectionExFixture private readonly Person _person3 = new("Three", 3); - [Fact] - public void CanConvertToObservableChangeSetList() + [Test] + public async Task CanConvertToObservableChangeSetList() { var source = new ObservableCollection { _person1, _person2, _person3 }; var changeSet = source.ToObservableChangeSet().AsObservableList(); - changeSet.Items.Should().BeEquivalentTo(source); + await Assert.That(changeSet.Items).IsEquivalentTo(source); } - [Fact] - public void CanConvertToObservableChangeSetCache() + [Test] + public async Task CanConvertToObservableChangeSetCache() { var source = new ObservableCollection { _person1, _person2, _person3 }; var changeSet = source.ToObservableChangeSet(x => x.Name).AsObservableCache(); - changeSet.Items.Should().BeEquivalentTo(source); + await Assert.That(changeSet.Items).IsEquivalentTo(source); var one = changeSet.Lookup("One").Value; - one.Should().BeEquivalentTo(_person1); + await Assert.That(one).IsEquivalentTo(_person1); } - - [Fact] - public void ReplacingAnItemWithSameProducesUpdate() + [Test] + public async Task ReplacingAnItemWithSameProducesUpdate() { var source = new ObservableCollection { _person1, _person2, _person3 }; var aggregator = source.ToObservableChangeSet(x => x.Name).AsAggregator(); source[0] = new Person("One", 100); - aggregator.Summary.Latest.Updates.Should().Be(1); - aggregator.Summary.Latest.Adds.Should().Be(0); - aggregator.Summary.Latest.Removes.Should().Be(0); + await Assert.That(aggregator.Summary.Latest.Updates).IsEqualTo(1); + await Assert.That(aggregator.Summary.Latest.Adds).IsEqualTo(0); + await Assert.That(aggregator.Summary.Latest.Removes).IsEqualTo(0); } } diff --git a/src/DynamicData.Tests/OptionalInitialRegressionFixture.cs b/src/DynamicData.Tests/OptionalInitialRegressionFixture.cs new file mode 100644 index 000000000..7ecdda3b8 --- /dev/null +++ b/src/DynamicData.Tests/OptionalInitialRegressionFixture.cs @@ -0,0 +1,34 @@ +namespace DynamicData.Tests; + +public class OptionalInitialRegressionFixture +{ + [Test] + public async Task EmptySourceEmitsInitialNoneBeforeCompletion() + { + var values = new List>(); + var completed = false; + using var subscription = Observable.Empty>() + .ToObservableOptional(1, initialOptionalWhenMissing: true) + .Subscribe(values.Add, () => completed = true); + + await Assert.That(values).HasCount(1); + await Assert.That(values[0].HasValue).IsFalse(); + await Assert.That(completed).IsTrue(); + } + + [Test] + public async Task SynchronousSourceErrorDoesNotEmitSyntheticNone() + { + var expected = new InvalidOperationException("Source failed"); + var values = new List>(); + Exception? observed = null; + var completed = false; + using var subscription = Observable.Throw>(expected) + .ToObservableOptional(1, initialOptionalWhenMissing: true) + .Subscribe(values.Add, error => observed = error, () => completed = true); + + await Assert.That(values).IsEmpty(); + await Assert.That(observed).IsSameReferenceAs(expected); + await Assert.That(completed).IsFalse(); + } +} diff --git a/src/DynamicData.Tests/SwitchReentrancyRegressionFixture.cs b/src/DynamicData.Tests/SwitchReentrancyRegressionFixture.cs new file mode 100644 index 000000000..2454dbb46 --- /dev/null +++ b/src/DynamicData.Tests/SwitchReentrancyRegressionFixture.cs @@ -0,0 +1,68 @@ +namespace DynamicData.Tests; + +public class SwitchReentrancyRegressionFixture +{ + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task CacheSwitchKeepsReentrantReplacementSubscribed(bool replaceDuringClear) + { + using var sources = new ReactiveUI.Primitives.Signals.Signal>>(); + using var replacement = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = sources.Switch() + .Do(changes => + { + if (changes.Any(change => change.Reason == (replaceDuringClear ? ChangeReason.Remove : ChangeReason.Add) && change.Current == 1)) + { + sources.OnNext(replacement); + } + }) + .AsAggregator(); + + sources.OnNext(Observable.Return>( + new ChangeSet { new(ChangeReason.Add, 1, 1) })); + if (replaceDuringClear) + { + sources.OnNext(Observable.Return>( + new ChangeSet { new(ChangeReason.Add, 99, 99) })); + } + + replacement.OnNext(new ChangeSet { new(ChangeReason.Add, 2, 2) }); + + await Assert.That(replacement.HasObservers).IsTrue(); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 2 }); + } + + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task ListSwitchKeepsReentrantReplacementSubscribed(bool replaceDuringClear) + { + using var sources = new ReactiveUI.Primitives.Signals.Signal>>(); + using var replacement = new ReactiveUI.Primitives.Signals.Signal>(); + using var results = sources.Switch() + .Do(changes => + { + if (changes.Any(change => replaceDuringClear + ? change.Reason == ListChangeReason.Clear && change.Range.Contains(1) + : change.Reason == ListChangeReason.Add && change.Item.Current == 1)) + { + sources.OnNext(replacement); + } + }) + .AsAggregator(); + + sources.OnNext(Observable.Return>( + new ChangeSet { new(ListChangeReason.Add, 1, 0) })); + if (replaceDuringClear) + { + sources.OnNext(Observable.Return>( + new ChangeSet { new(ListChangeReason.Add, 99, 0) })); + } + + replacement.OnNext(new ChangeSet { new(ListChangeReason.Add, 2, 0) }); + + await Assert.That(replacement.HasObservers).IsTrue(); + await Assert.That(results.Data.Items).IsEquivalentTo(new[] { 2 }); + } +} diff --git a/src/DynamicData.Tests/Utilities/CacheChangeSetAssertions.cs b/src/DynamicData.Tests/Utilities/CacheChangeSetAssertions.cs index bb4e7cb3f..2e182b681 100644 --- a/src/DynamicData.Tests/Utilities/CacheChangeSetAssertions.cs +++ b/src/DynamicData.Tests/Utilities/CacheChangeSetAssertions.cs @@ -1,18 +1,15 @@ -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - namespace DynamicData.Tests.Utilities; public static class CacheChangeSetAssertions { - public static void ShouldHaveRefreshed( - this IChangeSet changeSet, - IEnumerable expectedItems, - string because = "") - => changeSet - .Where(static change => change.Reason is ChangeReason.Refresh) - .Select(static change => change.Current) - .Should().BeEquivalentTo(expectedItems, because); + public static async Task ShouldHaveRefreshed( + this IChangeSet changeSet, + IEnumerable expectedItems, + string because = "") + where TObject : notnull + where TKey : notnull + => await Assert.That(changeSet + .Where(static change => change.Reason is ChangeReason.Refresh) + .Select(static change => change.Current)) + .IsEquivalentTo(expectedItems, TUnit.Assertions.Enums.CollectionOrdering.Any); } diff --git a/src/DynamicData.Tests/Utilities/CacheItemRecordingObserver.cs b/src/DynamicData.Tests/Utilities/CacheItemRecordingObserver.cs index 7f0eba1b9..d21cb5a94 100644 --- a/src/DynamicData.Tests/Utilities/CacheItemRecordingObserver.cs +++ b/src/DynamicData.Tests/Utilities/CacheItemRecordingObserver.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Reactive.Concurrency; - namespace DynamicData.Tests.Utilities; public sealed class CacheItemRecordingObserver @@ -18,7 +15,7 @@ public CacheItemRecordingObserver(IScheduler scheduler) _recordedChangeSets = new(); _recordedItemsByKey = new(); _recordedItemsSorted = new(); - } + } public IReadOnlyList> RecordedChangeSets => _recordedChangeSets; diff --git a/src/DynamicData.Tests/Utilities/CacheItemRecordingObserverAssertions.cs b/src/DynamicData.Tests/Utilities/CacheItemRecordingObserverAssertions.cs index 6dfbfa047..018cc70a4 100644 --- a/src/DynamicData.Tests/Utilities/CacheItemRecordingObserverAssertions.cs +++ b/src/DynamicData.Tests/Utilities/CacheItemRecordingObserverAssertions.cs @@ -1,24 +1,25 @@ -using FluentAssertions; - namespace DynamicData.Tests.Utilities; public static class CacheItemRecordingObserverAssertions { - public static void ShouldNotSupportSorting( - this CacheItemRecordingObserver results, - string because = "") - where TObject : notnull - where TKey : notnull + public static async Task ShouldNotSupportSorting( + this CacheItemRecordingObserver results, + string because = "") + where TObject : notnull + where TKey : notnull { - results.RecordedChangeSets.Should().AllSatisfy(changeSet => + foreach (var changeSet in results.RecordedChangeSets) { if (changeSet.Count is not 0) - changeSet.Should().AllSatisfy(change => + { + foreach (var change in changeSet) { - change.CurrentIndex.Should().Be(-1, because); - change.PreviousIndex.Should().Be(-1, because); - }); - }); - results.RecordedItemsSorted.Should().BeEmpty(because); + await Assert.That(change.CurrentIndex).IsEqualTo(-1); + await Assert.That(change.PreviousIndex).IsEqualTo(-1); + } + } + } + + await Assert.That(results.RecordedItemsSorted).IsEmpty(); } } diff --git a/src/DynamicData.Tests/Utilities/ComparerExtensions.cs b/src/DynamicData.Tests/Utilities/ComparerExtensions.cs index 76433346f..efdc80bab 100644 --- a/src/DynamicData.Tests/Utilities/ComparerExtensions.cs +++ b/src/DynamicData.Tests/Utilities/ComparerExtensions.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; namespace DynamicData.Tests.Utilities; @@ -17,7 +15,6 @@ internal sealed class NoOpEqualityComparer : IEqualityComparer public int GetHashCode([DisallowNull] T obj) => throw new NotImplementedException(); } - internal sealed class InvertedComparer(IComparer original) : IComparer { private readonly IComparer _original = original; @@ -25,7 +22,6 @@ internal sealed class InvertedComparer(IComparer original) : IComparer public int Compare(T x, T y) => _original.Compare(x, y) * -1; } - internal static class ComparerExtensions { public static IComparer Invert(this IComparer comparer) => new InvertedComparer(comparer); diff --git a/src/DynamicData.Tests/Utilities/FakeScheduler.cs b/src/DynamicData.Tests/Utilities/FakeScheduler.cs index fc2b19bbf..5deab1f75 100644 --- a/src/DynamicData.Tests/Utilities/FakeScheduler.cs +++ b/src/DynamicData.Tests/Utilities/FakeScheduler.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; +using System.Diagnostics; namespace DynamicData.Tests.Utilities; @@ -11,6 +8,7 @@ internal sealed class FakeScheduler private readonly List _scheduledActions; private DateTimeOffset _now; + private long? _originClockTicks; public FakeScheduler() => _scheduledActions = new(); @@ -24,6 +22,35 @@ public DateTimeOffset Now set => _now = value; } + public long Timestamp + { + get + { + _originClockTicks ??= _now.Ticks; + return ToTimestamp(_now.Ticks); + } + } + + public void Schedule(IWorkItem item) => + _scheduledActions.Add( + new ScheduledAction( + dueTime: null, + onInvoked: () => + { + item.Execute(); + return Disposable.Empty; + })); + + public void Schedule(IWorkItem item, long dueTimestamp) => + _scheduledActions.Add( + new ScheduledAction( + dueTime: new DateTimeOffset(ToClockTicks(dueTimestamp), TimeSpan.Zero), + onInvoked: () => + { + item.Execute(); + return Disposable.Empty; + })); + public IDisposable Schedule( TState state, Func action) @@ -31,7 +58,7 @@ public IDisposable Schedule( state: state, dueTime: null, action: action); - + public IDisposable Schedule( TState state, TimeSpan dueTime, @@ -40,7 +67,7 @@ public IDisposable Schedule( state: state, dueTime: _now + dueTime, action: action); - + public IDisposable Schedule( TState state, DateTimeOffset dueTime, @@ -53,7 +80,7 @@ public IDisposable Schedule( // Simulate the scheduler invoking actions, allowing for each action to schedule followup actions, until none remain. public void SimulateUntilIdle(TimeSpan inaccuracyOffset = default) { - while(ScheduledActions.Count is not 0) + while (ScheduledActions.Count is not 0) { // If the action doesn't have a DueTime, invoke it immediately if (ScheduledActions[0].DueTime is not DateTimeOffset dueTime) @@ -91,6 +118,31 @@ private IDisposable ScheduleCore( return Disposable.Create(scheduledAction.Cancel); } + private long ToTimestamp(long ticks) + { + _originClockTicks ??= ticks; + var elapsedTicks = ticks - _originClockTicks.Value; + if (elapsedTicks <= 0) + { + return 0; + } + + var value = elapsedTicks / (double)TimeSpan.TicksPerSecond * Stopwatch.Frequency; + return value >= long.MaxValue ? long.MaxValue : (long)value; + } + + private long ToClockTicks(long timestamp) + { + var originClockTicks = _originClockTicks ?? 0; + if (timestamp <= 0) + { + return originClockTicks; + } + + var value = timestamp / (double)Stopwatch.Frequency * TimeSpan.TicksPerSecond; + return value >= long.MaxValue - originClockTicks ? long.MaxValue : originClockTicks + (long)value; + } + public sealed class ScheduledAction { private readonly Func _onInvoked; diff --git a/src/DynamicData.Tests/Utilities/FakerExtensions.cs b/src/DynamicData.Tests/Utilities/FakerExtensions.cs index 1388d3b80..ca70fed85 100644 --- a/src/DynamicData.Tests/Utilities/FakerExtensions.cs +++ b/src/DynamicData.Tests/Utilities/FakerExtensions.cs @@ -1,7 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Linq; -using System.Reactive.Concurrency; using Bogus; namespace DynamicData.Tests.Utilities; @@ -14,5 +10,5 @@ public static IObservable IntervalGenerate(this Faker faker, Randomizer public static IObservable IntervalGenerate(this Faker faker, TimeSpan period, IScheduler? scheduler = null) where T : class => - Observable.Interval(period, scheduler ?? DefaultScheduler.Instance).Select(_ => faker.Generate()); + Observable.Interval(period, scheduler ?? Scheduler.Default).Select(_ => faker.Generate()); } diff --git a/src/DynamicData.Tests/Utilities/FunctionalExtensions.cs b/src/DynamicData.Tests/Utilities/FunctionalExtensions.cs index cb3c819cf..cc04a34c1 100644 --- a/src/DynamicData.Tests/Utilities/FunctionalExtensions.cs +++ b/src/DynamicData.Tests/Utilities/FunctionalExtensions.cs @@ -1,5 +1,3 @@ -using System; - namespace DynamicData.Tests.Utilities; internal static class FunctionalExtensions diff --git a/src/DynamicData.Tests/Utilities/ListChangeSetAssertions.cs b/src/DynamicData.Tests/Utilities/ListChangeSetAssertions.cs index d0b336e16..2693204e9 100644 --- a/src/DynamicData.Tests/Utilities/ListChangeSetAssertions.cs +++ b/src/DynamicData.Tests/Utilities/ListChangeSetAssertions.cs @@ -1,19 +1,14 @@ -using System.Collections.Generic; -using System.Linq; - -using FluentAssertions; - namespace DynamicData.Tests.Utilities; public static class ListChangeSetAssertions { - public static void ShouldHaveRefreshed( - this IChangeSet changeSet, - IEnumerable expectedItems, - string because = "") + public static async Task ShouldHaveRefreshed( + this IChangeSet changeSet, + IEnumerable expectedItems, + string because = "") where T : notnull - => changeSet - .Where(static change => change.Reason is ListChangeReason.Refresh) - .Select(static change => change.Item.Current) - .Should().BeEquivalentTo(expectedItems, because); + => await Assert.That(changeSet + .Where(static change => change.Reason is ListChangeReason.Refresh) + .Select(static change => change.Item.Current)) + .IsEquivalentTo(expectedItems, TUnit.Assertions.Enums.CollectionOrdering.Any); } diff --git a/src/DynamicData.Tests/Utilities/ListItemRecordingObserver.cs b/src/DynamicData.Tests/Utilities/ListItemRecordingObserver.cs index 09eaa8819..cccf8a6fa 100644 --- a/src/DynamicData.Tests/Utilities/ListItemRecordingObserver.cs +++ b/src/DynamicData.Tests/Utilities/ListItemRecordingObserver.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Reactive.Concurrency; - namespace DynamicData.Tests.Utilities; public sealed class ListItemRecordingObserver @@ -15,7 +12,7 @@ public ListItemRecordingObserver(IScheduler scheduler) { _recordedChangeSets = new(); _recordedItems = new(); - } + } public IReadOnlyList> RecordedChangeSets => _recordedChangeSets; @@ -25,7 +22,7 @@ public IReadOnlyList RecordedItems public void ClearChangeSets() => _recordedChangeSets.Clear(); - + protected override void OnNext(IChangeSet value) { if (!HasFinalized) diff --git a/src/DynamicData.Tests/Utilities/ObservableEx.cs b/src/DynamicData.Tests/Utilities/ObservableEx.cs index df45f9f75..fdeb4ba65 100644 --- a/src/DynamicData.Tests/Utilities/ObservableEx.cs +++ b/src/DynamicData.Tests/Utilities/ObservableEx.cs @@ -1,7 +1,3 @@ -using System; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - namespace DynamicData.Tests.Utilities; /// @@ -33,6 +29,6 @@ IDisposable HandleNext(IScheduler _, long counter) return sch.Schedule(0, nextInterval(), HandleNext); } - return ScheduleFirst(scheduler ?? DefaultScheduler.Instance); + return ScheduleFirst(scheduler ?? Scheduler.Default); }); } diff --git a/src/DynamicData.Tests/Utilities/ObservableExtensions.cs b/src/DynamicData.Tests/Utilities/ObservableExtensions.cs index acd336d0e..e36d58647 100644 --- a/src/DynamicData.Tests/Utilities/ObservableExtensions.cs +++ b/src/DynamicData.Tests/Utilities/ObservableExtensions.cs @@ -1,14 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using System.Threading; - -using FluentAssertions; - namespace DynamicData.Tests.Utilities; internal static class ObservableExtensions @@ -27,7 +16,7 @@ e is not null : source; /// - /// Creates an observable that parallelizes some given work by taking the source observable, creates multiple subscriptions, limiting each to a certain number of values, and + /// Creates an observable that parallelizes some given work by taking the source observable, creates multiple subscriptions, limiting each to a certain number of values, and /// attaching some work to be done in parallel to each before merging them back together. /// /// Input Observable type. @@ -41,7 +30,7 @@ public static IObservable Parallelize(this IObservable source, int c Observable.Merge(Distribute(count, parallel).Select(n => fnAttachParallelWork(source.Take(n)))); /// - /// Creates an observable that parallelizes some given work by taking the source observable, creates multiple subscriptions, limiting each to a certain number of values, and + /// Creates an observable that parallelizes some given work by taking the source observable, creates multiple subscriptions, limiting each to a certain number of values, and /// merging them back together. /// /// Observable type. @@ -104,124 +93,125 @@ public static IObservable> ValidateChangeSets(this IObservable< { foreach (var change in changes) { - change.Range.Should().NotBeNull(); + RequireNotNull(change.Range); - change.Reason.Should().BeOneOf(reasons); + RequireContains(reasons, change.Reason); switch (change.Reason.GetChangeType()) { case ChangeType.Item: - change.Item.Reason.Should().Be(change.Reason); - change.Range.Should().BeEmpty("single-item changes should not specify range info"); + RequireEqual(change.Item.Reason, change.Reason); + RequireEmpty(change.Range); break; case ChangeType.Range: - change.Item.Should().Be(default(ItemChange), "range changes should not specify single-item info"); + RequireEqual(change.Item, default(ItemChange)); break; } switch (change.Reason) { case ListChangeReason.Add: - change.Item.PreviousIndex.Should().Be(-1, "only Moved changes should specify a previous index"); - change.Item.Previous.HasValue.Should().BeFalse("only Update changes should specify a previous item"); + RequireEqual(change.Item.PreviousIndex, -1); + RequireFalse(change.Item.Previous.HasValue); - change.Item.CurrentIndex.Should().BeInRange(-1, sortedItems.Count, "the insertion index should be omitted, a valid index of the collection, or the next available index of the collection"); + RequireBetween(change.Item.CurrentIndex, -1, sortedItems.Count); if (change.Item.CurrentIndex is -1) sortedItems.Add(change.Item.Current); else sortedItems.Insert( - index: change.Item.CurrentIndex, - item: change.Item.Current); + index: change.Item.CurrentIndex, + item: change.Item.Current); break; case ListChangeReason.AddRange: - change.Range.Index.Should().BeInRange(-1, sortedItems.Count, "the insertion index should be omitted, a valid index of the collection, or the next available index of the collection"); + RequireBetween(change.Range.Index, -1, sortedItems.Count); if (change.Range.Index is -1) sortedItems.AddRange(change.Range); else sortedItems.InsertRange( - index: change.Range.Index, + index: change.Range.Index, collection: change.Range); break; case ListChangeReason.Clear: - change.Range.Index.Should().Be(-1, "a Clear change applies to an entire collection, it does not have a specific index"); + RequireEqual(change.Range.Index, -1); // The fact that ChangeAwareList can generate Clear changesets with items listed not in the order that they appear in the source seems like a defect to me. Maybe fix? - change.Range.Should().BeEquivalentTo(sortedItems, "items in the range should match the corresponding items in the collection"); + RequireEquivalent(change.Range, sortedItems, preserveOrder: false); sortedItems.Clear(); break; case ListChangeReason.Moved: - sortedItems.Should().NotBeEmpty("an item cannot be moved within an empty collection"); + RequireNotEmpty(sortedItems); - change.Item.PreviousIndex.Should().BeInRange(0, sortedItems.Count - 1, "the source index should be a valid index of the collection"); - change.Item.Previous.HasValue.Should().BeFalse("only Update changes should specify a previous item"); - change.Item.CurrentIndex.Should().BeInRange(0, sortedItems.Count - 1, "the target index should be a valid index of the collection"); - change.Item.Current.Should().Be(sortedItems[change.Item.PreviousIndex], "the item to be moved should match the corresponding item in the collection"); + RequireBetween(change.Item.PreviousIndex, 0, sortedItems.Count - 1); + RequireFalse(change.Item.Previous.HasValue); + RequireBetween(change.Item.CurrentIndex, 0, sortedItems.Count - 1); + RequireEqual(change.Item.Current, sortedItems[change.Item.PreviousIndex]); sortedItems.RemoveAt(change.Item.PreviousIndex); sortedItems.Insert( - index: change.Item.CurrentIndex, - item: change.Item.Current); + index: change.Item.CurrentIndex, + item: change.Item.Current); break; case ListChangeReason.Refresh: - sortedItems.Should().NotBeEmpty("an item cannot be refreshed within an empty collection"); + RequireNotEmpty(sortedItems); - change.Item.PreviousIndex.Should().Be(-1, "only Moved changes should specify a previous index"); + RequireEqual(change.Item.PreviousIndex, -1); // This should likely be fixed. The purpose of Refresh changes is to force re-evaluation of an item that specifically has not changed, the previous item will always be the current item, by definition. - //change.Item.Previous.HasValue.Should().BeFalse("only Update changes should specify a previous item"); - change.Item.CurrentIndex.Should().BeInRange(0, sortedItems.Count - 1, "the target index should be a valid index of the collection"); - change.Item.Current.Should().Be(sortedItems[change.Item.CurrentIndex], "the item to be refreshed should match the corresponding item in the collection"); + // change.Item.Previous.HasValue should be false because only Update changes should specify a previous item. + RequireBetween(change.Item.CurrentIndex, 0, sortedItems.Count - 1); + RequireEqual(change.Item.Current, sortedItems[change.Item.CurrentIndex]); break; case ListChangeReason.Remove: - sortedItems.Should().NotBeEmpty("an item cannot be removed from an empty collection"); + RequireNotEmpty(sortedItems); - change.Item.PreviousIndex.Should().Be(-1, "only Moved changes should specify a previous index"); - change.Item.Previous.HasValue.Should().BeFalse("only Update changes should specify a previous item"); - change.Item.CurrentIndex.Should().BeInRange(0, sortedItems.Count - 1, "the index to be removed should be a valid index of the collection"); - change.Item.Current.Should().Be(sortedItems[change.Item.CurrentIndex], "the item to be removed should match the corresponding item in the collection"); + RequireEqual(change.Item.PreviousIndex, -1); + RequireFalse(change.Item.Previous.HasValue); + RequireBetween(change.Item.CurrentIndex, 0, sortedItems.Count - 1); + RequireEqual(change.Item.Current, sortedItems[change.Item.CurrentIndex]); sortedItems.RemoveAt(change.Item.CurrentIndex); break; case ListChangeReason.RemoveRange: - change.Range.Index.Should().BeInRange(-1, sortedItems.Count - 1, "the removal index should be omitted, or a valid index of the collection"); + RequireBetween(change.Range.Index, -1, sortedItems.Count - 1); if (change.Range.Index is -1) - change.Range.Should().BeEmpty("the removal index was omitted"); + RequireEmpty(change.Range); else { - change.Range.Count.Should().BeInRange(1, sortedItems.Count - change.Range.Index, "the range to be removed should contain more items than exist in the collection, at the given removal index"); - change.Range.Should().BeEquivalentTo( + RequireBetween(change.Range.Count, 1, sortedItems.Count - change.Range.Index); + RequireEquivalent( + change.Range, sortedItems .Skip(change.Range.Index) .Take(change.Range.Count), - config => config.WithStrictOrdering(), "items to be removed should match the corresponding items in the collection"); + preserveOrder: true); sortedItems.RemoveRange( - index: change.Range.Index, - count: change.Range.Count); + index: change.Range.Index, + count: change.Range.Count); } break; case ListChangeReason.Replace: - sortedItems.Should().NotBeEmpty("an item cannot be replaced within an empty collection"); + RequireNotEmpty(sortedItems); - change.Item.PreviousIndex.Should().BeInRange(0, sortedItems.Count - 1, "the index of replacement should be a valid index of the collection"); - change.Item.CurrentIndex.Should().BeInRange(0, sortedItems.Count - 1, "the index to be replaced should be a valid index of the collection"); - change.Item.Previous.HasValue.Should().BeTrue("a Replace change should specify a previous item"); - change.Item.Previous.Value.Should().Be(sortedItems[change.Item.CurrentIndex], "the replaced item should match the corresponding item in the collection"); + RequireBetween(change.Item.PreviousIndex, 0, sortedItems.Count - 1); + RequireBetween(change.Item.CurrentIndex, 0, sortedItems.Count - 1); + RequireTrue(change.Item.Previous.HasValue); + RequireEqual(change.Item.Previous.Value, sortedItems[change.Item.CurrentIndex]); sortedItems[change.Item.CurrentIndex] = change.Item.Current; @@ -254,7 +244,7 @@ public static IObservable> ValidateChangeSets(); var sortedKeys = new List(); var isSorted = null as bool?; - + var reasons = Enum.GetValues(); return source.SubscribeSafe(RawAnonymousObserver.Create>( @@ -264,9 +254,9 @@ public static IObservable> ValidateChangeSets> ValidateChangeSets> ValidateChangeSets> ValidateChangeSets incomingNotification) lock (synchronizationGate) { - switch(incomingNotification.Kind) + switch (incomingNotification.Kind) { case NotificationKind.OnNext: observer.OnNext(incomingNotification.Value); @@ -468,4 +458,128 @@ private static IEnumerable Distribute(int count, int parallel) => // Doesn't divide equally, so return the ratio for the parallel quantity, and the remainder for the last one (int c, int p, int ratio) => Enumerable.Repeat(ratio, p - 1).Append(c - (ratio * (p - 1))), }; + + private static void RequireNotNull(T value) + { + if (value is null) + { + Assert.Fail("Expected value to be non-null."); + } + } + + private static void RequireTrue(bool value) + { + if (!value) + { + Assert.Fail("Expected value to be true."); + } + } + + private static void RequireFalse(bool value) + { + if (value) + { + Assert.Fail("Expected value to be false."); + } + } + + private static void RequireEqual(T actual, T expected) + { + if (!EqualityComparer.Default.Equals(actual, expected)) + { + Assert.Fail($"Expected {actual} to equal {expected}."); + } + } + + private static void RequireGreaterThan(T actual, T lowerBound) + where T : IComparable + { + if (actual.CompareTo(lowerBound) <= 0) + { + Assert.Fail($"Expected {actual} to be greater than {lowerBound}."); + } + } + + private static void RequireBetween(T actual, T lowerBound, T upperBound) + where T : IComparable + { + if (actual.CompareTo(lowerBound) < 0 || actual.CompareTo(upperBound) > 0) + { + Assert.Fail($"Expected {actual} to be between {lowerBound} and {upperBound}."); + } + } + + private static void RequireContains(IEnumerable items, T expected) + { + if (!items.Contains(expected)) + { + Assert.Fail($"Expected sequence to contain {expected}."); + } + } + + private static void RequireDoesNotContain(IEnumerable items, T unexpected) + { + if (items.Contains(unexpected)) + { + Assert.Fail($"Expected sequence not to contain {unexpected}."); + } + } + + private static void RequireEmpty(IEnumerable items) + { + if (items.Any()) + { + Assert.Fail("Expected sequence to be empty."); + } + } + + private static void RequireNotEmpty(IEnumerable items) + { + if (!items.Any()) + { + Assert.Fail("Expected sequence not to be empty."); + } + } + + private static void RequireEquivalent(IEnumerable actual, IEnumerable expected, bool preserveOrder) + { + var actualList = actual.ToList(); + var expectedList = expected.ToList(); + + if (preserveOrder) + { + if (!actualList.SequenceEqual(expectedList)) + { + Assert.Fail("Expected sequences to be equivalent with matching order."); + } + + return; + } + + if (actualList.Count != expectedList.Count) + { + Assert.Fail("Expected sequences to have the same count."); + } + + var matched = new bool[expectedList.Count]; + foreach (var actualItem in actualList) + { + var matchedIndex = -1; + for (var i = 0; i < expectedList.Count; i++) + { + if (!matched[i] && EqualityComparer.Default.Equals(actualItem, expectedList[i])) + { + matchedIndex = i; + break; + } + } + + if (matchedIndex < 0) + { + Assert.Fail($"Expected sequence item {actualItem} to have a matching item."); + } + + matched[matchedIndex] = true; + } + } } diff --git a/src/DynamicData.Tests/Utilities/ObservableSpy.cs b/src/DynamicData.Tests/Utilities/ObservableSpy.cs index b4ae7bbc8..4c7fb6b16 100644 --- a/src/DynamicData.Tests/Utilities/ObservableSpy.cs +++ b/src/DynamicData.Tests/Utilities/ObservableSpy.cs @@ -1,10 +1,5 @@ -using System; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; using System.Runtime.InteropServices; -using System.Threading; -using Xunit.Abstractions; +using System.IO; namespace DynamicData.Tests.Utilities; @@ -120,20 +115,20 @@ private static Func, string> CreateListChangeSetFormatter(Func< where T : notnull => cs => "[List Change Set]" + ChangeSetEntrySpacing + string.Join(ChangeSetEntrySpacing, cs.Select((change, n) => $"#{n} {FormatChange(formatter, change)}")); - public static IObservable TestSpy(this IObservable source, ITestOutputHelper testOutputHelper, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) => - source.Spy(opName, TestLogger(testOutputHelper), formatter, showSubs, showTimestamps); + public static IObservable TestSpy(this IObservable source, TextWriter? testOutput, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) => + source.Spy(opName, TestLogger(testOutput), formatter, showSubs, showTimestamps); - public static IObservable> TestSpy(this IObservable> source, ITestOutputHelper testOutputHelper, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) + public static IObservable> TestSpy(this IObservable> source, TextWriter? testOutput, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) where T : notnull where TKey : notnull => - source.Spy(opName, TestLogger(testOutputHelper), formatter, showSubs, showTimestamps); + source.Spy(opName, TestLogger(testOutput), formatter, showSubs, showTimestamps); - public static IObservable> TestSpy(this IObservable> source, ITestOutputHelper testOutputHelper, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) + public static IObservable> TestSpy(this IObservable> source, TextWriter? testOutput, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) where T : notnull => - source.Spy(opName, TestLogger(testOutputHelper), formatter, showSubs, showTimestamps); + source.Spy(opName, TestLogger(testOutput), formatter, showSubs, showTimestamps); public static IObservable DebugSpy(this IObservable source, string? opName = null, Func? formatter = null, bool showSubs = true, bool showTimestamps = true) => - #if DEBUG || DEBUG_SPY_ALWAYS +#if DEBUG || DEBUG_SPY_ALWAYS source.Spy(opName, DebugLogger, formatter, showSubs, showTimestamps); #else source; @@ -199,19 +194,19 @@ private static Action CreateLogger(Action baseLogger, Func baseLogger($"{timeStamper()}[{Environment.CurrentManagedThreadId:X2}] |{opName}| {msg}"); #if DEBUG || DEBUG_SPY_ALWAYS - private static Action TestLogger(ITestOutputHelper testOutputHelper) => str => + private static Action TestLogger(TextWriter? testOutput) => str => { - testOutputHelper.WriteLine(str); + testOutput?.WriteLine(str); DebugLogger(str); }; #else - private static Action TestLogger(ITestOutputHelper testOutputHelper) => testOutputHelper.WriteLine; + private static Action TestLogger(TextWriter? testOutput) => str => testOutput?.WriteLine(str); #endif #if DEBUG - private static void DebugLogger(string str) => System.Diagnostics.Debug.WriteLine(str); + private static void DebugLogger(string str) => System.Diagnostics.Debug.WriteLine(str); #elif DEBUG_SPY_ALWAYS - private static void DebugLogger(string str) => NativeMethods.OutputDebugString(str); + private static void DebugLogger(string str) => NativeMethods.OutputDebugString(str); #endif } diff --git a/src/DynamicData.Tests/Utilities/RandomizerExtensions.cs b/src/DynamicData.Tests/Utilities/RandomizerExtensions.cs index eb9f4a490..ad27a89a7 100644 --- a/src/DynamicData.Tests/Utilities/RandomizerExtensions.cs +++ b/src/DynamicData.Tests/Utilities/RandomizerExtensions.cs @@ -1,6 +1,4 @@ -using System; using System.Diagnostics; -using System.Reactive.Concurrency; using Bogus; namespace DynamicData.Tests.Utilities; diff --git a/src/DynamicData.Tests/Utilities/RawAnonymousObservable.cs b/src/DynamicData.Tests/Utilities/RawAnonymousObservable.cs index 06168b009..be77d215d 100644 --- a/src/DynamicData.Tests/Utilities/RawAnonymousObservable.cs +++ b/src/DynamicData.Tests/Utilities/RawAnonymousObservable.cs @@ -1,5 +1,3 @@ -using System; - namespace DynamicData.Tests.Utilities; internal static class RawAnonymousObservable diff --git a/src/DynamicData.Tests/Utilities/RawAnonymousObserver.cs b/src/DynamicData.Tests/Utilities/RawAnonymousObserver.cs index 0567e5676..d7eef2571 100644 --- a/src/DynamicData.Tests/Utilities/RawAnonymousObserver.cs +++ b/src/DynamicData.Tests/Utilities/RawAnonymousObserver.cs @@ -1,5 +1,3 @@ -using System; - namespace DynamicData.Tests.Utilities; internal static class RawAnonymousObserver @@ -34,10 +32,10 @@ public RawAnonymousObserver( public void OnCompleted() => _onCompleted.Invoke(); - + public void OnError(Exception error) => _onError.Invoke(error); - + public void OnNext(T value) => _onNext.Invoke(value); } diff --git a/src/DynamicData.Tests/Utilities/ReactiveTestCompatibility.cs b/src/DynamicData.Tests/Utilities/ReactiveTestCompatibility.cs new file mode 100644 index 000000000..9479e7c75 --- /dev/null +++ b/src/DynamicData.Tests/Utilities/ReactiveTestCompatibility.cs @@ -0,0 +1,300 @@ +using System.Diagnostics; + +namespace DynamicData.Tests.Utilities; + +public enum NotificationKind +{ + OnNext, + OnError, + OnCompleted +} + +public sealed class Notification +{ + private Notification(NotificationKind kind, T? value = default, Exception? exception = null) + { + Kind = kind; + Value = value!; + Exception = exception; + } + + public NotificationKind Kind { get; } + + public T Value { get; } + + public Exception? Exception { get; } + + public static Notification CreateOnNext(T value) => new(NotificationKind.OnNext, value); + + public static Notification CreateOnError(Exception error) => new(NotificationKind.OnError, exception: error); + + public static Notification CreateOnCompleted() => new(NotificationKind.OnCompleted); +} + +public static class Notification +{ + public static Notification CreateOnNext(T value) => Notification.CreateOnNext(value); + + public static Notification CreateOnError(Exception error) => Notification.CreateOnError(error); + + public static Notification CreateOnCompleted() => Notification.CreateOnCompleted(); +} + +public readonly record struct Recorded +{ + public Recorded(long time, T value) + { + Time = time; + Value = value; + } + + public long Time { get; } + + public T Value { get; } +} + +public sealed class NewThreadScheduler : ISequencer +#if REACTIVE_TESTS + , System.Reactive.Concurrency.IScheduler +#endif +{ + public DateTimeOffset Now => ReactiveUI.Primitives.Concurrency.ThreadPoolSequencer.Instance.Now; + + public long Timestamp => ReactiveUI.Primitives.Concurrency.ThreadPoolSequencer.Instance.Timestamp; + + public void Schedule(IWorkItem item) => ReactiveUI.Primitives.Concurrency.ThreadPoolSequencer.Instance.Schedule(item); + + public void Schedule(IWorkItem item, long dueTimestamp) => ReactiveUI.Primitives.Concurrency.ThreadPoolSequencer.Instance.Schedule(item, dueTimestamp); + +#if REACTIVE_TESTS + public IDisposable Schedule( + TState state, + Func action) + { + var item = new RxScheduledWorkItem(this, state, action); + Schedule(item); + return item; + } + + public IDisposable Schedule( + TState state, + TimeSpan dueTime, + Func action) + { + var item = new RxScheduledWorkItem(this, state, action); + Schedule(item, ReactiveTestSchedulerBridge.AddTimestamp(Timestamp, dueTime)); + return item; + } + + public IDisposable Schedule( + TState state, + DateTimeOffset dueTime, + Func action) => + Schedule(state, dueTime - Now, action); +#endif +} + +public sealed class TestScheduler : ISequencer +#if REACTIVE_TESTS + , System.Reactive.Concurrency.IScheduler +#endif +{ + private readonly List _queue = []; + private long _clockTicks; + private long? _originClockTicks; + private long _timestamp; + private long _nextId; + + public DateTimeOffset Now => new(_clockTicks, TimeSpan.Zero); + + public long Timestamp + { + get + { + _originClockTicks ??= _clockTicks; + return _timestamp; + } + } + + public void Schedule(IWorkItem item) => Schedule(item, _timestamp); + + public void Schedule(IWorkItem item, long dueTimestamp) + { + _queue.Add(new ScheduledItem(dueTimestamp, _nextId++, item)); + _queue.Sort(static (left, right) => + { + var due = left.DueTimestamp.CompareTo(right.DueTimestamp); + return due != 0 ? due : left.Id.CompareTo(right.Id); + }); + } + +#if REACTIVE_TESTS + public IDisposable Schedule( + TState state, + Func action) + { + var item = new RxScheduledWorkItem(this, state, action); + Schedule(item); + return item; + } + + public IDisposable Schedule( + TState state, + TimeSpan dueTime, + Func action) + { + var item = new RxScheduledWorkItem(this, state, action); + Schedule(item, ReactiveTestSchedulerBridge.AddTimestamp(Timestamp, dueTime)); + return item; + } + + public IDisposable Schedule( + TState state, + DateTimeOffset dueTime, + Func action) => + Schedule(state, dueTime - Now, action); +#endif + + public void AdvanceBy(long ticks) + { + if (ticks < 0) + { + throw new ArgumentOutOfRangeException(nameof(ticks)); + } + + AdvanceTo(_clockTicks + ticks); + } + + public void AdvanceTo(long ticks) + { + if (ticks < _clockTicks) + { + return; + } + + _originClockTicks ??= _queue.Count == 0 ? ticks : _clockTicks; + var targetTimestamp = ToTimestamp(ticks); + while (_queue.Count != 0 && _queue[0].DueTimestamp <= targetTimestamp) + { + var next = _queue[0]; + _queue.RemoveAt(0); + _timestamp = next.DueTimestamp; + _clockTicks = ToClockTicks(_timestamp); + next.Item.Execute(); + } + + _clockTicks = ticks; + _timestamp = targetTimestamp; + } + + public void Start() + { + while (_queue.Count != 0) + { + var next = _queue[0]; + AdvanceTo(ToClockTicks(next.DueTimestamp)); + } + } + + private long ToTimestamp(long ticks) + { + _originClockTicks ??= ticks; + var elapsedTicks = ticks - _originClockTicks.Value; + if (elapsedTicks <= 0) + { + return 0; + } + + var value = elapsedTicks / (double)TimeSpan.TicksPerSecond * Stopwatch.Frequency; + return value >= long.MaxValue ? long.MaxValue : (long)value; + } + + private long ToClockTicks(long timestamp) + { + var originClockTicks = _originClockTicks ?? 0; + if (timestamp <= 0) + { + return originClockTicks; + } + + var value = timestamp / (double)Stopwatch.Frequency * TimeSpan.TicksPerSecond; + return value >= long.MaxValue - originClockTicks ? long.MaxValue : originClockTicks + (long)value; + } + + private sealed record ScheduledItem(long DueTimestamp, long Id, IWorkItem Item); +} + +#if REACTIVE_TESTS +file sealed class RxScheduledWorkItem( + System.Reactive.Concurrency.IScheduler scheduler, + TState state, + Func action) + : IWorkItem, IDisposable +{ + private readonly object _gate = new(); + private IDisposable? _inner; + private bool _isDisposed; + + public void Execute() + { + lock (_gate) + { + if (_isDisposed) + { + return; + } + } + + var inner = action(scheduler, state); + lock (_gate) + { + if (_isDisposed) + { + inner.Dispose(); + } + else + { + _inner = inner; + } + } + } + + public void Dispose() + { + IDisposable? inner; + lock (_gate) + { + if (_isDisposed) + { + return; + } + + _isDisposed = true; + inner = _inner; + _inner = null; + } + + inner?.Dispose(); + } +} + +file static class ReactiveTestSchedulerBridge +{ + public static long AddTimestamp(long timestamp, TimeSpan dueTime) + { + var delta = ToTimestampDelta(dueTime); + return timestamp >= long.MaxValue - delta ? long.MaxValue : timestamp + delta; + } + + public static long ToTimestampDelta(TimeSpan dueTime) + { + if (dueTime <= TimeSpan.Zero) + { + return 0; + } + + var value = dueTime.Ticks / (double)TimeSpan.TicksPerSecond * Stopwatch.Frequency; + return value >= long.MaxValue ? long.MaxValue : (long)value; + } +} +#endif diff --git a/src/DynamicData.Tests/Utilities/RecordingObserverBase.cs b/src/DynamicData.Tests/Utilities/RecordingObserverBase.cs index 4c7ce3a0e..3383d88ef 100644 --- a/src/DynamicData.Tests/Utilities/RecordingObserverBase.cs +++ b/src/DynamicData.Tests/Utilities/RecordingObserverBase.cs @@ -1,11 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Concurrency; -using System.Reactive; -using System.Threading.Tasks; - -using Microsoft.Reactive.Testing; - namespace DynamicData.Tests.Utilities; // Using a custom implementing of IObserver<> to bypass normal RX safeguards, allowing invalid behaviors to be potentially tested for. @@ -52,7 +44,7 @@ void IObserver.OnCompleted() _hasCompleted = true; _whenFinalizedSource.SetResult(); } - + void IObserver.OnError(Exception error) { _notifications.Add(new( diff --git a/src/DynamicData.Tests/Utilities/SelectManyExtensions.cs b/src/DynamicData.Tests/Utilities/SelectManyExtensions.cs index 61c5b3445..a07ae493e 100644 --- a/src/DynamicData.Tests/Utilities/SelectManyExtensions.cs +++ b/src/DynamicData.Tests/Utilities/SelectManyExtensions.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - namespace DynamicData.Tests.Utilities; /// diff --git a/src/DynamicData.Tests/Utilities/StressAddRemoveExtensions.cs b/src/DynamicData.Tests/Utilities/StressAddRemoveExtensions.cs index afe5f47d5..40ad4a30a 100644 --- a/src/DynamicData.Tests/Utilities/StressAddRemoveExtensions.cs +++ b/src/DynamicData.Tests/Utilities/StressAddRemoveExtensions.cs @@ -1,8 +1,3 @@ -using System; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - namespace DynamicData.Tests.Utilities; internal static class StressAddRemoveExtensions @@ -12,7 +7,7 @@ public static IObservable StressAddRemove(this IObservable item where T : notnull => items.Do(i => onAdd(i, state)) .SelectMany(item => getRemoveTimeout?.Invoke(item) is TimeSpan ts - ? Observable.Timer(ts, scheduler ?? DefaultScheduler.Instance) + ? Observable.Timer(ts, scheduler ?? Scheduler.Default) .Do(_ => onRemove(item, state)) .Select(_ => item) : Observable.Return(item)); diff --git a/src/DynamicData.Tests/Utilities/TestSourceCache.cs b/src/DynamicData.Tests/Utilities/TestSourceCache.cs index bdd440a1c..c09d40304 100644 --- a/src/DynamicData.Tests/Utilities/TestSourceCache.cs +++ b/src/DynamicData.Tests/Utilities/TestSourceCache.cs @@ -1,11 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; - -using DynamicData.Kernel; - namespace DynamicData.Tests.Utilities; public sealed class TestSourceCache @@ -14,8 +6,8 @@ public sealed class TestSourceCache where TKey : notnull { private readonly IObservable _countChanged; - private readonly BehaviorSubject _error; - private readonly BehaviorSubject _hasCompleted; + private readonly ReactiveUI.Primitives.Signals.StateSignal _error; + private readonly ReactiveUI.Primitives.Signals.StateSignal _hasCompleted; private readonly SourceCache _source; public TestSourceCache(Func keySelector) @@ -35,7 +27,7 @@ public IObservable CountChanged public IReadOnlyList Items => _source.Items; - + public IReadOnlyList Keys => _source.Keys; @@ -71,7 +63,7 @@ public void Edit(Action> updateAction) _source.Edit(updateAction); } - public Optional Lookup(TKey key) + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _source.Lookup(key); public IObservable> Preview(Func? predicate = null) @@ -97,7 +89,7 @@ private void AssertCanMutate() } private IObservable WrapStream(IObservable sourceStream) - => Observable.Create(downstreamObserver => + => Observable.Create(downstreamObserver => { var whenCompleted = _hasCompleted .Where(static hasCompleted => hasCompleted) diff --git a/src/DynamicData.Tests/Utilities/TestSourceList.cs b/src/DynamicData.Tests/Utilities/TestSourceList.cs index 6f3a1e2c2..e4d83f7ab 100644 --- a/src/DynamicData.Tests/Utilities/TestSourceList.cs +++ b/src/DynamicData.Tests/Utilities/TestSourceList.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; - namespace DynamicData.Tests.Utilities; public sealed class TestSourceList @@ -12,10 +5,10 @@ public sealed class TestSourceList where T : notnull { private readonly IObservable _countChanged; - private readonly BehaviorSubject _error; - private readonly BehaviorSubject _hasCompleted; - private readonly Subject> _refreshRequested; - private readonly Subject> _refreshRequestedPreview; + private readonly ReactiveUI.Primitives.Signals.StateSignal _error; + private readonly ReactiveUI.Primitives.Signals.StateSignal _hasCompleted; + private readonly ReactiveUI.Primitives.Signals.Signal> _refreshRequested; + private readonly ReactiveUI.Primitives.Signals.Signal> _refreshRequestedPreview; private readonly SourceList _source; public TestSourceList() @@ -58,14 +51,14 @@ public void Dispose() _refreshRequested.Dispose(); _refreshRequestedPreview.Dispose(); } - + public void Edit(Action> updateAction) { AssertCanMutate(); _source.Edit(updateAction); } - + public IObservable> Preview(Func? predicate = null) => WrapStream(Observable.Merge( _source.Preview(predicate), @@ -76,9 +69,9 @@ public void Refresh() { var changeSet = new ChangeSet(_source.Items .Select((item, index) => new Change( - reason: ListChangeReason.Refresh, - current: item, - index: index))); + reason: ListChangeReason.Refresh, + current: item, + index: index))); _refreshRequestedPreview.OnNext(changeSet); _refreshRequested.OnNext(changeSet); @@ -104,9 +97,9 @@ public void Refresh(IEnumerable indexes) { var changeSet = new ChangeSet(indexes .Select(index => new Change( - reason: ListChangeReason.Refresh, - current: _source.Items.ElementAt(index), - index: index))); + reason: ListChangeReason.Refresh, + current: _source.Items.ElementAt(index), + index: index))); _refreshRequestedPreview.OnNext(changeSet); _refreshRequested.OnNext(changeSet); @@ -133,7 +126,7 @@ private IObservable WrapStream(IObservable sourceStream) { var hasCompleted = _hasCompleted .Publish(); - + var subscription = Observable .Merge( _error @@ -145,10 +138,10 @@ private IObservable WrapStream(IObservable sourceStream) .TakeUntil(hasCompleted .Where(static hasCompleted => hasCompleted)) .SubscribeSafe(downstreamObserver); - + // Make sure that an initial changeset gets published, before immediate completion. var connection = hasCompleted.Connect(); - + return Disposable.Create(() => { connection.Dispose(); diff --git a/src/DynamicData.Tests/Utilities/UnsynchronizedNotificationException.cs b/src/DynamicData.Tests/Utilities/UnsynchronizedNotificationException.cs index 4994e2b35..3af2c35a7 100644 --- a/src/DynamicData.Tests/Utilities/UnsynchronizedNotificationException.cs +++ b/src/DynamicData.Tests/Utilities/UnsynchronizedNotificationException.cs @@ -1,6 +1,3 @@ -using System; -using System.Reactive; - namespace DynamicData.Tests.Utilities; public class UnsynchronizedNotificationException diff --git a/src/DynamicData.Tests/Utilities/ValueRecordingObserver.cs b/src/DynamicData.Tests/Utilities/ValueRecordingObserver.cs index 51c53964d..ffdbd3d75 100644 --- a/src/DynamicData.Tests/Utilities/ValueRecordingObserver.cs +++ b/src/DynamicData.Tests/Utilities/ValueRecordingObserver.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Reactive.Concurrency; - namespace DynamicData.Tests.Utilities; public sealed class ValueRecordingObserver diff --git a/src/DynamicData.Tests/UtilityCoverageFixture.cs b/src/DynamicData.Tests/UtilityCoverageFixture.cs new file mode 100644 index 000000000..9d20a2474 --- /dev/null +++ b/src/DynamicData.Tests/UtilityCoverageFixture.cs @@ -0,0 +1,517 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive.Alias; +using DynamicData.Reactive.Aggregation; +using DynamicData.Reactive.Diagnostics; +using DynamicData.Reactive.Kernel; +using RxUnit = System.Reactive.Unit; +#else +using DynamicData.Alias; +using DynamicData.Aggregation; +using DynamicData.Diagnostics; +using DynamicData.Kernel; +using RxUnit = ReactiveUI.Primitives.RxVoid; +#endif + +namespace DynamicData.Tests; + +public class UtilityCoverageFixture +{ + [Test] + public async Task CacheStdDevOverloadsEmitFallbackAndUpdatedValues() + { + using var source = new SourceCache(item => item.Key); + + var ints = new List(); + var longs = new List(); + var doubles = new List(); + var decimals = new List(); + var floats = new List(); + + using var subscriptions = new CompositeDisposable( + source.Connect().StdDev(item => item.IntValue, 12).Subscribe(ints.Add), + source.Connect().StdDev(item => item.LongValue, 13L).Subscribe(longs.Add), + source.Connect().StdDev(item => item.DoubleValue, 14D).Subscribe(doubles.Add), + source.Connect().StdDev(item => item.DecimalValue, 15M).Subscribe(decimals.Add), + source.Connect().StdDev(item => item.FloatValue, 16F).Subscribe(floats.Add)); + + source.AddOrUpdate(new Measure("A", 2)); + source.AddOrUpdate(new Measure("B", 4)); + source.AddOrUpdate(new Measure("C", 6)); + source.Remove("A"); + source.Remove("B"); + source.Remove("C"); + + await AssertStdDevValues(ints, 12D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 12D, 12D); + await AssertStdDevValues(longs, 13D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 13D, 13D); + await AssertStdDevValues(doubles, 14D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 14D, 14D); + await AssertDecimalStdDevValues(decimals, 15M, 1.4142135623730950488016887242M, 2M, 1.4142135623730950488016887242M, 15M, 15M); + await AssertStdDevValues(floats, 16D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 16D, 16D); + } + + [Test] + public async Task ListStdDevOverloadsEmitFallbackAndUpdatedValues() + { + using var source = new SourceList(); + + var ints = new List(); + var longs = new List(); + var doubles = new List(); + var decimals = new List(); + var floats = new List(); + + using var subscriptions = new CompositeDisposable( + source.Connect().StdDev(item => item.IntValue, 12).Subscribe(ints.Add), + source.Connect().StdDev(item => item.LongValue, 13L).Subscribe(longs.Add), + source.Connect().StdDev(item => item.DoubleValue, 14D).Subscribe(doubles.Add), + source.Connect().StdDev(item => item.DecimalValue, 15M).Subscribe(decimals.Add), + source.Connect().StdDev(item => item.FloatValue, 16F).Subscribe(floats.Add)); + + var first = new Measure("A", 2); + source.Add(first); + source.Add(new Measure("B", 4)); + source.Add(new Measure("C", 6)); + source.Remove(first); + source.Clear(); + + await AssertStdDevValues(ints, 12D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 12D); + await AssertStdDevValues(longs, 13D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 13D); + await AssertStdDevValues(doubles, 14D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 14D); + await AssertDecimalStdDevValues(decimals, 15M, 1.4142135623730950488016887242M, 2M, 1.4142135623730950488016887242M, 15M); + await AssertStdDevValues(floats, 16D, Math.Sqrt(2D), 2D, Math.Sqrt(2D), 16D); + } + + [Test] + public async Task StdDevUsesSampleVarianceForNonIntegerMeanAndLargeValues() + { + using var source = new SourceCache(item => item.Key); + + var ints = new List(); + var longs = new List(); + var decimals = new List(); + + using var subscriptions = new CompositeDisposable( + source.Connect().StdDev(item => item.IntValue, 0).Subscribe(ints.Add), + source.Connect().StdDev(item => item.LongValue, 0L).Subscribe(longs.Add), + source.Connect().StdDev(item => item.DecimalValue, 0M).Subscribe(decimals.Add)); + + source.AddOrUpdate(new Measure("A", 1)); + source.AddOrUpdate(new Measure("B", 2)); + source.AddOrUpdate(new Measure("C", 4)); + + await AssertClose(ints[^1], Math.Sqrt(7D / 3D)); + await AssertClose(longs[^1], Math.Sqrt(7D / 3D)); + await AssertClose((double)decimals[^1], Math.Sqrt(7D / 3D)); + + source.AddOrUpdate(new Measure("A", int.MaxValue - 2, 4_000_000_000L, 4_000_000_000M, 4_000_000_000D, 4_000_000_000F)); + source.AddOrUpdate(new Measure("B", int.MaxValue - 1, 4_000_000_001L, 4_000_000_001M, 4_000_000_001D, 4_000_000_001F)); + source.AddOrUpdate(new Measure("C", int.MaxValue, 4_000_000_002L, 4_000_000_002M, 4_000_000_002D, 4_000_000_002F)); + + await AssertClose(ints[^1], 1D); + await AssertClose(longs[^1], 1D); + // Removing a very different value introduces decimal rounding in central moments. + await AssertDecimalClose(decimals[^1], 1M, 0.000000001M); + } + + [Test] + public async Task StdDevDistinguishesAdjacentLargeIntegralValues() + { + using var source = new SourceList(); + var longs = new List(); + var decimals = new List(); + using var longSubscription = source.Connect().StdDev(value => value, 0L).Subscribe(longs.Add); + using var decimalSubscription = source.Connect().StdDev(value => (decimal)value, 0M).Subscribe(decimals.Add); + + // Keep the spread small: central moments, unlike the mean, must be squared. + source.AddRange(new[] { 9_000_000_000_000_000_000L, 9_000_000_000_000_000_001L, 9_000_000_000_000_000_002L }); + + await AssertClose(longs[^1], 1D); + await AssertDecimalClose(decimals[^1], 1M); + } + + [Test] + public async Task StdDevWrappedOverloadsThrowWhenArgumentsAreNull() + { + IObservable>? listSource = null; + IObservable>? cacheSource = null; + Func? selector = null; + + await Assert.That(() => listSource!.StdDev(item => item.IntValue, 0)).Throws(); + await Assert.That(() => cacheSource!.StdDev(item => item.IntValue, 0)).Throws(); + await Assert.That(() => Observable.Empty>().StdDev(selector!, 0)).Throws(); + await Assert.That(() => Observable.Empty>().StdDev(selector!, 0)).Throws(); + } + + [Test] + public async Task ObservableCacheAliasSelectOverloadsTransformAndForceRefresh() + { + using var source = new SourceCache(item => item.Key); + using var forceAll = new ReactiveUI.Primitives.Signals.Signal(); + using var forceWithKey = new ReactiveUI.Primitives.Signals.Signal>(); + using var forceWithoutKey = new ReactiveUI.Primitives.Signals.Signal>(); + + var keyAwareCount = 0; + var keylessCount = 0; + var keyAwareFilteredCount = 0; + var keylessFilteredCount = 0; + + using var keyAware = ObservableCacheAlias.Select( + source.Connect(), + (Measure item, string key) => $"{key}:{item.IntValue}:{++keyAwareCount}", + forceAll) + .AsAggregator(); + using var keyless = ObservableCacheAlias.Select( + source.Connect(), + (Measure item) => $"{item.Key}:{item.IntValue}:{++keylessCount}", + forceAll) + .AsAggregator(); + using var keyAwareFiltered = ObservableCacheAlias.Select( + source.Connect(), + (Measure item, string key) => $"{key}:{item.IntValue}:{++keyAwareFilteredCount}", + forceWithKey) + .AsAggregator(); + using var keylessFiltered = ObservableCacheAlias.Select( + source.Connect(), + (Measure item) => $"{item.Key}:{item.IntValue}:{++keylessFilteredCount}", + forceWithoutKey) + .AsAggregator(); + + source.AddOrUpdate(new Measure("A", 1)); + source.AddOrUpdate(new Measure("B", 2)); + forceAll.OnNext(default); + forceWithKey.OnNext((_, key) => key == "A"); + forceWithoutKey.OnNext(item => item.Key == "B"); + + await Assert.That(keyAware.Data.Items.OrderBy(item => item).ToArray()).IsEquivalentTo(new[] { "A:1:3", "B:2:4" }); + await Assert.That(keyless.Data.Items.OrderBy(item => item).ToArray()).IsEquivalentTo(new[] { "A:1:3", "B:2:4" }); + await Assert.That(keyAwareFiltered.Data.Items.OrderBy(item => item).ToArray()).IsEquivalentTo(new[] { "A:1:3", "B:2:2" }); + await Assert.That(keylessFiltered.Data.Items.OrderBy(item => item).ToArray()).IsEquivalentTo(new[] { "A:1:1", "B:2:3" }); + } + + [Test] + public async Task ObservableCacheAliasSelectManyWhereAndSelectTreeDelegateToCacheOperators() + { + using var source = new SourceCache(item => item.Key); + using var predicateChanged = new ReactiveUI.Primitives.Signals.StateSignal>(item => item.Score >= 10); + using var reapply = new ReactiveUI.Primitives.Signals.Signal(); + + using var many = ObservableCacheAlias.SelectMany( + source.Connect(), + item => item.Children, + child => child.Key) + .AsAggregator(); + using var staticWhere = ObservableCacheAlias.Where(source.Connect(), (TreeItem item) => item.Score >= 10).AsAggregator(); + using var dynamicWhere = ObservableCacheAlias.Where(source.Connect(), predicateChanged).AsAggregator(); + using var refreshWhere = ObservableCacheAlias.Where(source.Connect(), predicateChanged, reapply).AsAggregator(); + using var tree = ObservableCacheAlias.SelectTree(source.Connect(), item => item.ParentKey).AsAggregator(); + + var parent = new TreeItem("Parent", string.Empty, 10, new[] { new TreeItem("Child", "Parent", 1, Array.Empty()) }); + var low = new TreeItem("Low", string.Empty, 1, Array.Empty()); + + source.AddOrUpdate(parent); + source.AddOrUpdate(low); + predicateChanged.OnNext(item => item.Score < 10); + low.Score = 11; + reapply.OnNext(default); + + await Assert.That(many.Data.Items.Select(item => item.Key).ToArray()).IsEquivalentTo(new[] { "Child" }); + await Assert.That(staticWhere.Data.Items.Select(item => item.Key).ToArray()).IsEquivalentTo(new[] { "Parent" }); + await Assert.That(dynamicWhere.Data.Items.Select(item => item.Key).ToArray()).IsEquivalentTo(new[] { "Low" }); + await Assert.That(refreshWhere.Data.Items.Select(item => item.Key).ToArray()).IsEquivalentTo(Array.Empty()); + await Assert.That(tree.Data.Items.Count).IsEqualTo(2); + } + + [Test] + public async Task ObservableCacheAliasSelectSafeReportsErrorsAndForceRefreshes() + { + using var source = new SourceCache(item => item.Key); + using var forceAll = new ReactiveUI.Primitives.Signals.Signal(); + using var forceWithKey = new ReactiveUI.Primitives.Signals.Signal>(); + using var forceWithoutKey = new ReactiveUI.Primitives.Signals.Signal>(); + + var errors = new List>(); + var keyAwareErrors = new List>(); + var allErrors = new List>(); + + using var keyless = ObservableCacheAlias.SelectSafe( + source.Connect(), + TransformOrThrow, + errors.Add, + forceWithoutKey) + .AsAggregator(); + using var keyAware = ObservableCacheAlias.SelectSafe( + source.Connect(), + (Measure item, string key) => TransformOrThrow(item) + key, + keyAwareErrors.Add, + forceWithKey) + .AsAggregator(); + using var all = ObservableCacheAlias.SelectSafe( + source.Connect(), + (Measure item, string key) => TransformOrThrow(item) + key, + allErrors.Add, + forceAll) + .AsAggregator(); + + source.AddOrUpdate(new Measure("A", 1)); + source.AddOrUpdate(new Measure("B", -1)); + forceWithoutKey.OnNext(item => item.Key == "B"); + forceWithKey.OnNext((item, _) => item.Key == "B"); + forceAll.OnNext(default); + + await Assert.That(keyless.Data.Items.ToArray()).IsEquivalentTo(new[] { "A:1" }); + await Assert.That(keyAware.Data.Items.ToArray()).IsEquivalentTo(new[] { "A:1A" }); + await Assert.That(all.Data.Items.ToArray()).IsEquivalentTo(new[] { "A:1A" }); + await Assert.That(errors).HasSingleItem(); + await Assert.That(keyAwareErrors).HasSingleItem(); + await Assert.That(allErrors).HasSingleItem(); + await Assert.That(errors[0].Key).IsEqualTo("B"); + await Assert.That(errors[0].Value.IntValue).IsEqualTo(-1); + } + + [Test] + public async Task KernelRetryWithBackOffRetriesUntilStrategyStops() + { + var attempts = 0; + var errors = new List(); + var values = new List(); + + var source = Observable.Create( + observer => + { + attempts++; + if (attempts < 3) + { + observer.OnError(new InvalidOperationException($"Attempt {attempts}")); + } + else + { + observer.OnNext(42); + observer.OnCompleted(); + } + + return Disposable.Empty; + }); + + var result = source.RetryWithBackOff((_, count) => count < 3 ? TimeSpan.Zero : null); + + using var subscription = result.Subscribe(values.Add, errors.Add); + + await Assert.That(values).IsEquivalentTo(new[] { 42 }); + await Assert.That(errors).IsEmpty(); + await Assert.That(attempts).IsEqualTo(3); + } + + [Test] + public async Task KernelRetryWithBackOffPropagatesWhenStrategyStops() + { + var attempts = 0; + var errors = new List(); + var completed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var source = Observable.Create( + observer => + { + attempts++; + observer.OnError(new InvalidOperationException("Stop")); + return Disposable.Empty; + }); + + var result = source.RetryWithBackOff((_, _) => null); + + using var subscription = result.Subscribe(_ => { }, error => { errors.Add(error); completed.TrySetResult(); }); + + await completed.Task.WaitAsync(TimeSpan.FromSeconds(5)); + + await Assert.That(attempts).IsEqualTo(1); + await Assert.That(errors).HasSingleItem(); + await Assert.That(errors[0]).IsTypeOf(); + } + + [Test] + public async Task KernelScheduleRecurringActionReschedulesUntilDisposed() + { + var scheduler = new TestScheduler(); + var count = 0; + var intervals = new Queue(new[] { TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(2) }); + + using var recurring = scheduler.ScheduleRecurringAction(() => intervals.Count == 0 ? TimeSpan.FromSeconds(3) : intervals.Dequeue(), () => count++); + + scheduler.AdvanceBy(TimeSpan.FromSeconds(1).Ticks - 1); + await Assert.That(count).IsEqualTo(0); + + scheduler.AdvanceBy(1); + await Assert.That(count).IsEqualTo(1); + + scheduler.AdvanceBy(TimeSpan.FromSeconds(2).Ticks - 1); + await Assert.That(count).IsEqualTo(1); + + scheduler.AdvanceBy(1); + await Assert.That(count).IsEqualTo(2); + + recurring.Dispose(); + + scheduler.AdvanceBy(TimeSpan.FromSeconds(3).Ticks); + await Assert.That(count).IsEqualTo(2); + + var fixedCount = 0; + using var fixedRecurring = scheduler.ScheduleRecurringAction(TimeSpan.FromSeconds(4), () => fixedCount++); + + scheduler.AdvanceBy(TimeSpan.FromSeconds(4).Ticks - 1); + await Assert.That(fixedCount).IsEqualTo(0); + + scheduler.AdvanceBy(1); + await Assert.That(fixedCount).IsEqualTo(1); + + fixedRecurring.Dispose(); + + scheduler.AdvanceBy(TimeSpan.FromSeconds(4).Ticks); + await Assert.That(fixedCount).IsEqualTo(1); + } + + [Test] + public async Task KernelHelpersSwapConvertToUnitAndCreateFreshReturnValues() + { + var first = "left"; + var second = "right"; + InternalEx.Swap(ref first, ref second); + + var unitValues = new List(); + var counter = 0; + using var subscription = InternalEx.Return(() => ++counter).ToUnit().Subscribe(unitValues.Add); + using var secondSubscription = InternalEx.Return(() => ++counter).Subscribe(_ => { }); + using var signal = new ReactiveUI.Primitives.Signals.Signal(); + var signalCount = 0; + using var signalSubscription = signal.Subscribe(_ => signalCount++); + + signal.OnNext(); + + await Assert.That(first).IsEqualTo("right"); + await Assert.That(second).IsEqualTo("left"); + await Assert.That(unitValues).HasSingleItem(); + await Assert.That(counter).IsEqualTo(2); + await Assert.That(signalCount).IsEqualTo(1); + await Assert.That(InternalEx.NewLock()).IsNotNull(); + await Assert.That(InternalEx.NewMonitorGate()).IsNotNull(); + } + + [Test] + public async Task ParallelSelectRunsWithBoundedConcurrencyAndPreservesSourceOrder() + { + var running = 0; + var maxRunning = 0; + + var result = await Enumerable.Range(1, 6).SelectParallel( + async item => + { + var active = Interlocked.Increment(ref running); + maxRunning = Math.Max(maxRunning, active); + + await Task.Delay(item % 2 == 0 ? 1 : 5); + + Interlocked.Decrement(ref running); + return item * 10; + }, + maximumThreads: 2); + + await Assert.That(result.SequenceEqual(new[] { 10, 20, 30, 40, 50, 60 })).IsTrue(); + await Assert.That(maxRunning).IsLessThanOrEqualTo(2); + } + + [Test] + public async Task DiagnosticOperatorsCollectCacheAndListStatistics() + { + using var cache = new SourceCache(item => item.Key); + using var list = new SourceList(); + var cacheSummaries = new List(); + var listSummaries = new List(); + + using var cacheSubscription = cache.Connect().CollectUpdateStats().Subscribe(cacheSummaries.Add); + using var listSubscription = list.Connect().CollectUpdateStats().Subscribe(listSummaries.Add); + + cache.AddOrUpdate(new Measure("A", 1)); + cache.AddOrUpdate(new Measure("A", 2)); + cache.Remove("A"); + + var listItem = new Measure("L", 1); + list.Add(listItem); + list.ReplaceAt(0, new Measure("L", 2)); + list.RemoveAt(0); + + var cacheOverall = cacheSummaries.Last().Overall; + var cacheLatest = cacheSummaries.Last().Latest; + var listOverall = listSummaries.Last().Overall; + var listLatest = listSummaries.Last().Latest; + + await Assert.That(cacheOverall.Adds).IsEqualTo(1); + await Assert.That(cacheOverall.Updates).IsEqualTo(1); + await Assert.That(cacheOverall.Removes).IsEqualTo(1); + await Assert.That(cacheLatest.Removes).IsEqualTo(1); + await Assert.That(listOverall.Adds).IsEqualTo(1); + await Assert.That(listOverall.Updates).IsEqualTo(1); + await Assert.That(listOverall.Removes).IsEqualTo(1); + await Assert.That(listLatest.Removes).IsEqualTo(1); + } + + private static string TransformOrThrow(Measure item) + { + if (item.IntValue < 0) + { + throw new InvalidOperationException(item.Key); + } + + return $"{item.Key}:{item.IntValue}"; + } + + private static async Task AssertStdDevValues(IReadOnlyList values, double fallback, params double[] expectedTail) + { + await Assert.That(values.Count).IsEqualTo(expectedTail.Length + 1); + await Assert.That(values[0]).IsEqualTo(fallback); + + for (var i = 0; i < expectedTail.Length; i++) + { + await AssertClose(values[values.Count - expectedTail.Length + i], expectedTail[i]); + } + } + + private static async Task AssertDecimalStdDevValues(IReadOnlyList values, decimal fallback, params decimal[] expectedTail) + { + await Assert.That(values.Count).IsEqualTo(expectedTail.Length + 1); + await Assert.That(values[0]).IsEqualTo(fallback); + + for (var i = 0; i < expectedTail.Length; i++) + { + await AssertDecimalClose(values[values.Count - expectedTail.Length + i], expectedTail[i]); + } + } + + private static async Task AssertClose(double actual, double expected, double tolerance = 0.000_000_001D) + { + await Assert.That(Math.Abs(actual - expected)).IsLessThanOrEqualTo(tolerance); + } + + private static async Task AssertDecimalClose(decimal actual, decimal expected, decimal tolerance = 0.000_000_000_000_000_000_000_001M) + { + await Assert.That(Math.Abs(actual - expected)).IsLessThanOrEqualTo(tolerance); + } + + private sealed record Measure(string Key, int IntValue, long? LongValueOverride = null, decimal? DecimalValueOverride = null, double? DoubleValueOverride = null, float? FloatValueOverride = null) + { + public long LongValue => LongValueOverride ?? IntValue; + + public double DoubleValue => DoubleValueOverride ?? IntValue; + + public decimal DecimalValue => DecimalValueOverride ?? IntValue; + + public float FloatValue => FloatValueOverride ?? IntValue; + } + + private sealed class TreeItem(string key, string parentKey, int score, IEnumerable children) + { + public string Key { get; } = key; + + public string ParentKey { get; } = parentKey; + + public int Score { get; set; } = score; + + public IEnumerable Children { get; } = children; + } +} diff --git a/src/DynamicData.Tests/ValueObjectCoverageFixture.cs b/src/DynamicData.Tests/ValueObjectCoverageFixture.cs new file mode 100644 index 000000000..67c6f50f7 --- /dev/null +++ b/src/DynamicData.Tests/ValueObjectCoverageFixture.cs @@ -0,0 +1,116 @@ +#if REACTIVE_TESTS +using DynamicData.Reactive; +using DynamicData.Reactive.Kernel; +using DynamicData.Reactive.Operators; +#else +using DynamicData.Kernel; +using DynamicData.Operators; +#endif + +namespace DynamicData.Tests; + +public class ValueObjectCoverageFixture +{ + [Test] + public async Task PageResponseExposesValuesAndComparesByConcreteResponseValues() + { + var first = new PageResponse(pageSize: 25, totalSize: 101, page: 2, pages: 5); + var same = new PageResponse(pageSize: 25, totalSize: 101, page: 2, pages: 5); + var different = new PageResponse(pageSize: 10, totalSize: 101, page: 2, pages: 5); + IPageResponse sameValuesDifferentType = new ExternalPageResponse(25, 101, 2, 5); + + await Assert.That(first.PageSize).IsEqualTo(25); + await Assert.That(first.TotalSize).IsEqualTo(101); + await Assert.That(first.Page).IsEqualTo(2); + await Assert.That(first.Pages).IsEqualTo(5); + await Assert.That(first.Equals(same)).IsTrue(); + await Assert.That(first.Equals((object)same)).IsTrue(); + await Assert.That(first.Equals(different)).IsFalse(); + await Assert.That(first.Equals(null)).IsFalse(); + await Assert.That(first.Equals(new object())).IsFalse(); + await Assert.That(PageResponse.DefaultComparer.Equals(first, first)).IsTrue(); + await Assert.That(PageResponse.DefaultComparer.Equals(null, first)).IsFalse(); + await Assert.That(PageResponse.DefaultComparer.Equals(first, null)).IsFalse(); + await Assert.That(PageResponse.DefaultComparer.Equals(first, sameValuesDifferentType)).IsFalse(); + var hashCode = PageResponse.DefaultComparer.GetHashCode(first!); + await Assert.That(hashCode).IsEqualTo(PageResponse.DefaultComparer.GetHashCode(same)); + var nullHashCode = PageResponse.DefaultComparer.GetHashCode(null!); + await Assert.That(nullHashCode).IsEqualTo(0); + await Assert.That(first.ToString()).IsEqualTo("Page: 2, PageSize: 25, Pages: 5, TotalSize: 101"); + } + + [Test] + public async Task VirtualResponseExposesValuesAndComparesByConcreteResponseValues() + { + var first = new VirtualResponse(size: 25, startIndex: 50, totalSize: 101); + var same = new VirtualResponse(size: 25, startIndex: 50, totalSize: 101); + var different = new VirtualResponse(size: 10, startIndex: 50, totalSize: 101); + IVirtualResponse sameValuesDifferentType = new ExternalVirtualResponse(25, 50, 101); + + await Assert.That(first.Size).IsEqualTo(25); + await Assert.That(first.StartIndex).IsEqualTo(50); + await Assert.That(first.TotalSize).IsEqualTo(101); + await Assert.That(first.Equals(same)).IsTrue(); + await Assert.That(first.Equals((object)same)).IsTrue(); + await Assert.That(first.Equals(different)).IsFalse(); + await Assert.That(first.Equals(null)).IsFalse(); + await Assert.That(first.Equals(new object())).IsFalse(); + await Assert.That(VirtualResponse.DefaultComparer.Equals(first, first)).IsTrue(); + await Assert.That(VirtualResponse.DefaultComparer.Equals(null, first)).IsFalse(); + await Assert.That(VirtualResponse.DefaultComparer.Equals(first, null)).IsFalse(); + await Assert.That(VirtualResponse.DefaultComparer.Equals(first, sameValuesDifferentType)).IsFalse(); + var hashCode = VirtualResponse.DefaultComparer.GetHashCode(first!); + await Assert.That(hashCode).IsEqualTo(VirtualResponse.DefaultComparer.GetHashCode(same)); + var nullHashCode = VirtualResponse.DefaultComparer.GetHashCode(null!); + await Assert.That(nullHashCode).IsEqualTo(0); + await Assert.That(first.ToString()).IsEqualTo("Size: 25, StartIndex: 50, TotalSize: 101"); + } + + [Test] + public async Task ErrorComparesKeyValueAndExceptionAndFormatsState() + { + var exception = new InvalidOperationException("Broken"); + var first = new Error(exception, "value", 42); + var same = new Error(exception, "value", 42); + var differentKey = new Error(exception, "value", 43); + var differentValue = new Error(exception, "other", 42); + var differentException = new Error(new InvalidOperationException("Broken"), "value", 42); + + await Assert.That(first.Exception).IsSameReferenceAs(exception); + await Assert.That(first.Value).IsEqualTo("value"); + await Assert.That(first.Key).IsEqualTo(42); + await Assert.That(first == same).IsTrue(); + await Assert.That(first != same).IsFalse(); + await Assert.That(first.Equals(first)).IsTrue(); + await Assert.That(first.Equals(same)).IsTrue(); + await Assert.That(first.Equals((object)same)).IsTrue(); + await Assert.That(first.Equals((Error?)null)).IsFalse(); + await Assert.That(first.Equals((object?)null)).IsFalse(); + await Assert.That(first.Equals(new object())).IsFalse(); + await Assert.That(first.Equals(differentKey)).IsFalse(); + await Assert.That(first.Equals(differentValue)).IsFalse(); + await Assert.That(first.Equals(differentException)).IsFalse(); + await Assert.That(first.GetHashCode()).IsEqualTo(same.GetHashCode()); + await Assert.That(first.ToString()).IsEqualTo($"Key: 42, Value: value, Exception: {exception}"); + } + + private sealed class ExternalPageResponse(int pageSize, int totalSize, int page, int pages) : IPageResponse + { + public int Page { get; } = page; + + public int Pages { get; } = pages; + + public int PageSize { get; } = pageSize; + + public int TotalSize { get; } = totalSize; + } + + private sealed class ExternalVirtualResponse(int size, int startIndex, int totalSize) : IVirtualResponse + { + public int Size { get; } = size; + + public int StartIndex { get; } = startIndex; + + public int TotalSize { get; } = totalSize; + } +} diff --git a/src/DynamicData.sln b/src/DynamicData.sln index e5ce72ac8..bbc9f4d7d 100644 --- a/src/DynamicData.sln +++ b/src/DynamicData.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.1.11312.151 d18.0 +VisualStudioVersion = 18.1.11312.151 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicData", "DynamicData\DynamicData.csproj", "{FE903921-6C55-40E3-9A16-4127ECACC12C}" EndProject @@ -24,6 +24,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicData.Tests", "Dynami EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicData.Benchmarks", "DynamicData.Benchmarks\DynamicData.Benchmarks.csproj", "{42566F48-05FC-483E-8B2F-D0EA4F28E870}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicData.Reactive", "DynamicData.Reactive\DynamicData.Reactive.csproj", "{B95120A9-0815-41A0-93B0-D6D8FCE02487}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicData.Reactive.Tests", "DynamicData.Reactive.Tests\DynamicData.Reactive.Tests.csproj", "{F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -80,6 +84,38 @@ Global {42566F48-05FC-483E-8B2F-D0EA4F28E870}.Release|x64.Build.0 = Release|Any CPU {42566F48-05FC-483E-8B2F-D0EA4F28E870}.Release|x86.ActiveCfg = Release|Any CPU {42566F48-05FC-483E-8B2F-D0EA4F28E870}.Release|x86.Build.0 = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|x64.ActiveCfg = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|x64.Build.0 = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|x86.ActiveCfg = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Debug|x86.Build.0 = Debug|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|Any CPU.Build.0 = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|x64.ActiveCfg = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|x64.Build.0 = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|x86.ActiveCfg = Release|Any CPU + {B95120A9-0815-41A0-93B0-D6D8FCE02487}.Release|x86.Build.0 = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|x64.ActiveCfg = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|x64.Build.0 = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|x86.ActiveCfg = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Debug|x86.Build.0 = Debug|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|Any CPU.Build.0 = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|x64.ActiveCfg = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|x64.Build.0 = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|x86.ActiveCfg = Release|Any CPU + {F83C0D77-3B43-48C1-8E67-BCCF97CBD3E0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/DynamicData/Aggregation/AggregateEnumerator.cs b/src/DynamicData/Aggregation/AggregateEnumerator.cs index be9f93264..86ec50d72 100644 --- a/src/DynamicData/Aggregation/AggregateEnumerator.cs +++ b/src/DynamicData/Aggregation/AggregateEnumerator.cs @@ -1,16 +1,26 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; -using System.Diagnostics.CodeAnalysis; -using DynamicData.Cache; +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif +/// +/// Provides members for the AggregateEnumerator class. +/// +/// The type of the T value. +/// The source value. internal sealed class AggregateEnumerator(IChangeSet source) : IAggregateChangeSet where T : notnull { + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() { foreach (var change in source) @@ -50,16 +60,33 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } +/// +/// Provides members for the AggregateEnumerator class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Same name, different generics.")] internal sealed class AggregateEnumerator(IChangeSet source) : IAggregateChangeSet where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly ChangeSet _source = source.ToConcreteType(); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() { foreach (var change in _source) @@ -85,5 +112,9 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/Aggregation/AggregateItem.cs b/src/DynamicData/Aggregation/AggregateItem.cs index cef641f87..4da4fb37f 100644 --- a/src/DynamicData/Aggregation/AggregateItem.cs +++ b/src/DynamicData/Aggregation/AggregateItem.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// An object representing added and removed items in a continuous aggregation stream. @@ -11,32 +16,12 @@ namespace DynamicData.Aggregation; /// /// Initializes a new instance of the struct. /// -/// The type. -/// The item. -public readonly struct AggregateItem(AggregateType type, TObject item) : IEquatable> +/// The type. +/// The item. +public readonly record struct AggregateItem(AggregateType Type, TObject Item) { - /// - /// Gets the type. - /// - public AggregateType Type { get; } = type; - - /// - /// Gets the item. - /// - public TObject Item { get; } = item; - - public static bool operator ==(in AggregateItem left, in AggregateItem right) => left.Equals(right); - - public static bool operator !=(in AggregateItem left, in AggregateItem right) => !(left == right); - - /// - public override bool Equals(object? obj) => obj is AggregateItem aggItem && Equals(aggItem); - - /// - public bool Equals(AggregateItem other) => - Type == other.Type && EqualityComparer.Default.Equals(Item, other.Item); - /// + /// The result of the operation. public override int GetHashCode() { var hashCode = -1719135621; diff --git a/src/DynamicData/Aggregation/AggregateType.cs b/src/DynamicData/Aggregation/AggregateType.cs index 776d18949..e277184d1 100644 --- a/src/DynamicData/Aggregation/AggregateType.cs +++ b/src/DynamicData/Aggregation/AggregateType.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// The type of aggregation. diff --git a/src/DynamicData/Aggregation/AggregationEx.cs b/src/DynamicData/Aggregation/AggregationEx.cs index c90e35520..0d7de5395 100644 --- a/src/DynamicData/Aggregation/AggregationEx.cs +++ b/src/DynamicData/Aggregation/AggregationEx.cs @@ -1,11 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// Aggregation extensions. @@ -23,7 +25,7 @@ public static IObservable> ForAggregation (IAggregateChangeSet)new AggregateEnumerator(changeSet)); } @@ -36,7 +38,7 @@ public static IObservable> ForAggregation> ForAggregation(this IObservable> source) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Select(changeSet => (IAggregateChangeSet)new AggregateEnumerator(changeSet)); } @@ -48,8 +50,13 @@ public static IObservable> ForAggregation( /// The source. /// The invalidate. /// An observable which emits the value. - public static IObservable InvalidateWhen(this IObservable source, IObservable invalidate) => - invalidate.StartWith(Unit.Default).Select(_ => source).Switch().DistinctUntilChanged(); + public static IObservable InvalidateWhen(this IObservable source, IObservable invalidate) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(invalidate); + + return invalidate.StartWith(Unit.Default).Select(_ => source).Switch().DistinctUntilChanged(); + } /// /// Used to invalidate an aggregating stream. Used when there has been an inline change. @@ -59,8 +66,13 @@ public static IObservable InvalidateWhen(this IObservable source, IObse /// The source. /// The invalidate. /// An observable which emits the value. - public static IObservable InvalidateWhen(this IObservable source, IObservable invalidate) => - invalidate.StartWith(default(TTrigger)).Select(_ => source).Switch().DistinctUntilChanged(); + public static IObservable InvalidateWhen(this IObservable source, IObservable invalidate) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(invalidate); + + return invalidate.StartWith(default(TTrigger)).Select(_ => source).Switch().DistinctUntilChanged(); + } /// /// Applies an accumulator when items are added to and removed from specified stream, @@ -108,10 +120,10 @@ internal static IObservable Accumulate(this IOb /// An observable with the accumulated value. internal static IObservable Accumulate(this IObservable> source, TResult seed, Func accessor, Func addAction, Func removeAction) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - accessor.ThrowArgumentNullExceptionIfNull(nameof(accessor)); - addAction.ThrowArgumentNullExceptionIfNull(nameof(addAction)); - removeAction.ThrowArgumentNullExceptionIfNull(nameof(removeAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(accessor); + ArgumentExceptionHelper.ThrowIfNull(addAction); + ArgumentExceptionHelper.ThrowIfNull(removeAction); return source.Scan(seed, (state, changes) => changes.Aggregate(state, (current, aggregateItem) => diff --git a/src/DynamicData/Aggregation/Avg.cs b/src/DynamicData/Aggregation/Avg.cs index 85bb3b160..2dd2a61a6 100644 --- a/src/DynamicData/Aggregation/Avg.cs +++ b/src/DynamicData/Aggregation/Avg.cs @@ -1,12 +1,18 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Aggregation; +namespace DynamicData.Reactive.Aggregation; +#else -internal readonly struct Avg(int count, TValue sum) -{ - public int Count { get; } = count; +namespace DynamicData.Aggregation; +#endif - public TValue Sum { get; } = sum; -} +/// +/// Represents the Avg record. +/// +/// The type of the TValue value. +/// The Count value. +/// The Sum value. +internal readonly record struct Avg(int Count, TValue Sum); diff --git a/src/DynamicData/Aggregation/AvgEx.cs b/src/DynamicData/Aggregation/AvgEx.cs index f042bba71..9a6b3284d 100644 --- a/src/DynamicData/Aggregation/AvgEx.cs +++ b/src/DynamicData/Aggregation/AvgEx.cs @@ -1,10 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// Average extensions. @@ -301,7 +304,11 @@ public static IObservable Avg(this IObservable> source, /// /// An observable of averages. /// - public static IObservable Avg(this IObservable> source, Func valueSelector, int emptyValue = 0) => source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / (double)values.Count); + public static IObservable Avg(this IObservable> source, Func valueSelector, int emptyValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / (double)values.Count); + } /// /// Continuous calculation of the average of the underlying data source. @@ -323,7 +330,11 @@ public static IObservable Avg(this IObservable> source, /// The value selector. /// The empty value. /// An observable of averages as a double value. - public static IObservable Avg(this IObservable> source, Func valueSelector, long emptyValue = 0) => source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / (double)values.Count); + public static IObservable Avg(this IObservable> source, Func valueSelector, long emptyValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / (double)values.Count); + } /// /// Continuous calculation of the average of the underlying data source. @@ -347,7 +358,11 @@ public static IObservable Avg(this IObservable> source, /// /// An observable of averages. /// - public static IObservable Avg(this IObservable> source, Func valueSelector, double emptyValue = 0) => source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / (double)values.Count); + public static IObservable Avg(this IObservable> source, Func valueSelector, double emptyValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / (double)values.Count); + } /// /// Continuous calculation of the average of the underlying data source. @@ -371,7 +386,11 @@ public static IObservable Avg(this IObservable> source, /// /// An observable of averages. /// - public static IObservable Avg(this IObservable> source, Func valueSelector, decimal emptyValue = 0) => source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / values.Count); + public static IObservable Avg(this IObservable> source, Func valueSelector, decimal emptyValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / values.Count); + } /// /// Averages the specified value selector. @@ -393,7 +412,11 @@ public static IObservable Avg(this IObservable> source, /// /// An observable of averages. /// - public static IObservable Avg(this IObservable> source, Func valueSelector, float emptyValue = 0) => source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / values.Count); + public static IObservable Avg(this IObservable> source, Func valueSelector, float emptyValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.AvgCalc(valueSelector, emptyValue, (current, item) => new Avg(current.Count + 1, current.Sum + item), (current, item) => new Avg(current.Count - 1, current.Sum - item), values => values.Sum / values.Count); + } /// /// Continuous calculation of the average of the underlying data source. @@ -407,13 +430,26 @@ public static IObservable Avg(this IObservable> source, /// public static IObservable Avg(this IObservable> source, Func valueSelector, float emptyValue = 0) => source.Avg(t => valueSelector(t).GetValueOrDefault(), emptyValue); + /// + /// Executes the AvgCalc operation. + /// + /// The type of the TObject value. + /// The type of the TValue value. + /// The type of the TResult value. + /// The source value. + /// The valueSelector value. + /// The fallbackValue value. + /// The addAction value. + /// The removeAction value. + /// The resultAction value. + /// The result of the operation. private static IObservable AvgCalc(this IObservable> source, Func valueSelector, TResult fallbackValue, Func, TValue, Avg> addAction, Func, TValue, Avg> removeAction, Func, TResult> resultAction) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); - addAction.ThrowArgumentNullExceptionIfNull(nameof(addAction)); - removeAction.ThrowArgumentNullExceptionIfNull(nameof(removeAction)); - resultAction.ThrowArgumentNullExceptionIfNull(nameof(resultAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + ArgumentExceptionHelper.ThrowIfNull(addAction); + ArgumentExceptionHelper.ThrowIfNull(removeAction); + ArgumentExceptionHelper.ThrowIfNull(resultAction); return source.Scan(default(Avg), (state, changes) => changes.Aggregate(state, (current, aggregateItem) => diff --git a/src/DynamicData/Aggregation/CountEx.cs b/src/DynamicData/Aggregation/CountEx.cs index 46a1f298b..a3bbb35d4 100644 --- a/src/DynamicData/Aggregation/CountEx.cs +++ b/src/DynamicData/Aggregation/CountEx.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// Count extensions. @@ -37,7 +40,11 @@ public static IObservable Count(this IObservableThe type of the object. /// The source. /// An observable which emits the count. - public static IObservable Count(this IObservable> source) => source.Accumulate(0, _ => 1, (current, increment) => current + increment, (current, increment) => current - increment); + public static IObservable Count(this IObservable> source) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.Accumulate(0, _ => 1, (current, increment) => current + increment, (current, increment) => current - increment); + } /// /// Counts the total number of items in the underlying data source. diff --git a/src/DynamicData/Aggregation/IAggregateChangeSet.cs b/src/DynamicData/Aggregation/IAggregateChangeSet.cs index bd0b72e43..62720cc9d 100644 --- a/src/DynamicData/Aggregation/IAggregateChangeSet.cs +++ b/src/DynamicData/Aggregation/IAggregateChangeSet.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// A change set which has been shaped for rapid online aggregations. diff --git a/src/DynamicData/Aggregation/MaxEx.cs b/src/DynamicData/Aggregation/MaxEx.cs index beb4d6e10..d51a2ada4 100644 --- a/src/DynamicData/Aggregation/MaxEx.cs +++ b/src/DynamicData/Aggregation/MaxEx.cs @@ -1,20 +1,32 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// Maximum and minimum value extensions. /// public static class MaxEx { - private enum MaxOrMin +/// +/// Defines values for the MaxOrMin enumeration. +/// +private enum MaxOrMin { + /// + /// The Max value. + /// Max, + /// + /// The Min value. + /// Min } @@ -31,7 +43,13 @@ private enum MaxOrMin /// public static IObservable Maximum(this IObservable> source, Func valueSelector, TResult emptyValue = default) where TObject : notnull - where TResult : struct, IComparable => source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Max, emptyValue); + where TResult : struct, IComparable + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Max, emptyValue); + } /// /// Continually calculates the maximum value from the underlying data source. @@ -48,7 +66,13 @@ public static IObservable Maximum(this IObservable Maximum(this IObservable> source, Func valueSelector, TResult emptyValue = default) where TObject : notnull where TKey : notnull - where TResult : struct, IComparable => source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Max, emptyValue); + where TResult : struct, IComparable + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Max, emptyValue); + } /// /// Continually calculates the minimum value from the underlying data source. @@ -61,7 +85,13 @@ public static IObservable Maximum(this IObserva /// A distinct observable of the minimums item. public static IObservable Minimum(this IObservable> source, Func valueSelector, TResult emptyValue = default) where TObject : notnull - where TResult : struct, IComparable => source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Min, emptyValue); + where TResult : struct, IComparable + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Min, emptyValue); + } /// /// Continually calculates the minimum value from the underlying data source. @@ -78,13 +108,29 @@ public static IObservable Minimum(this IObservable Minimum(this IObservable> source, Func valueSelector, TResult emptyValue = default) where TObject : notnull where TKey : notnull - where TResult : struct, IComparable => source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Min, emptyValue); + where TResult : struct, IComparable + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + return source.ToChangesAndCollection().Calculate(valueSelector, MaxOrMin.Min, emptyValue); + } + + /// + /// Executes the Calculate operation. + /// + /// The type of the TObject value. + /// The type of the TResult value. + /// The source value. + /// The valueSelector value. + /// The maxOrMin value. + /// The emptyValue value. + /// The result of the operation. private static IObservable Calculate(this IObservable> source, Func valueSelector, MaxOrMin maxOrMin, TResult emptyValue = default) where TResult : struct, IComparable { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Scan( default(TResult?), @@ -143,11 +189,18 @@ private static IObservable Calculate(this IObservable }).Select(t => t ?? emptyValue).DistinctUntilChanged(); } + /// + /// Executes the ToChangesAndCollection operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The result of the operation. private static IObservable> ToChangesAndCollection(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Publish( shared => @@ -158,10 +211,16 @@ private static IObservable> ToChangesAndCollection }); } + /// + /// Executes the ToChangesAndCollection operation. + /// + /// The type of the TObject value. + /// The source value. + /// The result of the operation. private static IObservable> ToChangesAndCollection(this IObservable> source) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Publish( shared => @@ -172,10 +231,22 @@ private static IObservable> ToChangesAndCollection }); } - private sealed class ChangesAndCollection(IAggregateChangeSet changes, IReadOnlyCollection collection) +/// +/// Provides members for the ChangesAndCollection class. +/// +/// The type of the T value. +/// The changes value. +/// The collection value. +private sealed class ChangesAndCollection(IAggregateChangeSet changes, IReadOnlyCollection collection) { + /// + /// Gets the Changes value. + /// public IAggregateChangeSet Changes { get; } = changes; + /// + /// Gets the Collection value. + /// public IReadOnlyCollection Collection { get; } = collection; } } diff --git a/src/DynamicData/Aggregation/StdDev.cs b/src/DynamicData/Aggregation/StdDev.cs index 81932c8d9..4e71446fb 100644 --- a/src/DynamicData/Aggregation/StdDev.cs +++ b/src/DynamicData/Aggregation/StdDev.cs @@ -1,14 +1,19 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Aggregation; - -internal readonly struct StdDev(int count, TValue sumOfItems, TValue sumOfSquares) -{ - public int Count { get; } = count; +namespace DynamicData.Reactive.Aggregation; +#else - public TValue SumOfItems { get; } = sumOfItems; +namespace DynamicData.Aggregation; +#endif - public TValue SumOfSquares { get; } = sumOfSquares; -} +/// +/// Represents the StdDev record. +/// +/// The numeric accumulator type. +/// The Count value. +/// The Mean value. +/// The SumOfSquaredDifferences value. +internal readonly record struct StdDev(int Count, T Mean, T SumOfSquaredDifferences); diff --git a/src/DynamicData/Aggregation/StdDevEx.cs b/src/DynamicData/Aggregation/StdDevEx.cs index 30599f9ec..072dd8bd4 100644 --- a/src/DynamicData/Aggregation/StdDevEx.cs +++ b/src/DynamicData/Aggregation/StdDevEx.cs @@ -1,14 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// Extensions for calculating standard deviation. /// +/// +/// Computes sample standard deviation using incremental central moments. Integral and decimal +/// selectors use decimal accumulators; their central moments must fit in . +/// Floating-point selectors retain the precision limits of double arithmetic. +/// public static class StdDevEx { /// @@ -20,7 +28,13 @@ public static class StdDevEx /// The fallback value. /// An observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, int fallbackValue) - where T : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -31,7 +45,13 @@ public static IObservable StdDev(this IObservable> sour /// The fallback value. /// An observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, long fallbackValue) - where T : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -42,7 +62,13 @@ public static IObservable StdDev(this IObservable> sour /// The fallback value. /// An observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, double fallbackValue) - where T : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -53,7 +79,13 @@ public static IObservable StdDev(this IObservable> sour /// The fallback value. /// An observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, decimal fallbackValue) - where T : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -64,7 +96,13 @@ public static IObservable StdDev(this IObservable> sou /// The fallback value. /// An observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, float fallbackValue = 0) - where T : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -77,7 +115,13 @@ public static IObservable StdDev(this IObservable> sour /// An observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, int fallbackValue) where TObject : notnull - where TKey : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -90,7 +134,13 @@ public static IObservable StdDev(this IObservableAn observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, long fallbackValue) where TObject : notnull - where TKey : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -103,7 +153,13 @@ public static IObservable StdDev(this IObservableAn observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, double fallbackValue) where TObject : notnull - where TKey : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -116,7 +172,13 @@ public static IObservable StdDev(this IObservableAn observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, decimal fallbackValue) where TObject : notnull - where TKey : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -129,7 +191,13 @@ public static IObservable StdDev(this IObservableAn observable which emits the standard deviation value. public static IObservable StdDev(this IObservable> source, Func valueSelector, float fallbackValue = 0) where TObject : notnull - where TKey : notnull => source.ForAggregation().StdDev(valueSelector, fallbackValue); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.ForAggregation().StdDev(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -139,7 +207,12 @@ public static IObservable StdDev(this IObservableThe value selector. /// The fallback value. /// An observable which emits the standard deviation value. - public static IObservable StdDev(this IObservable> source, Func valueSelector, int fallbackValue = 0) => source.StdDevCalc(t => (long)valueSelector(t), fallbackValue, (current, item) => new StdDev(current.Count + 1, current.SumOfItems + item, current.SumOfSquares + (item * item)), (current, item) => new StdDev(current.Count - 1, current.SumOfItems - item, current.SumOfSquares - (item * item)), values => Math.Sqrt(values.SumOfSquares - ((values.SumOfItems * values.SumOfItems) / values.Count)) * (1.0d / (values.Count - 1))); + public static IObservable StdDev(this IObservable> source, Func valueSelector, int fallbackValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + return source.StdDevCalc(t => (decimal)valueSelector(t), (decimal)fallbackValue).Select(value => (double)value); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -149,8 +222,12 @@ public static IObservable StdDev(this IObservableThe value selector. /// The fallback value. /// An observable which emits the standard deviation value. - public static IObservable StdDev(this IObservable> source, Func valueSelector, long fallbackValue = 0) => - source.StdDevCalc(valueSelector, fallbackValue, (current, item) => new StdDev(current.Count + 1, current.SumOfItems + item, current.SumOfSquares + (item * item)), (current, item) => new StdDev(current.Count - 1, current.SumOfItems - item, current.SumOfSquares - (item * item)), values => Math.Sqrt(values.SumOfSquares - ((values.SumOfItems * values.SumOfItems) / values.Count)) * (1.0d / (values.Count - 1))); + public static IObservable StdDev(this IObservable> source, Func valueSelector, long fallbackValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + return source.StdDevCalc(t => (decimal)valueSelector(t), (decimal)fallbackValue).Select(value => (double)value); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -160,8 +237,12 @@ public static IObservable StdDev(this IObservableThe value selector. /// The fallback value. /// An observable which emits the standard deviation value. - public static IObservable StdDev(this IObservable> source, Func valueSelector, decimal fallbackValue = 0M) => - source.StdDevCalc(valueSelector, fallbackValue, (current, item) => new StdDev(current.Count + 1, current.SumOfItems + item, current.SumOfSquares + (item * item)), (current, item) => new StdDev(current.Count - 1, current.SumOfItems - item, current.SumOfSquares - (item * item)), values => Sqrt(values.SumOfSquares - ((values.SumOfItems * values.SumOfItems) / values.Count)) * (1.0M / (values.Count - 1))); + public static IObservable StdDev(this IObservable> source, Func valueSelector, decimal fallbackValue = 0M) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + return source.StdDevCalc(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -171,7 +252,12 @@ public static IObservable StdDev(this IObservableThe value selector. /// The fallback value. /// An observable which emits the standard deviation value. - public static IObservable StdDev(this IObservable> source, Func valueSelector, double fallbackValue = 0) => source.StdDevCalc(valueSelector, fallbackValue, (current, item) => new StdDev(current.Count + 1, current.SumOfItems + item, current.SumOfSquares + (item * item)), (current, item) => new StdDev(current.Count - 1, current.SumOfItems - item, current.SumOfSquares - (item * item)), values => Math.Sqrt(values.SumOfSquares - ((values.SumOfItems * values.SumOfItems) / values.Count)) * (1.0d / (values.Count - 1))); + public static IObservable StdDev(this IObservable> source, Func valueSelector, double fallbackValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + return source.StdDevCalc(valueSelector, fallbackValue); + } /// /// Continual computation of the standard deviation of the values in the underlying data source. @@ -181,40 +267,148 @@ public static IObservable StdDev(this IObservableThe value selector. /// The fallback value. /// An observable which emits the standard deviation value. - public static IObservable StdDev(this IObservable> source, Func valueSelector, float fallbackValue = 0) => source.StdDevCalc(valueSelector, fallbackValue, (current, item) => new StdDev(current.Count + 1, current.SumOfItems + item, current.SumOfSquares + (item * item)), (current, item) => new StdDev(current.Count - 1, current.SumOfItems - item, current.SumOfSquares - (item * item)), values => Math.Sqrt(values.SumOfSquares - ((values.SumOfItems * values.SumOfItems) / values.Count)) * (1.0d / (values.Count - 1))); + public static IObservable StdDev(this IObservable> source, Func valueSelector, float fallbackValue = 0) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + return source.StdDevCalc(t => valueSelector(t), fallbackValue); + } - private static IObservable StdDevCalc(this IObservable> source, Func valueSelector, TResult fallbackValue, Func, TValue, StdDev> addAction, Func, TValue, StdDev> removeAction, Func, TResult> resultAction) + /// + /// Executes the StdDevCalc operation. + /// + /// The type of the TObject value. + /// The source value. + /// The valueSelector value. + /// The fallbackValue value. + /// The result of the operation. + private static IObservable StdDevCalc(this IObservable> source, Func valueSelector, double fallbackValue) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.Scan( + default(StdDev), + (state, changes) => + { + foreach (var aggregateItem in changes) + { + state = aggregateItem.Type == AggregateType.Add ? Add(state, valueSelector(aggregateItem.Item)) : Remove(state, valueSelector(aggregateItem.Item)); + } + + return state; + }).Select(values => values.Count < 2 ? fallbackValue : Math.Sqrt(Math.Max(values.SumOfSquaredDifferences, 0D) / (values.Count - 1))); + } + + /// + /// Executes the StdDevCalc operation. + /// + /// The type of the TObject value. + /// The source value. + /// The valueSelector value. + /// The fallbackValue value. + /// The result of the operation. + private static IObservable StdDevCalc(this IObservable> source, Func valueSelector, decimal fallbackValue) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); + + return source.Scan( + default(StdDev), + (state, changes) => + { + foreach (var aggregateItem in changes) + { + state = aggregateItem.Type == AggregateType.Add ? Add(state, valueSelector(aggregateItem.Item)) : Remove(state, valueSelector(aggregateItem.Item)); + } + + return state; + }).Select(values => values.Count < 2 ? fallbackValue : Sqrt(Math.Max(values.SumOfSquaredDifferences, 0M) / (values.Count - 1))); + } + + private static StdDev Add(StdDev current, double item) + { + var count = current.Count + 1; + var delta = item - current.Mean; + var mean = current.Mean + (delta / count); + var delta2 = item - mean; + return new StdDev(count, mean, current.SumOfSquaredDifferences + (delta * delta2)); + } + + private static StdDev Remove(StdDev current, double item) + { + if (current.Count <= 1) + { + return default; + } + + var count = current.Count - 1; + var delta = item - current.Mean; + var mean = current.Mean - (delta / count); + if (count == 1) + { + return new StdDev(count, mean, 0D); + } + + var delta2 = item - mean; + return new StdDev(count, mean, current.SumOfSquaredDifferences - (delta * delta2)); + } + + private static StdDev Add(StdDev current, decimal item) + { + var count = current.Count + 1; + var delta = item - current.Mean; + var mean = current.Mean + (delta / count); + var delta2 = item - mean; + return new StdDev(count, mean, current.SumOfSquaredDifferences + (delta * delta2)); + } + + private static StdDev Remove(StdDev current, decimal item) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); - addAction.ThrowArgumentNullExceptionIfNull(nameof(addAction)); - removeAction.ThrowArgumentNullExceptionIfNull(nameof(removeAction)); - resultAction.ThrowArgumentNullExceptionIfNull(nameof(resultAction)); + if (current.Count <= 1) + { + return default; + } + + var count = current.Count - 1; + var delta = item - current.Mean; + var mean = current.Mean - (delta / count); + if (count == 1) + { + return new StdDev(count, mean, 0M); + } - return source.Scan(default(StdDev), (state, changes) => - changes.Aggregate(state, (current, aggregateItem) => - aggregateItem.Type == AggregateType.Add ? addAction(current, valueSelector(aggregateItem.Item)) : removeAction(current, valueSelector(aggregateItem.Item)))).Select(values => values.Count < 2 ? fallbackValue : resultAction(values)); + var delta2 = item - mean; + return new StdDev(count, mean, current.SumOfSquaredDifferences - (delta * delta2)); } - private static decimal Sqrt(decimal x, decimal epsilon = 0.0M) + /// + /// Executes the Sqrt operation. + /// + /// The x value. + /// The result of the operation. + private static decimal Sqrt(decimal x) { if (x < 0) { throw new OverflowException("Cannot calculate square root from a negative number"); } - decimal current = (decimal)Math.Sqrt((double)x), previous; - do + var current = (decimal)Math.Sqrt((double)x); + var previous = 0M; + while (current != 0M) { - previous = current; - if (previous == 0.0M) + var next = (current + (x / current)) / 2; + // Decimal rounding can alternate between two adjacent values. + if (next == current || next == previous) { - return 0; + return next; } - current = (previous + (x / previous)) / 2; + previous = current; + current = next; } - while (Math.Abs(previous - current) > epsilon); + return current; } } diff --git a/src/DynamicData/Aggregation/SumEx.cs b/src/DynamicData/Aggregation/SumEx.cs index 6d3f59a9a..a476f2078 100644 --- a/src/DynamicData/Aggregation/SumEx.cs +++ b/src/DynamicData/Aggregation/SumEx.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Aggregation; +#else namespace DynamicData.Aggregation; +#endif /// /// Aggregation extensions. @@ -238,8 +243,8 @@ public static IObservable Sum(this IObservable> source, /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0, valueSelector, (current, value) => current + value, (current, value) => current - value); } @@ -251,7 +256,11 @@ public static IObservable Sum(this IObservable> s /// The source. /// The value selector. /// An observable which emits the summed value. - public static IObservable Sum(this IObservable> source, Func valueSelector) => source.Accumulate(0, t => valueSelector(t).GetValueOrDefault(), (current, value) => current + value, (current, value) => current - value); + public static IObservable Sum(this IObservable> source, Func valueSelector) + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.Accumulate(0, t => valueSelector(t).GetValueOrDefault(), (current, value) => current + value, (current, value) => current - value); + } /// /// Continual computes the sum of values matching the value selector. @@ -262,8 +271,8 @@ public static IObservable Sum(this IObservable> s /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0, valueSelector, (current, value) => current + value, (current, value) => current - value); } @@ -277,8 +286,8 @@ public static IObservable Sum(this IObservable> /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0L, t => valueSelector(t).ValueOr(0), (current, value) => current + value, (current, value) => current - value); } @@ -292,8 +301,8 @@ public static IObservable Sum(this IObservable> /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0, valueSelector, (current, value) => current + value, (current, value) => current - value); } @@ -307,8 +316,8 @@ public static IObservable Sum(this IObservable /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0D, t => valueSelector(t).ValueOr(0), (current, value) => current + value, (current, value) => current - value); } @@ -322,8 +331,8 @@ public static IObservable Sum(this IObservable /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0, valueSelector, (current, value) => current + value, (current, value) => current - value); } @@ -337,8 +346,8 @@ public static IObservable Sum(this IObservableAn observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0M, t => valueSelector(t).ValueOr(0), (current, value) => current + value, (current, value) => current - value); } @@ -352,8 +361,8 @@ public static IObservable Sum(this IObservableAn observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0, valueSelector, (current, value) => current + value, (current, value) => current - value); } @@ -367,8 +376,8 @@ public static IObservable Sum(this IObservable> /// An observable which emits the summed value. public static IObservable Sum(this IObservable> source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Accumulate(0F, t => valueSelector(t).ValueOr(0), (current, value) => current + value, (current, value) => current - value); } diff --git a/src/DynamicData/Alias/ObservableCacheAlias.cs b/src/DynamicData/Alias/ObservableCacheAlias.cs index 12b0b3ca8..74b0d82c7 100644 --- a/src/DynamicData/Alias/ObservableCacheAlias.cs +++ b/src/DynamicData/Alias/ObservableCacheAlias.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; +namespace DynamicData.Reactive.Alias; +#else namespace DynamicData.Alias; +#endif /// /// Observable cache alias names. @@ -31,9 +34,9 @@ public static IObservable> Select> Select> SelectSafe> SelectSafe> SelectSafe, TKey>> SelectTree> Where(this I where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Filter(filter); } @@ -286,8 +289,8 @@ public static IObservable> Where(this I where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicateChanged.ThrowArgumentNullExceptionIfNull(nameof(predicateChanged)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicateChanged); return source.Filter(predicateChanged); } @@ -305,9 +308,9 @@ public static IObservable> Where(this I where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicateChanged.ThrowArgumentNullExceptionIfNull(nameof(predicateChanged)); - reapplyFilter.ThrowArgumentNullExceptionIfNull(nameof(reapplyFilter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicateChanged); + ArgumentExceptionHelper.ThrowIfNull(reapplyFilter); return source.Filter(predicateChanged, reapplyFilter); } diff --git a/src/DynamicData/Alias/ObservableListAlias.cs b/src/DynamicData/Alias/ObservableListAlias.cs index ca7d9eb7b..ce8a98be1 100644 --- a/src/DynamicData/Alias/ObservableListAlias.cs +++ b/src/DynamicData/Alias/ObservableListAlias.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Alias; +#else namespace DynamicData.Alias; +#endif /// /// Observable cache alias names. @@ -26,8 +31,8 @@ public static IObservable> Select> SelectMany> SelectMany> Where(this IObservable> source, Func predicate) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicate); return source.Filter(predicate); } @@ -81,8 +86,8 @@ public static IObservable> Where(this IObservable public static IObservable> Where(this IObservable> source, IObservable> predicate) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicate); return source.Filter(predicate); } diff --git a/src/DynamicData/Attributes.cs b/src/DynamicData/Attributes.cs index 45b01bca7..eae0232ae 100644 --- a/src/DynamicData/Attributes.cs +++ b/src/DynamicData/Attributes.cs @@ -2,6 +2,6 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Runtime.CompilerServices; - [assembly: InternalsVisibleTo("DynamicData.Tests")] +[assembly: InternalsVisibleTo("DynamicData.Reactive.Tests")] +[assembly: InternalsVisibleTo("DynamicData.Benchmarks")] diff --git a/src/DynamicData/Binding/AbstractNotifyPropertyChanged.cs b/src/DynamicData/Binding/AbstractNotifyPropertyChanged.cs index e24b07843..df56b0f1f 100644 --- a/src/DynamicData/Binding/AbstractNotifyPropertyChanged.cs +++ b/src/DynamicData/Binding/AbstractNotifyPropertyChanged.cs @@ -1,13 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Reactive.Disposables; -using System.Runtime.CompilerServices; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Base class for implementing notify property changes. diff --git a/src/DynamicData/Binding/BindPaged.cs b/src/DynamicData/Binding/BindPaged.cs index 1cbe39d35..8a1a51fad 100644 --- a/src/DynamicData/Binding/BindPaged.cs +++ b/src/DynamicData/Binding/BindPaged.cs @@ -1,19 +1,27 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Diagnostics.CodeAnalysis; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; - +#endif /* * Binding for the result of the SortAndPage operator * * (Direct lift from BindVirtualized). */ + +/// +/// Provides members for the BindPaged class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The targetList value. +/// The options value. internal sealed class BindPaged<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( IObservable>> source, IList targetList, @@ -21,10 +29,19 @@ internal sealed class BindPaged<[DynamicallyAccessedMembers(DynamicallyAccessedM where TObject : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => options is null ? UseContextSortOptions() : UseProvidedOptions(options.Value); + /// + /// Executes the UseProvidedOptions operation. + /// + /// The sortAndBindOptions value. + /// The result of the operation. private IObservable> UseProvidedOptions(SortAndBindOptions sortAndBindOptions) => source.Publish(changes => { @@ -35,6 +52,10 @@ private IObservable> UseProvidedOptions(SortAndBindOpt return changes.SortAndBind(targetList, comparedChanged, sortAndBindOptions); }); + /// + /// Executes the UseContextSortOptions operation. + /// + /// The result of the operation. private IObservable> UseContextSortOptions() => Observable.Create>(observer => { @@ -44,8 +65,8 @@ private IObservable> UseContextSortOptions() => // I tried to make this work without subjects but had issues // making the comparedChanged observable to fire. Probably a deadlock - var changesSubject = new Subject>(); - var comparerSubject = new ReplaySubject>(1); + var changesSubject = new Signal>(); + var comparerSubject = new ReplaySignal>(1); // once we have the initial values, publish as normal. var subsequent = shared diff --git a/src/DynamicData/Binding/BindVirtualized.cs b/src/DynamicData/Binding/BindVirtualized.cs index 37a3e1739..7ebe9f5d6 100644 --- a/src/DynamicData/Binding/BindVirtualized.cs +++ b/src/DynamicData/Binding/BindVirtualized.cs @@ -1,17 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Diagnostics.CodeAnalysis; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; - +#endif /* * Binding for the result of the SortAndVirtualize operator */ + +/// +/// Provides members for the BindVirtualized class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The targetList value. +/// The options value. internal sealed class BindVirtualized<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( IObservable>> source, IList targetList, @@ -19,10 +27,19 @@ internal sealed class BindVirtualized<[DynamicallyAccessedMembers(DynamicallyAcc where TObject : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => options is null ? UseVirtualSortOptions() : UseProvidedOptions(options.Value); + /// + /// Executes the UseProvidedOptions operation. + /// + /// The sortAndBindOptions value. + /// The result of the operation. private IObservable> UseProvidedOptions(SortAndBindOptions sortAndBindOptions) => source.Publish(changes => { @@ -33,6 +50,10 @@ private IObservable> UseProvidedOptions(SortAndBindOpt return changes.SortAndBind(targetList, comparedChanged, sortAndBindOptions); }); + /// + /// Executes the UseVirtualSortOptions operation. + /// + /// The result of the operation. private IObservable> UseVirtualSortOptions() => Observable.Create>(observer => { @@ -42,8 +63,8 @@ private IObservable> UseVirtualSortOptions() => // I tried to make this work without subjects but had issues // making the comparedChanged observable to fire. Probably a deadlock - var changesSubject = new Subject>(); - var comparerSubject = new ReplaySubject>(1); + var changesSubject = new Signal>(); + var comparerSubject = new ReplaySignal>(1); // once we have the initial values, publish as normal. var subsequent = shared diff --git a/src/DynamicData/Binding/BindingListAdaptor.cs b/src/DynamicData/Binding/BindingListAdaptor.cs index 06cc41aff..cfbb66e61 100644 --- a/src/DynamicData/Binding/BindingListAdaptor.cs +++ b/src/DynamicData/Binding/BindingListAdaptor.cs @@ -1,14 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. #if SUPPORTS_BINDINGLIST -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using DynamicData.Cache; +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Adaptor to reflect a change set into a binding list. @@ -22,13 +28,21 @@ namespace DynamicData.Binding; public class BindingListAdaptor<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(BindingList list, int refreshThreshold = BindingOptions.DefaultResetThreshold) : IChangeSetAdaptor where T : notnull { + /// + /// The _list field. + /// private readonly BindingList _list = list ?? throw new ArgumentNullException(nameof(list)); + + /// + /// The _loaded field. + /// private bool _loaded; /// + /// The changes value. public void Adapt(IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); if (changes.TotalChanges - changes.Refreshes > refreshThreshold || !_loaded) { @@ -60,15 +74,26 @@ public class BindingListAdaptor<[DynamicallyAccessedMembers(DynamicallyAccessedM where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly Cache _cache = new(); + /// + /// The _list field. + /// private readonly BindingList _list = list ?? throw new ArgumentNullException(nameof(list)); + + /// + /// The _loaded field. + /// private bool _loaded; /// + /// The changes value. public void Adapt(IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); _cache.Clone(changes); if (changes.Count - changes.Refreshes > refreshThreshold || !_loaded) @@ -86,6 +111,11 @@ public void Adapt(IChangeSet changes) } } + /// + /// Executes the DoUpdate operation. + /// + /// The changes value. + /// The list value. private static void DoUpdate(IChangeSet changes, BindingList list) { foreach (var update in changes.ToConcreteType()) diff --git a/src/DynamicData/Binding/BindingListEventsSuspender.cs b/src/DynamicData/Binding/BindingListEventsSuspender.cs index 256d08fbe..1b061ab10 100644 --- a/src/DynamicData/Binding/BindingListEventsSuspender.cs +++ b/src/DynamicData/Binding/BindingListEventsSuspender.cs @@ -1,17 +1,29 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Reactive.Disposables; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif +/// +/// Provides members for the BindingListEventsSuspender class. +/// +/// The type of the T value. internal sealed class BindingListEventsSuspender<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T> : IDisposable { + /// + /// The _cleanUp field. + /// private readonly IDisposable _cleanUp; + /// + /// Initializes a new instance of the class. + /// + /// The list value. public BindingListEventsSuspender(BindingList list) { list.RaiseListChangedEvents = false; @@ -24,5 +36,8 @@ public BindingListEventsSuspender(BindingList list) }); } + /// + /// Executes the Dispose operation. + /// public void Dispose() => _cleanUp.Dispose(); } diff --git a/src/DynamicData/Binding/BindingListEx.cs b/src/DynamicData/Binding/BindingListEx.cs index 1b5804bba..0031aef96 100644 --- a/src/DynamicData/Binding/BindingListEx.cs +++ b/src/DynamicData/Binding/BindingListEx.cs @@ -1,14 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Reactive; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Extensions to convert an binding list into a dynamic stream. @@ -34,7 +33,7 @@ public static IObservable> ObserveCollectionC public static IObservable> ToObservableChangeSet<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this BindingList source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return ToObservableChangeSet, T>(source); } @@ -55,8 +54,8 @@ public static IObservable> ObserveCollectionC where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return ToObservableChangeSet, TObject>(source).AddKey(keySelector); } @@ -74,7 +73,7 @@ public static IObservable> ToObservableChangeSet(t where TCollection : IBindingList, IEnumerable where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>( observer => @@ -133,12 +132,18 @@ public static IObservable> ToObservableChangeSet(t }); } + /// + /// Executes the Clone operation. + /// + /// The type of the T value. + /// The source value. + /// The changes value. internal static void Clone<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this BindingList source, IEnumerable> changes) where T : notnull { // ** Copied from ListEx for binding list specific changes - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(changes); foreach (var item in changes) { @@ -146,6 +151,13 @@ public static IObservable> ToObservableChangeSet(t } } + /// + /// Executes the Clone operation. + /// + /// The type of the T value. + /// The source value. + /// The item value. + /// The equalityComparer value. private static void Clone<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this BindingList source, Change item, IEqualityComparer equalityComparer) where T : notnull { diff --git a/src/DynamicData/Binding/BindingOptions.cs b/src/DynamicData/Binding/BindingOptions.cs index eb2d30934..3a316863b 100644 --- a/src/DynamicData/Binding/BindingOptions.cs +++ b/src/DynamicData/Binding/BindingOptions.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// System wide default values for binding operators. diff --git a/src/DynamicData/Binding/ExpressionBuilder.cs b/src/DynamicData/Binding/ExpressionBuilder.cs index a34bf3e14..874b6ab76 100644 --- a/src/DynamicData/Binding/ExpressionBuilder.cs +++ b/src/DynamicData/Binding/ExpressionBuilder.cs @@ -1,17 +1,29 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Linq; using System.Reflection; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif +/// +/// Provides members for the ExpressionBuilder class. +/// internal static class ExpressionBuilder { + /// + /// Executes the GetMembers operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The source value. + /// The result of the operation. public static IEnumerable GetMembers(this Expression> source) { var memberExpression = source.Body as MemberExpression; @@ -22,6 +34,11 @@ public static IEnumerable GetMembers(this } } + /// + /// Executes the CreatePropertyChangedFactory operation. + /// + /// The source value. + /// The result of the operation. internal static Func> CreatePropertyChangedFactory(this Expression source) { if ((source is not MemberExpression { Member: PropertyInfo property }) @@ -37,6 +54,11 @@ internal static Func> CreatePropertyChangedFactory(thi .Select(static _ => Unit.Default); } + /// + /// Executes the CreateInvoker operation. + /// + /// The source value. + /// The result of the operation. internal static Func CreateInvoker(this Expression source) { switch (source) @@ -67,6 +89,13 @@ internal static Func> CreatePropertyChangedFactory(thi } } + /// + /// Executes the GetMember operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The expression value. + /// The result of the operation. internal static MemberInfo GetMember(this Expression> expression) { if (expression is null) @@ -77,6 +106,13 @@ internal static MemberInfo GetMember(this Expression + /// Executes the SplitIntoSteps operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The expression value. + /// The result of the operation. internal static IEnumerable SplitIntoSteps(this Expression> expression) { var currentStep = expression.Body; @@ -103,6 +139,13 @@ internal static IEnumerable SplitIntoSteps(this } } + /// + /// Executes the GetProperty operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The expression value. + /// The result of the operation. internal static PropertyInfo GetProperty(this Expression> expression) { if (expression.GetMember() is not PropertyInfo property) @@ -113,6 +156,11 @@ internal static PropertyInfo GetProperty(this Expression + /// Executes the GetProperty operation. + /// + /// The expression value. + /// The result of the operation. internal static PropertyInfo GetProperty(this MemberExpression expression) { if (expression.Member is not PropertyInfo property) @@ -123,6 +171,13 @@ internal static PropertyInfo GetProperty(this MemberExpression expression) return property; } + /// + /// Executes the ToCacheKey operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The expression value. + /// The result of the operation. internal static string ToCacheKey(this Expression> expression) where TObject : INotifyPropertyChanged { @@ -143,6 +198,11 @@ internal static string ToCacheKey(this Expression + /// Executes the GetMemberInfo operation. + /// + /// The lambda value. + /// The result of the operation. private static MemberInfo GetMemberInfo(LambdaExpression lambda) { if (lambda is null) diff --git a/src/DynamicData/Binding/IEvaluateAware.cs b/src/DynamicData/Binding/IEvaluateAware.cs index 6f4ce4206..06a5fa4e9 100644 --- a/src/DynamicData/Binding/IEvaluateAware.cs +++ b/src/DynamicData/Binding/IEvaluateAware.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Implement on an object and use in conjunction with InvokeEvaluate operator diff --git a/src/DynamicData/Binding/IIndexAware.cs b/src/DynamicData/Binding/IIndexAware.cs index dc3a8d825..fd731f8ae 100644 --- a/src/DynamicData/Binding/IIndexAware.cs +++ b/src/DynamicData/Binding/IIndexAware.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Implement on an object and use in conjunction with UpdateIndex operator diff --git a/src/DynamicData/Binding/INotifyCollectionChangedSuspender.cs b/src/DynamicData/Binding/INotifyCollectionChangedSuspender.cs index d0a75cc81..1eaab65ff 100644 --- a/src/DynamicData/Binding/INotifyCollectionChangedSuspender.cs +++ b/src/DynamicData/Binding/INotifyCollectionChangedSuspender.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Represents an observable collection where collection changed and count notifications can be suspended. diff --git a/src/DynamicData/Binding/IObservableCollection.cs b/src/DynamicData/Binding/IObservableCollection.cs index 4358877b5..bfb5d69a8 100644 --- a/src/DynamicData/Binding/IObservableCollection.cs +++ b/src/DynamicData/Binding/IObservableCollection.cs @@ -3,9 +3,13 @@ // See the LICENSE file in the project root for full license information. using System.Collections.Specialized; -using System.ComponentModel; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// An override of observable collection which allows the suspension of notifications. diff --git a/src/DynamicData/Binding/IObservableCollectionAdaptor.cs b/src/DynamicData/Binding/IObservableCollectionAdaptor.cs index a8f2d420b..0f6d29d2b 100644 --- a/src/DynamicData/Binding/IObservableCollectionAdaptor.cs +++ b/src/DynamicData/Binding/IObservableCollectionAdaptor.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Represents an adaptor which is used to update observable collection from diff --git a/src/DynamicData/Binding/IObservableListEx.cs b/src/DynamicData/Binding/IObservableListEx.cs index cf7d3a37a..55cc77b5f 100644 --- a/src/DynamicData/Binding/IObservableListEx.cs +++ b/src/DynamicData/Binding/IObservableListEx.cs @@ -1,21 +1,23 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections.ObjectModel; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// -/// Extensions to convert a dynamic stream out to an . +/// Extensions to convert a dynamic stream out to an IObservableList<T>. /// public static class IObservableListEx { /// - /// Binds the results to the specified . Unlike - /// binding to a which loses the - /// ability to refresh items, binding to an . + /// Binds the results to the specified IObservableList<T>. Unlike + /// binding to a ReadOnlyObservableCollection<T> which loses the + /// ability to refresh items, binding to an IObservableList<T>. /// allows for refresh changes to be preserved and keeps the list read-only. /// /// The type of the object. @@ -26,10 +28,7 @@ public static class IObservableListEx public static IObservable> BindToObservableList(this IObservable> source, out IObservableList observableList) where TObject : notnull { - if (source is null) - { - throw new ArgumentNullException(nameof(source)); - } + ArgumentExceptionHelper.ThrowIfNull(source); // Load our source list with the change set. // Each change set we need to convert to remove the key. @@ -43,9 +42,9 @@ public static IObservable> BindToObservableList(thi } /// - /// Binds the results to the specified . Unlike - /// binding to a which loses the - /// ability to refresh items, binding to an . + /// Binds the results to the specified IObservableList<T>. Unlike + /// binding to a ReadOnlyObservableCollection<T> which loses the + /// ability to refresh items, binding to an IObservableList<T>. /// allows for refresh changes to be preserved and keeps the list read-only. /// /// The type of the object. @@ -58,10 +57,7 @@ public static IObservable> BindToObservableList> BindToObservableList - /// Binds the results to the specified . Unlike - /// binding to a which loses the - /// ability to refresh items, binding to an . + /// Binds the results to the specified IObservableList<T>. Unlike + /// binding to a ReadOnlyObservableCollection<T> which loses the + /// ability to refresh items, binding to an IObservableList<T>. /// allows for refresh changes to be preserved and keeps the list read-only. /// /// The type of the object. @@ -90,10 +86,7 @@ public static IObservable> BindToObservableList< where TObject : notnull where TKey : notnull { - if (source is null) - { - throw new ArgumentNullException(nameof(source)); - } + ArgumentExceptionHelper.ThrowIfNull(source); // Load our source list with the change set. // Each change set we need to convert to remove the key. @@ -135,14 +128,14 @@ public static IObservable> BindToObservableList< } /// - /// Converts a to + /// Converts a IChangeSet<TObject, TKey> to IChangeSet<TObject> /// which allows for binding a cache to a list. /// /// The type of the object. /// The type of the key. /// The source change set. /// The list needed to support refresh. - /// The down casted . + /// The down casted IChangeSet<TObject>. private static ChangeSet RemoveKey(this IChangeSet changeSetWithKey, IExtendedList list) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Binding/ISortedObservableCollectionAdaptor.cs b/src/DynamicData/Binding/ISortedObservableCollectionAdaptor.cs index 4188c4ef0..168360394 100644 --- a/src/DynamicData/Binding/ISortedObservableCollectionAdaptor.cs +++ b/src/DynamicData/Binding/ISortedObservableCollectionAdaptor.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Represents an adaptor which is used to update observable collection from diff --git a/src/DynamicData/Binding/NotifyPropertyChangedEx.cs b/src/DynamicData/Binding/NotifyPropertyChangedEx.cs index 3c3ac0924..3e9def4f2 100644 --- a/src/DynamicData/Binding/NotifyPropertyChangedEx.cs +++ b/src/DynamicData/Binding/NotifyPropertyChangedEx.cs @@ -2,11 +2,14 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive.Linq; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Property changes notification. @@ -23,9 +26,9 @@ public static class NotifyPropertyChangedEx public static IObservable WhenAnyPropertyChanged(this TObject source, params string[] propertiesToMonitor) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); - return Observable.FromEventPattern(handler => source.PropertyChanged += handler, handler => source.PropertyChanged -= handler).Where(x => propertiesToMonitor.Length == 0 || propertiesToMonitor.Contains(x.EventArgs.PropertyName!)).Select(_ => source); + return Observable.FromEventPattern(handler => source.PropertyChanged += handler, handler => source.PropertyChanged -= handler).Where(x => propertiesToMonitor.Length == 0 || propertiesToMonitor.Contains(x.EventArgs.PropertyName!)).Select(_ => source); } /// @@ -45,9 +48,9 @@ public static class NotifyPropertyChangedEx public static IObservable WhenChanged(this TObject source, Expression> p1, Func resultSelector, Func? p1Fallback = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - p1.ThrowArgumentNullExceptionIfNull(nameof(p1)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(p1); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.WhenChanged(p1, true, p1Fallback).Select(v => resultSelector(source, v)); } @@ -72,10 +75,10 @@ public static class NotifyPropertyChangedEx public static IObservable WhenChanged(this TObject source, Expression> p1, Expression> p2, Func resultSelector, Func? p1Fallback = null, Func? p2Fallback = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - p1.ThrowArgumentNullExceptionIfNull(nameof(p1)); - p2.ThrowArgumentNullExceptionIfNull(nameof(p2)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(p1); + ArgumentExceptionHelper.ThrowIfNull(p2); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.WhenChanged(p1, true, p1Fallback).CombineLatest(source.WhenChanged(p2, true, p2Fallback), (v1, v2) => resultSelector(source, v1, v2)); } @@ -103,11 +106,11 @@ public static class NotifyPropertyChangedEx public static IObservable WhenChanged(this TObject source, Expression> p1, Expression> p2, Expression> p3, Func resultSelector, Func? p1Fallback = null, Func? p2Fallback = null, Func? p3Fallback = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - p1.ThrowArgumentNullExceptionIfNull(nameof(p1)); - p2.ThrowArgumentNullExceptionIfNull(nameof(p2)); - p3.ThrowArgumentNullExceptionIfNull(nameof(p3)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(p1); + ArgumentExceptionHelper.ThrowIfNull(p2); + ArgumentExceptionHelper.ThrowIfNull(p3); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.WhenChanged(p1, true, p1Fallback).CombineLatest(source.WhenChanged(p2, true, p2Fallback), source.WhenChanged(p3, true, p3Fallback), (v1, v2, v3) => resultSelector(source, v1, v2, v3)); } @@ -138,12 +141,12 @@ public static class NotifyPropertyChangedEx public static IObservable WhenChanged(this TObject source, Expression> p1, Expression> p2, Expression> p3, Expression> p4, Func resultSelector, Func? p1Fallback = null, Func? p2Fallback = null, Func? p3Fallback = null, Func? p4Fallback = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - p1.ThrowArgumentNullExceptionIfNull(nameof(p1)); - p2.ThrowArgumentNullExceptionIfNull(nameof(p2)); - p3.ThrowArgumentNullExceptionIfNull(nameof(p3)); - p4.ThrowArgumentNullExceptionIfNull(nameof(p4)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(p1); + ArgumentExceptionHelper.ThrowIfNull(p2); + ArgumentExceptionHelper.ThrowIfNull(p3); + ArgumentExceptionHelper.ThrowIfNull(p4); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.WhenChanged(p1, true, p1Fallback).CombineLatest(source.WhenChanged(p2, true, p2Fallback), source.WhenChanged(p3, true, p3Fallback), source.WhenChanged(p4, true, p4Fallback), (v1, v2, v3, v4) => resultSelector(source, v1, v2, v3, v4)); } @@ -177,13 +180,13 @@ public static class NotifyPropertyChangedEx public static IObservable WhenChanged(this TObject source, Expression> p1, Expression> p2, Expression> p3, Expression> p4, Expression> p5, Func resultSelector, Func? p1Fallback = null, Func? p2Fallback = null, Func? p3Fallback = null, Func? p4Fallback = null, Func? p5Fallback = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - p1.ThrowArgumentNullExceptionIfNull(nameof(p1)); - p2.ThrowArgumentNullExceptionIfNull(nameof(p2)); - p3.ThrowArgumentNullExceptionIfNull(nameof(p3)); - p4.ThrowArgumentNullExceptionIfNull(nameof(p4)); - p5.ThrowArgumentNullExceptionIfNull(nameof(p5)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(p1); + ArgumentExceptionHelper.ThrowIfNull(p2); + ArgumentExceptionHelper.ThrowIfNull(p3); + ArgumentExceptionHelper.ThrowIfNull(p4); + ArgumentExceptionHelper.ThrowIfNull(p5); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.WhenChanged(p1, true, p1Fallback).CombineLatest(source.WhenChanged(p2, true, p2Fallback), source.WhenChanged(p3, true, p3Fallback), source.WhenChanged(p4, true, p4Fallback), source.WhenChanged(p5, true, p5Fallback), (v1, v2, v3, v4, v5) => resultSelector(source, v1, v2, v3, v4, v5)); } @@ -220,14 +223,14 @@ public static class NotifyPropertyChangedEx public static IObservable WhenChanged(this TObject source, Expression> p1, Expression> p2, Expression> p3, Expression> p4, Expression> p5, Expression> p6, Func resultSelector, Func? p1Fallback = null, Func? p2Fallback = null, Func? p3Fallback = null, Func? p4Fallback = null, Func? p5Fallback = null, Func? p6Fallback = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - p1.ThrowArgumentNullExceptionIfNull(nameof(p1)); - p2.ThrowArgumentNullExceptionIfNull(nameof(p2)); - p3.ThrowArgumentNullExceptionIfNull(nameof(p3)); - p4.ThrowArgumentNullExceptionIfNull(nameof(p4)); - p5.ThrowArgumentNullExceptionIfNull(nameof(p5)); - p6.ThrowArgumentNullExceptionIfNull(nameof(p6)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(p1); + ArgumentExceptionHelper.ThrowIfNull(p2); + ArgumentExceptionHelper.ThrowIfNull(p3); + ArgumentExceptionHelper.ThrowIfNull(p4); + ArgumentExceptionHelper.ThrowIfNull(p5); + ArgumentExceptionHelper.ThrowIfNull(p6); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.WhenChanged(p1, true, p1Fallback).CombineLatest(source.WhenChanged(p2, true, p2Fallback), source.WhenChanged(p3, true, p3Fallback), source.WhenChanged(p4, true, p4Fallback), source.WhenChanged(p5, true, p5Fallback), source.WhenChanged(p6, true, p6Fallback), (v1, v2, v3, v4, v5, v6) => resultSelector(source, v1, v2, v3, v4, v5, v6)); } @@ -248,8 +251,8 @@ public static class NotifyPropertyChangedEx public static IObservable> WhenPropertyChanged(this TObject source, Expression> propertyAccessor, bool notifyOnInitialValue = true, Func? fallbackValue = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); var cache = ObservablePropertyFactoryCache.Instance.GetFactory(propertyAccessor); return cache.Create(source, notifyOnInitialValue).Where(pv => !pv.UnobtainableValue || (pv.UnobtainableValue && fallbackValue is not null)); @@ -270,12 +273,19 @@ public static IObservable> WhenPropertyChanged public static IObservable WhenValueChanged(this TObject source, Expression> propertyAccessor, bool notifyOnInitialValue = true, Func? fallbackValue = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); return source.WhenChanged(propertyAccessor, notifyOnInitialValue, fallbackValue); } + /// + /// Executes the GetFactory operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The expression value. + /// The result of the operation. internal static Func>> GetFactory(this Expression> expression) where TObject : INotifyPropertyChanged { @@ -283,6 +293,16 @@ internal static Func factory.Create(t, initial); } + /// + /// Executes the WhenChanged operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The source value. + /// The expression value. + /// The notifyInitial value. + /// The fallbackValue value. + /// The result of the operation. internal static IObservable WhenChanged(this TObject source, Expression> expression, bool notifyInitial = true, Func? fallbackValue = null) where TObject : INotifyPropertyChanged { diff --git a/src/DynamicData/Binding/Observable.cs b/src/DynamicData/Binding/Observable.cs deleted file mode 100644 index 3e439d160..000000000 --- a/src/DynamicData/Binding/Observable.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Reactive.Linq; - -namespace DynamicData.Binding; - -internal static class Observable -{ - public static IObservable Default { get; } = Observable.Return(default); - - public static IObservable Empty { get; } = Observable.Empty(); - - public static IObservable Never { get; } = Observable.Never(); -} diff --git a/src/DynamicData/Binding/ObservableCollectionAdaptor.cs b/src/DynamicData/Binding/ObservableCollectionAdaptor.cs index 4715aba25..a80e6acfe 100644 --- a/src/DynamicData/Binding/ObservableCollectionAdaptor.cs +++ b/src/DynamicData/Binding/ObservableCollectionAdaptor.cs @@ -1,12 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Diagnostics.CodeAnalysis; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Adaptor to reflect a change set into an observable list. @@ -19,7 +27,7 @@ namespace DynamicData.Binding; /// The number of changes before a Reset event is used. /// Use replace instead of remove / add for updates. /// Should a reset be fired for a first time load.This option is due to historic reasons where a reset would be fired for the first time load regardless of the number of changes. -/// collection. +/// collection. public class ObservableCollectionAdaptor(IObservableCollection collection, int refreshThreshold, #pragma warning disable CS9113 // Parameter is unread. bool allowReplace = true, @@ -28,7 +36,14 @@ public class ObservableCollectionAdaptor(IObservableCollection collection, where T : notnull { + /// + /// The _collection field. + /// private readonly IObservableCollection _collection = collection ?? throw new ArgumentNullException(nameof(collection)); + + /// + /// The _loaded field. + /// private bool _loaded; /// @@ -56,7 +71,7 @@ public ObservableCollectionAdaptor(IObservableCollection collection, BindingO /// The changes. public void Adapt(IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); if (changes.TotalChanges - changes.Refreshes > refreshThreshold || (!_loaded && resetOnFirstTimeLoad)) { @@ -91,7 +106,14 @@ public class ObservableCollectionAdaptor(int refreshThreshold = 2 where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly Cache _cache = new(); + + /// + /// The _loaded field. + /// private bool _loaded; /// @@ -110,8 +132,8 @@ public ObservableCollectionAdaptor(BindingOptions options) /// The collection. public void Adapt(IChangeSet changes, IObservableCollection collection) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); - collection.ThrowArgumentNullExceptionIfNull(nameof(collection)); + ArgumentExceptionHelper.ThrowIfNull(changes); + ArgumentExceptionHelper.ThrowIfNull(collection); _cache.Clone(changes); @@ -132,6 +154,11 @@ public void Adapt(IChangeSet changes, IObservableCollection + /// Executes the DoUpdate operation. + /// + /// The changes value. + /// The list value. private void DoUpdate(IChangeSet changes, IObservableCollection list) { foreach (var change in changes.ToConcreteType()) diff --git a/src/DynamicData/Binding/ObservableCollectionEx.cs b/src/DynamicData/Binding/ObservableCollectionEx.cs index 9b181ddeb..c30a68039 100644 --- a/src/DynamicData/Binding/ObservableCollectionEx.cs +++ b/src/DynamicData/Binding/ObservableCollectionEx.cs @@ -2,12 +2,14 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.Reactive; -using System.Reactive.Linq; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Extensions to convert an observable collection into a dynamic stream. @@ -32,7 +34,7 @@ public static class ObservableCollectionEx public static IObservable> ToObservableChangeSet(this ObservableCollection source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return ToObservableChangeSet, T>(source); } @@ -53,8 +55,8 @@ public static IObservable> ToObservableChangeSet, TObject>(source).AddKey(keySelector); } @@ -70,7 +72,7 @@ public static IObservable> ToObservableChangeSet> ToObservableChangeSet(this ReadOnlyObservableCollection source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return ToObservableChangeSet, T>(source); } @@ -91,8 +93,8 @@ public static IObservable> ToObservableChangeSet, TObject>(source).AddKey(keySelector); } @@ -106,12 +108,12 @@ public static IObservable> ToObservableChangeSetThe source. /// An observable that emits the change set. /// source. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1146:Use conditional access.", Justification = "net 7.0 has error when conditional access is used.")] + [SuppressMessage("Roslynator", "RCS1146:Use conditional access.", Justification = "net 7.0 has error when conditional access is used.")] public static IObservable> ToObservableChangeSet(this TCollection source) where TCollection : INotifyCollectionChanged, IEnumerable where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>( observer => diff --git a/src/DynamicData/Binding/ObservableCollectionExtended.cs b/src/DynamicData/Binding/ObservableCollectionExtended.cs index f99d9b9b4..306600d4c 100644 --- a/src/DynamicData/Binding/ObservableCollectionExtended.cs +++ b/src/DynamicData/Binding/ObservableCollectionExtended.cs @@ -2,12 +2,14 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.ComponentModel; -using System.Reactive.Disposables; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// An override of observable collection which allows the suspension of notifications. @@ -15,8 +17,14 @@ namespace DynamicData.Binding; /// The type of the item. public class ObservableCollectionExtended : ObservableCollection, IObservableCollection, IExtendedList { + /// + /// The _suspendCount field. + /// private bool _suspendCount; + /// + /// The _suspendNotifications field. + /// private bool _suspendNotifications; /// @@ -51,7 +59,7 @@ public ObservableCollectionExtended(IEnumerable collection) /// is null. public void AddRange(IEnumerable collection) { - collection.ThrowArgumentNullExceptionIfNull(nameof(collection)); + ArgumentExceptionHelper.ThrowIfNull(collection); foreach (var item in collection) { @@ -60,7 +68,7 @@ public void AddRange(IEnumerable collection) } /// - /// Inserts the elements of a collection into the at the specified index. + /// Inserts the elements of a collection into the ObservableCollectionExtended<T> at the specified index. /// /// Inserts the items at the specified index. /// The zero-based index at which the new elements should be inserted. @@ -68,7 +76,7 @@ public void AddRange(IEnumerable collection) /// is less than 0.-or- is greater than Count. public void InsertRange(IEnumerable collection, int index) { - collection.ThrowArgumentNullExceptionIfNull(nameof(collection)); + ArgumentExceptionHelper.ThrowIfNull(collection); foreach (var item in collection) { @@ -82,7 +90,7 @@ public void InsertRange(IEnumerable collection, int index) /// The items. public void Load(IEnumerable items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); CheckReentrancy(); Clear(); @@ -94,9 +102,9 @@ public void Load(IEnumerable items) } /// - /// Removes a range of elements from the . + /// Removes a range of elements from the ObservableCollectionExtended<T>. /// - /// The zero-based starting index of the range of elements to remove.The number of elements to remove. is less than 0.-or- is less than 0. and do not denote a valid range of elements in the . + /// The zero-based starting index of the range of elements to remove.The number of elements to remove. is less than 0.-or- is less than 0. and do not denote a valid range of elements in the List<T>. public void RemoveRange(int index, int count) { for (var i = 0; i < count; i++) @@ -164,7 +172,7 @@ protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e) /// The instance containing the event data. protected override void OnPropertyChanged(PropertyChangedEventArgs e) { - e.ThrowArgumentNullExceptionIfNull(nameof(e)); + ArgumentExceptionHelper.ThrowIfNull(e); if (_suspendCount && e.PropertyName == "Count") { diff --git a/src/DynamicData/Binding/ObservablePropertyFactory.cs b/src/DynamicData/Binding/ObservablePropertyFactory.cs index 4dd3fbd68..66392e36b 100644 --- a/src/DynamicData/Binding/ObservablePropertyFactory.cs +++ b/src/DynamicData/Binding/ObservablePropertyFactory.cs @@ -1,23 +1,34 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.Generic; -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +#if REACTIVE_SHIM -using DynamicData.Internal; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif +/// +/// Provides members for the ObservablePropertyFactory class. +/// +/// The type of the TObject value. +/// The type of the TProperty value. internal sealed class ObservablePropertyFactory where TObject : INotifyPropertyChanged { + /// + /// The _factory field. + /// private readonly Func>> _factory; + /// + /// Initializes a new instance of the class. + /// + /// The valueAccessor value. + /// The chain value. public ObservablePropertyFactory(Func valueAccessor, ObservablePropertyPart[] chain) { // chain is leaf-first (output of SplitIntoSteps). Reverse once to root-to-leaf order. @@ -26,6 +37,10 @@ public ObservablePropertyFactory(Func valueAccessor, Observa observer => new DeepChainSubscription(observer, source, rootToLeaf, valueAccessor, notifyInitial)); } + /// + /// Initializes a new instance of the class. + /// + /// The expression value. public ObservablePropertyFactory(Expression> expression) { // Shallow form: single property, no chain. Used when depth == 1. Skips SharedDeliveryQueue @@ -37,8 +52,13 @@ public ObservablePropertyFactory(Expression> expression observer => new SinglePropertySubscription(observer, source, memberName, accessor, notifyInitial)); } + /// + /// Executes the Create operation. + /// + /// The source value. + /// The notifyInitial value. + /// The result of the operation. public IObservable> Create(TObject source, bool notifyInitial) => _factory(source, notifyInitial); - // Single-property subscription. Attaches a direct PropertyChanged handler and forwards every // event through a DeliveryQueue. Used for x => x.Prop (depth == 1) where SharedDeliveryQueue // and Observable.FromEventPattern would be needless overhead on the hot path. @@ -47,13 +67,40 @@ public ObservablePropertyFactory(Expression> expression // is no equality dedup at the subscribe seam: a same-valued PropertyChanged firing in the // subscribe window is a legitimate event and must be delivered. The "never drop events" // contract takes precedence over avoiding a benign duplicate. - private sealed class SinglePropertySubscription : IDisposable + +/// +/// Provides members for the SinglePropertySubscription class. +/// +private sealed class SinglePropertySubscription : IDisposable { + /// + /// The _source field. + /// private readonly TObject _source; + + /// + /// The _memberName field. + /// private readonly string _memberName; + + /// + /// The _accessor field. + /// private readonly Func _accessor; + + /// + /// The _queue field. + /// private readonly DeliveryQueue> _queue; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The source value. + /// The memberName value. + /// The accessor value. + /// The notifyInitial value. public SinglePropertySubscription( IObserver> observer, TObject source, @@ -75,12 +122,20 @@ public SinglePropertySubscription( } } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _source.PropertyChanged -= OnPropertyChanged; _queue.Dispose(); } + /// + /// Executes the OnPropertyChanged operation. + /// + /// The sender value. + /// The args value. private void OnPropertyChanged(object? sender, PropertyChangedEventArgs args) { if (args.PropertyName == _memberName) @@ -88,12 +143,15 @@ private void OnPropertyChanged(object? sender, PropertyChangedEventArgs args) EmitCurrent(); } } - // Reads the current property value and forwards it through the queue. The accessor is // user code and may throw; that exception routes to OnError. The downstream OnNext call // is NOT wrapped: per the Rx contract, if the user observer throws, the exception // propagates back to whoever invoked the PropertyChanged setter, matching what a plain - // Subject.OnNext would do. + // Signal.OnNext would do. + + /// + /// Executes the EmitCurrent operation. + /// private void EmitCurrent() { PropertyValue value; @@ -110,7 +168,6 @@ private void EmitCurrent() _queue.OnNext(value); } } - // Deep-chain subscription. Encapsulates the SharedDeliveryQueue + sub-queues + per-level // SerialDisposable slots so fields are assigned in well-defined order and the signal sub-queue // never needs a forward null bootstrap. @@ -137,25 +194,75 @@ private void EmitCurrent() // notifyInitial only controls whether ProcessSignal emits the current chain value during // the InitialSetupSignal pass. There is no equality dedup at the subscribe seam: every // chain event is delivered. - private sealed class DeepChainSubscription : IDisposable + +/// +/// Provides members for the DeepChainSubscription class. +/// +private sealed class DeepChainSubscription : IDisposable { // Sentinel signal value enqueued during subscribe to perform the initial chain setup // from inside the SharedDeliveryQueue drainer. + + /// + /// The InitialSetupSignal field. + /// private const int InitialSetupSignal = -1; + /// + /// The _source field. + /// private readonly TObject _source; + + /// + /// The _rootToLeaf field. + /// private readonly ObservablePropertyPart[] _rootToLeaf; + + /// + /// The _valueAccessor field. + /// private readonly Func _valueAccessor; + + /// + /// The _notifyInitial field. + /// private readonly bool _notifyInitial; + + /// + /// The _sharedQueue field. + /// private readonly SharedDeliveryQueue _sharedQueue; + + /// + /// The _userSub field. + /// private readonly DeliverySubQueue> _userSub; + + /// + /// The _signalSub field. + /// private readonly DeliverySubQueue _signalSub; - private readonly SerialDisposable[] _levelSlots; + /// + /// The _levelSlots field. + /// + private readonly SerialDisposable[] _levelSlots; // Pre-allocated per-level notifier callbacks. Indexed by level. ResubscribeFrom reuses // these instead of allocating a fresh closure per re-walk. + + /// + /// The _levelCallbacks field. + /// private readonly Action[] _levelCallbacks; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The source value. + /// The rootToLeaf value. + /// The valueAccessor value. + /// The notifyInitial value. public DeepChainSubscription( IObserver> observer, TObject source, @@ -194,6 +301,9 @@ public DeepChainSubscription( _signalSub.OnNext(InitialSetupSignal); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { foreach (var slot in _levelSlots) @@ -206,12 +316,16 @@ public void Dispose() _sharedQueue.Dispose(); } + /// + /// Executes the ProcessSignal operation. + /// + /// The level value. private void ProcessSignal(int level) { // Drainer thread. The chain walk (Invoker / notifier Factory / ReadCurrent's accessor) // is user code and may throw; those exceptions route to OnError. The downstream // OnNext call is NOT wrapped: per the Rx contract, if the user observer throws, the - // exception propagates back through the drainer, matching what a plain Subject + // exception propagates back through the drainer, matching what a plain Signal // would do. // // The two cases (initial setup vs level-fire) collapse to: @@ -239,6 +353,10 @@ private void ProcessSignal(int level) _userSub.OnNext(value); } + /// + /// Executes the ResubscribeFrom operation. + /// + /// The startLevel value. private void ResubscribeFrom(int startLevel) { var depth = _rootToLeaf.Length; @@ -276,8 +394,12 @@ private void ResubscribeFrom(int startLevel) value = _rootToLeaf[i].Invoker(value); } } - // Root-to-leaf chain walk. Stops at null and returns an unobtainable PropertyValue. + + /// + /// Executes the ReadCurrent operation. + /// + /// The result of the operation. private PropertyValue ReadCurrent() { object? value = _source; diff --git a/src/DynamicData/Binding/ObservablePropertyFactoryCache.cs b/src/DynamicData/Binding/ObservablePropertyFactoryCache.cs index c0e67dd3d..ddfa8afb9 100644 --- a/src/DynamicData/Binding/ObservablePropertyFactoryCache.cs +++ b/src/DynamicData/Binding/ObservablePropertyFactoryCache.cs @@ -3,21 +3,44 @@ // See the LICENSE file in the project root for full license information. using System.Collections.Concurrent; -using System.ComponentModel; using System.Linq.Expressions; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif +/// +/// Provides members for the ObservablePropertyFactoryCache class. +/// internal sealed class ObservablePropertyFactoryCache { + /// + /// The Instance field. + /// public static readonly ObservablePropertyFactoryCache Instance = new(); + /// + /// The _factories field. + /// private readonly ConcurrentDictionary _factories = new(); + /// + /// Initializes a new instance of the class. + /// private ObservablePropertyFactoryCache() { } + /// + /// Executes the GetFactory operation. + /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// The expression value. + /// The result of the operation. public ObservablePropertyFactory GetFactory(Expression> expression) where TObject : INotifyPropertyChanged { diff --git a/src/DynamicData/Binding/ObservablePropertyPart.cs b/src/DynamicData/Binding/ObservablePropertyPart.cs index 9b4b1ab09..ca7e7b142 100644 --- a/src/DynamicData/Binding/ObservablePropertyPart.cs +++ b/src/DynamicData/Binding/ObservablePropertyPart.cs @@ -4,14 +4,28 @@ using System.Diagnostics; using System.Linq.Expressions; -using System.Reactive; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif +/// +/// Provides members for the ObservablePropertyPart class. +/// +/// The expression value. [DebuggerDisplay("ObservablePropertyPart<{" + nameof(expression) + "}>")] internal sealed class ObservablePropertyPart(Expression expression) { + /// + /// Gets the Invoker value. + /// public Func Invoker { get; } = expression.CreateInvoker(); + /// + /// Gets the Factory value. + /// public Func> Factory { get; } = expression.CreatePropertyChangedFactory(); } diff --git a/src/DynamicData/Binding/PropertyValue.cs b/src/DynamicData/Binding/PropertyValue.cs index 1f782386f..cff3040ad 100644 --- a/src/DynamicData/Binding/PropertyValue.cs +++ b/src/DynamicData/Binding/PropertyValue.cs @@ -1,15 +1,23 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Container holding sender and latest property value. /// +/// Gets the Sender. +/// Gets latest observed value. +/// Gets a value indicating whether flag to indicated that the value was unobtainable when observing a deeply nested struct. /// The type of the object. /// The type of the value. -public sealed class PropertyValue : IEquatable> +public sealed record PropertyValue(TObject Sender, TValue? Value, bool UnobtainableValue) { /// /// Initializes a new instance of the class. @@ -17,83 +25,21 @@ public sealed class PropertyValue : IEquatableThe sender. /// The value. public PropertyValue(TObject sender, TValue value) + : this(sender, value, default) { - Sender = sender; - Value = value; - } - - internal PropertyValue(TObject sender) - { - Sender = sender; - UnobtainableValue = true; - Value = default; } /// - /// Gets the Sender. - /// - public TObject Sender { get; } - - /// - /// Gets latest observed value. - /// - public TValue? Value { get; } - - /// - /// Gets a value indicating whether flag to indicated that the value was unobtainable when observing a deeply nested struct. - /// - internal bool UnobtainableValue { get; } - - /// - /// Implements the operator ==. - /// - /// The left. - /// The right. - /// - /// The result of the operator. - /// - public static bool operator ==(PropertyValue? left, PropertyValue? right) => Equals(left, right); - - /// - /// Implements the operator !=. + /// Initializes a new instance of the class. /// - /// The left. - /// The right. - /// - /// The result of the operator. - /// - public static bool operator !=(PropertyValue? left, PropertyValue? right) => !Equals(left, right); - - /// - public bool Equals(PropertyValue? other) + /// The sender value. + internal PropertyValue(TObject sender) + : this(sender, default, true) { - if (other is null) - { - return false; - } - - if (ReferenceEquals(this, other)) - { - return true; - } - - if (other.Value is null && Value is null) - { - return true; - } - - if (other.Value is null || Value is null) - { - return false; - } - - return EqualityComparer.Default.Equals(Sender, other.Sender) && EqualityComparer.Default.Equals(Value, other.Value); } /// - public override bool Equals(object? obj) => obj is PropertyValue propertyValue && Equals(propertyValue); - - /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -103,5 +49,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"{Sender} ({Value})"; } diff --git a/src/DynamicData/Binding/SortAndBind.cs b/src/DynamicData/Binding/SortAndBind.cs index 0bb5fe208..a38c0e8a6 100644 --- a/src/DynamicData/Binding/SortAndBind.cs +++ b/src/DynamicData/Binding/SortAndBind.cs @@ -1,16 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM -namespace DynamicData.Binding; +namespace DynamicData.Reactive.Binding; +#else +namespace DynamicData.Binding; +#endif /* * A much more optimised bind where the sort forms part of the binding. * @@ -18,15 +22,35 @@ namespace DynamicData.Binding; * collection upon every change in order that the sorted list could be transmitted to the bind operator. * */ + +/// +/// Provides members for the SortAndBind class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey> where TObject : notnull where TKey : notnull { // NB: Either comparer or comparerChanged will be used, but not both. + /// + /// The _cache field. + /// private readonly Cache _cache = new(); + + /// + /// The _sorted field. + /// private readonly IObservable> _sorted; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparer value. + /// The options value. + /// The target value. public SortAndBind(IObservable> source, IComparer comparer, SortAndBindOptions options, @@ -51,6 +75,13 @@ public SortAndBind(IObservable> source, }); } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparerChanged value. + /// The options value. + /// The target value. public SortAndBind(IObservable> source, IObservable> comparerChanged, SortAndBindOptions options, @@ -92,14 +123,28 @@ public SortAndBind(IObservable> source, return new CompositeDisposable(latestComparer, subscriber, queue); }); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _sorted; - internal sealed class SortApplicator( +/// +/// Provides members for the SortApplicator class. +/// +/// The cache value. +/// The target value. +/// The comparer value. +/// The options value. +internal sealed class SortApplicator( Cache cache, IList target, IComparer comparer, SortAndBindOptions options) { + /// + /// Executes the ApplySort operation. + /// public void ApplySort() { if (cache.Count == 0) return; @@ -109,8 +154,13 @@ public void ApplySort() Reset(sorted, fireReset); } - // apply sorting as a side effect of the observable stream. + + /// + /// Executes the ProcessChanges operation. + /// + /// The changeSet value. + /// The isFirstTimeLoad value. public void ProcessChanges(IChangeSet changeSet, bool isFirstTimeLoad) { var forceReset = isFirstTimeLoad && options.ResetOnFirstTimeLoad; @@ -134,6 +184,11 @@ public void ProcessChanges(IChangeSet changeSet, bool isFirstTime } } + /// + /// Executes the Reset operation. + /// + /// The sorted value. + /// The fireReset value. private void Reset(IEnumerable sorted, bool fireReset) { if (fireReset && target is ObservableCollectionExtended observableCollectionExtended) @@ -162,6 +217,10 @@ private void Reset(IEnumerable sorted, bool fireReset) } } + /// + /// Executes the ApplyChanges operation. + /// + /// The changes value. private void ApplyChanges(IChangeSet changes) { // iterate through collection, find sorted position and apply changes @@ -248,9 +307,19 @@ private void ApplyChanges(IChangeSet changes) } } + /// + /// Executes the GetCurrentPosition operation. + /// + /// The item value. + /// The result of the operation. private int GetCurrentPosition(TObject item) => target.GetCurrentPosition(item, comparer, options.UseBinarySearch); + /// + /// Executes the GetInsertPosition operation. + /// + /// The item value. + /// The result of the operation. private int GetInsertPosition(TObject item) => target.GetInsertPosition(item, comparer, options.UseBinarySearch); } diff --git a/src/DynamicData/Binding/SortAndBindOptions.cs b/src/DynamicData/Binding/SortAndBindOptions.cs index bf93e8afe..5d8e7b835 100644 --- a/src/DynamicData/Binding/SortAndBindOptions.cs +++ b/src/DynamicData/Binding/SortAndBindOptions.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Options for the sort and bind operator. diff --git a/src/DynamicData/Binding/SortDirection.cs b/src/DynamicData/Binding/SortDirection.cs index 84313ab99..e2aa23c5f 100644 --- a/src/DynamicData/Binding/SortDirection.cs +++ b/src/DynamicData/Binding/SortDirection.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Sort direction. diff --git a/src/DynamicData/Binding/SortExpression.cs b/src/DynamicData/Binding/SortExpression.cs index 9ff365ad2..0c9376ce5 100644 --- a/src/DynamicData/Binding/SortExpression.cs +++ b/src/DynamicData/Binding/SortExpression.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// A value expression with sort direction. diff --git a/src/DynamicData/Binding/SortExpressionComparer.cs b/src/DynamicData/Binding/SortExpressionComparer.cs index 14c7f94c4..09550ed8a 100644 --- a/src/DynamicData/Binding/SortExpressionComparer.cs +++ b/src/DynamicData/Binding/SortExpressionComparer.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Generic sort expression to help create inline sorting for the .Sort(IComparer comparer) operator. @@ -25,6 +30,9 @@ public class SortExpressionComparer : List>, IComparer public static SortExpressionComparer Descending(Func expression) => [new(expression, SortDirection.Descending)]; /// + /// The x value. + /// The y value. + /// The result of the operation. public int Compare(T? x, T? y) { foreach (var item in this) diff --git a/src/DynamicData/Binding/SortedBindingListAdaptor.cs b/src/DynamicData/Binding/SortedBindingListAdaptor.cs index 81956791a..5fc07ee8c 100644 --- a/src/DynamicData/Binding/SortedBindingListAdaptor.cs +++ b/src/DynamicData/Binding/SortedBindingListAdaptor.cs @@ -1,12 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. #if SUPPORTS_BINDINGLIST -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; - +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Represents an adaptor which is used to update a binding list from @@ -23,12 +24,16 @@ public class SortedBindingListAdaptor<[DynamicallyAccessedMembers(DynamicallyAcc where TObject : notnull where TKey : notnull { + /// + /// The _list field. + /// private readonly BindingList _list = list ?? throw new ArgumentNullException(nameof(list)); /// + /// The changes value. public void Adapt(ISortedChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); switch (changes.SortedItems.SortReason) { @@ -68,6 +73,10 @@ public void Adapt(ISortedChangeSet changes) } } + /// + /// Executes the DoUpdate operation. + /// + /// The changes value. private void DoUpdate(ISortedChangeSet changes) { foreach (var change in changes) diff --git a/src/DynamicData/Binding/SortedObservableCollectionAdaptor.cs b/src/DynamicData/Binding/SortedObservableCollectionAdaptor.cs index 21c4c3e0c..a763afb16 100644 --- a/src/DynamicData/Binding/SortedObservableCollectionAdaptor.cs +++ b/src/DynamicData/Binding/SortedObservableCollectionAdaptor.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Binding; +#else namespace DynamicData.Binding; +#endif /// /// Represents an adaptor which is used to update observable collection from @@ -44,8 +49,8 @@ public SortedObservableCollectionAdaptor(BindingOptions options) /// The collection. public void Adapt(ISortedChangeSet changes, IObservableCollection collection) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); - collection.ThrowArgumentNullExceptionIfNull(nameof(collection)); + ArgumentExceptionHelper.ThrowIfNull(changes); + ArgumentExceptionHelper.ThrowIfNull(collection); switch (changes.SortedItems.SortReason) { @@ -116,6 +121,11 @@ public void Adapt(ISortedChangeSet changes, IObservableCollection } } + /// + /// Executes the DoUpdate operation. + /// + /// The updates value. + /// The list value. private void DoUpdate(ISortedChangeSet updates, IObservableCollection list) { foreach (var update in updates) diff --git a/src/DynamicData/Cache/CacheChangeSetEx.cs b/src/DynamicData/Cache/CacheChangeSetEx.cs index 2d03df512..eb7d14c07 100644 --- a/src/DynamicData/Cache/CacheChangeSetEx.cs +++ b/src/DynamicData/Cache/CacheChangeSetEx.cs @@ -1,9 +1,17 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache; +#else namespace DynamicData.Cache; +#endif +/// +/// Provides members for the CacheChangeSetEx class. +/// internal static class CacheChangeSetEx { /// @@ -12,7 +20,7 @@ internal static class CacheChangeSetEx /// This extension is a crazy hack to cast to the concrete change set which means we no longer allocate /// as change set now inherits from List which has allocation free enumerations. /// - /// IChangeSet will be removed in a future version and instead will be used directly. + /// IChangeSet will be removed in a future version and instead ChangeSet<TObject, TKey> will be used directly. /// In the mean time I am banking that no-one has implemented a custom change set - personally I think it is very unlikely. /// /// ChangeSet Object Type. @@ -44,8 +52,8 @@ public static IChangeSet Transform new Change(change.Reason, change.Key, transformer(change.Current), change.Previous.Convert(transformer), change.CurrentIndex, change.PreviousIndex)); diff --git a/src/DynamicData/Cache/Change.cs b/src/DynamicData/Cache/Change.cs index 9593871b3..59b3cfda8 100644 --- a/src/DynamicData/Cache/Change.cs +++ b/src/DynamicData/Cache/Change.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Container to describe a single change to a cache. @@ -22,7 +26,7 @@ namespace DynamicData; /// The current. /// The index. public Change(ChangeReason reason, TKey key, TObject current, int index = -1) - : this(reason, key, current, Optional.None(), index) + : this(reason, key, current, ReactiveUI.Primitives.Optional.None, index) { } @@ -53,7 +57,7 @@ public Change(TKey key, TObject current, int currentIndex, int previousIndex) } Current = current; - Previous = Optional.None(); + Previous = ReactiveUI.Primitives.Optional.None; Key = key; Reason = ChangeReason.Moved; CurrentIndex = currentIndex; @@ -74,7 +78,7 @@ public Change(TKey key, TObject current, int currentIndex, int previousIndex) /// or /// For , must supply previous value. /// - public Change(ChangeReason reason, TKey key, TObject current, in Optional previous, int currentIndex = -1, int previousIndex = -1) + public Change(ChangeReason reason, TKey key, TObject current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) : this() { Current = current; @@ -119,7 +123,7 @@ public Change(ChangeReason reason, TKey key, TObject current, in OptionalGets the item from before the change. /// This is only when is . /// - public Optional Previous { get; } + public ReactiveUI.Primitives.Optional Previous { get; } /// /// Gets the previous index. @@ -144,9 +148,13 @@ public Change(ChangeReason reason, TKey key, TObject current, in Optional left, in Change right) => !left.Equals(right); /// + /// The other value. + /// The result of the operation. public bool Equals(Change other) => EqualityComparer.Default.Equals(Key, other.Key) && Reason == other.Reason && EqualityComparer.Default.Equals(Current, other.Current) && CurrentIndex == other.CurrentIndex && Previous.Equals(other.Previous) && PreviousIndex == other.PreviousIndex; /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -158,6 +166,7 @@ public override bool Equals(object? obj) } /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -173,5 +182,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"{Reason}, Key: {Key}, Current: {Current}, Previous: {Previous}"; } diff --git a/src/DynamicData/Cache/ChangeAwareCache.cs b/src/DynamicData/Cache/ChangeAwareCache.cs index 3230a9946..3964e1321 100644 --- a/src/DynamicData/Cache/ChangeAwareCache.cs +++ b/src/DynamicData/Cache/ChangeAwareCache.cs @@ -1,24 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using DynamicData.Cache; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A cache which captures all changes which are made to it. These changes are recorded until CaptureChanges() at which point thw changes are cleared. /// Used for creating custom operators. /// -/// +/// ICache<TObject, TKey> /// The value of the cache. /// The key of the cache. public sealed class ChangeAwareCache : ICache where TObject : notnull where TKey : notnull { + /// + /// The _data field. + /// private readonly Dictionary _data; + + /// + /// The _changes field. + /// private ChangeSet _changes; /// @@ -46,7 +55,9 @@ public ChangeAwareCache(int capacity) /// Data to populate the cache with. public ChangeAwareCache(Dictionary data) { - _data = data ?? throw new ArgumentNullException(nameof(data)); + ArgumentExceptionHelper.ThrowIfNull(data); + + _data = data; _changes = []; } @@ -62,6 +73,10 @@ public ChangeAwareCache(Dictionary data) /// public IEnumerable> KeyValues => _data; + /// + /// Executes the GetDictionary operation. + /// + /// The result of the operation. internal Dictionary GetDictionary() => _data; /// @@ -76,6 +91,8 @@ public void Add(TObject item, TKey key) } /// + /// The item value. + /// The key value. public void AddOrUpdate(TObject item, TKey key) { _changes.Add(_data.TryGetValue(key, out var existingItem) ? new Change(ChangeReason.Update, key, item, existingItem) : new Change(ChangeReason.Add, key, item)); @@ -87,7 +104,7 @@ public void AddOrUpdate(TObject item, TKey key) /// Create a change set from recorded changes and clears known changes. /// /// A change set with the key/value changes. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0301:Simplify collection initialization", Justification = "This would result in differing operation")] + [SuppressMessage("Style", "IDE0301:Simplify collection initialization", Justification = "This would result in differing operation")] public ChangeSet CaptureChanges() { if (_changes.Count == 0) @@ -109,9 +126,10 @@ public void Clear() } /// + /// The changes value. public void Clone(IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); foreach (var change in changes.ToConcreteType()) { @@ -138,7 +156,9 @@ public void Clone(IChangeSet changes) } /// - public Optional Lookup(TKey key) => _data.Lookup(key); + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _data.Lookup(key); /// /// Raises an evaluate change for the specified keys. @@ -146,7 +166,7 @@ public void Clone(IChangeSet changes) /// The keys to refresh. public void Refresh(IEnumerable keys) { - keys.ThrowArgumentNullExceptionIfNull(nameof(keys)); + ArgumentExceptionHelper.ThrowIfNull(keys); if (keys is IList list) { @@ -187,7 +207,7 @@ public void Refresh(TKey key) /// The keys. public void Remove(IEnumerable keys) { - keys.ThrowArgumentNullExceptionIfNull(nameof(keys)); + ArgumentExceptionHelper.ThrowIfNull(keys); if (keys is IList list) { @@ -206,6 +226,7 @@ public void Remove(IEnumerable keys) } /// + /// The key value. public void Remove(TKey key) { if (_data.TryGetValue(key, out var existingItem)) diff --git a/src/DynamicData/Cache/ChangeReason.cs b/src/DynamicData/Cache/ChangeReason.cs index 899295daa..aee9a5632 100644 --- a/src/DynamicData/Cache/ChangeReason.cs +++ b/src/DynamicData/Cache/ChangeReason.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// The reason for an individual change. diff --git a/src/DynamicData/Cache/ChangeSet.cs b/src/DynamicData/Cache/ChangeSet.cs index 01c65f5f9..1e7d9e91f 100644 --- a/src/DynamicData/Cache/ChangeSet.cs +++ b/src/DynamicData/Cache/ChangeSet.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A collection of changes with some arbitrary additional context. @@ -98,5 +102,6 @@ public ChangeSet(int capacity) public int Updates => this.Count(c => c.Reason == ChangeReason.Update); /// + /// The result of the operation. public override string ToString() => $"ChangeSet<{typeof(TObject).Name}.{typeof(TKey).Name}>. Count={Count}"; } diff --git a/src/DynamicData/Cache/DistinctChangeSet.cs b/src/DynamicData/Cache/DistinctChangeSet.cs index 0edd202a9..e863bc104 100644 --- a/src/DynamicData/Cache/DistinctChangeSet.cs +++ b/src/DynamicData/Cache/DistinctChangeSet.cs @@ -1,22 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the DistinctChangeSet class. +/// +/// The type of the T value. internal sealed class DistinctChangeSet : ChangeSet, IDistinctChangeSet where T : notnull { + /// + /// Initializes a new instance of the class. + /// + /// The items value. public DistinctChangeSet(IEnumerable> items) : base(items) { } + /// + /// Initializes a new instance of the class. + /// public DistinctChangeSet() { } + /// + /// Initializes a new instance of the class. + /// + /// The capacity value. public DistinctChangeSet(int capacity) : base(capacity) { diff --git a/src/DynamicData/Cache/GroupChangeSet.cs b/src/DynamicData/Cache/GroupChangeSet.cs index 43127e584..034841998 100644 --- a/src/DynamicData/Cache/GroupChangeSet.cs +++ b/src/DynamicData/Cache/GroupChangeSet.cs @@ -1,22 +1,42 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the GroupChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. internal sealed class GroupChangeSet : ChangeSet, TGroupKey>, IGroupChangeSet where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The Empty field. + /// public static new readonly IGroupChangeSet Empty = new GroupChangeSet(); + /// + /// Initializes a new instance of the class. + /// + /// The items value. public GroupChangeSet(IEnumerable, TGroupKey>> items) : base(items) { } + /// + /// Initializes a new instance of the class. + /// private GroupChangeSet() { } diff --git a/src/DynamicData/Cache/ICache.cs b/src/DynamicData/Cache/ICache.cs index b7335b4c3..42d2c8e96 100644 --- a/src/DynamicData/Cache/ICache.cs +++ b/src/DynamicData/Cache/ICache.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A cache which captures all changes which are made to it. These changes are recorded until CaptureChanges() at which point thw changes are cleared. @@ -11,7 +15,7 @@ namespace DynamicData; /// /// The type of the object. /// The type of the key. -/// +/// IQuery<TObject, TKey> public interface ICache : IQuery where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ICacheUpdater.cs b/src/DynamicData/Cache/ICacheUpdater.cs index aaeefc725..0ecdef96a 100644 --- a/src/DynamicData/Cache/ICacheUpdater.cs +++ b/src/DynamicData/Cache/ICacheUpdater.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Api for updating an intermediate cache. diff --git a/src/DynamicData/Cache/IChangeSet.cs b/src/DynamicData/Cache/IChangeSet.cs index 59301f394..45487fe74 100644 --- a/src/DynamicData/Cache/IChangeSet.cs +++ b/src/DynamicData/Cache/IChangeSet.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A collection of changes with some arbitrary additional context. diff --git a/src/DynamicData/Cache/IChangeSetAdaptor.cs b/src/DynamicData/Cache/IChangeSetAdaptor.cs index 454395795..de974a3da 100644 --- a/src/DynamicData/Cache/IChangeSetAdaptor.cs +++ b/src/DynamicData/Cache/IChangeSetAdaptor.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A simple adaptor to inject side effects into a change set observable. diff --git a/src/DynamicData/Cache/IConnectableCache.cs b/src/DynamicData/Cache/IConnectableCache.cs index 7663c0e83..4165fe54e 100644 --- a/src/DynamicData/Cache/IConnectableCache.cs +++ b/src/DynamicData/Cache/IConnectableCache.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A cache for observing and querying in memory data. diff --git a/src/DynamicData/Cache/IDistinctChangeSet.cs b/src/DynamicData/Cache/IDistinctChangeSet.cs index 1410ab6d8..1a2d27e0a 100644 --- a/src/DynamicData/Cache/IDistinctChangeSet.cs +++ b/src/DynamicData/Cache/IDistinctChangeSet.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A collection of distinct value updates. diff --git a/src/DynamicData/Cache/IGroup.cs b/src/DynamicData/Cache/IGroup.cs index 431b79c13..5974fc985 100644 --- a/src/DynamicData/Cache/IGroup.cs +++ b/src/DynamicData/Cache/IGroup.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An update stream which has been grouped by a common key. diff --git a/src/DynamicData/Cache/IGroupChangeSet.cs b/src/DynamicData/Cache/IGroupChangeSet.cs index e9a9d1f29..5375666c1 100644 --- a/src/DynamicData/Cache/IGroupChangeSet.cs +++ b/src/DynamicData/Cache/IGroupChangeSet.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A grouped change set. diff --git a/src/DynamicData/Cache/IGrouping.cs b/src/DynamicData/Cache/IGrouping.cs index b951ff715..4a73f282a 100644 --- a/src/DynamicData/Cache/IGrouping.cs +++ b/src/DynamicData/Cache/IGrouping.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a group which provides an update after any value within the group changes. @@ -50,5 +54,5 @@ public interface IGrouping /// /// The key. /// The value that is looked up. - Optional Lookup(TKey key); + ReactiveUI.Primitives.Optional Lookup(TKey key); } diff --git a/src/DynamicData/Cache/IImmutableGroupChangeSet.cs b/src/DynamicData/Cache/IImmutableGroupChangeSet.cs index 7cfdc789c..52f9c8738 100644 --- a/src/DynamicData/Cache/IImmutableGroupChangeSet.cs +++ b/src/DynamicData/Cache/IImmutableGroupChangeSet.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A grouped update collection. diff --git a/src/DynamicData/Cache/IIntermediateCache.cs b/src/DynamicData/Cache/IIntermediateCache.cs index 7ca604be0..47ce7c1d4 100644 --- a/src/DynamicData/Cache/IIntermediateCache.cs +++ b/src/DynamicData/Cache/IIntermediateCache.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An observable cache which exposes an update API. diff --git a/src/DynamicData/Cache/IKey.cs b/src/DynamicData/Cache/IKey.cs index eb7b2e351..6d027c60b 100644 --- a/src/DynamicData/Cache/IKey.cs +++ b/src/DynamicData/Cache/IKey.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents the key of an object. diff --git a/src/DynamicData/Cache/IKeyValue.cs b/src/DynamicData/Cache/IKeyValue.cs index 9782c0001..a2158f5d4 100644 --- a/src/DynamicData/Cache/IKeyValue.cs +++ b/src/DynamicData/Cache/IKeyValue.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A keyed value. diff --git a/src/DynamicData/Cache/IKeyValueCollection.cs b/src/DynamicData/Cache/IKeyValueCollection.cs index 41314fc55..f8e6afa4d 100644 --- a/src/DynamicData/Cache/IKeyValueCollection.cs +++ b/src/DynamicData/Cache/IKeyValueCollection.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A key collection which contains sorting information. diff --git a/src/DynamicData/Cache/IObservableCache.cs b/src/DynamicData/Cache/IObservableCache.cs index 8897962a6..68193c804 100644 --- a/src/DynamicData/Cache/IObservableCache.cs +++ b/src/DynamicData/Cache/IObservableCache.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A cache for observing and querying in memory data. With additional data access operators. @@ -42,5 +46,5 @@ public interface IObservableCache : IConnectableCache /// The key. /// An optional with the looked up value. - Optional Lookup(TKey key); + ReactiveUI.Primitives.Optional Lookup(TKey key); } diff --git a/src/DynamicData/Cache/IPageRequest.cs b/src/DynamicData/Cache/IPageRequest.cs index 4d5b06956..b2a4d6d0d 100644 --- a/src/DynamicData/Cache/IPageRequest.cs +++ b/src/DynamicData/Cache/IPageRequest.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a new page request. diff --git a/src/DynamicData/Cache/IPageResponse.cs b/src/DynamicData/Cache/IPageResponse.cs index c92011c3d..78e4cfaa3 100644 --- a/src/DynamicData/Cache/IPageResponse.cs +++ b/src/DynamicData/Cache/IPageResponse.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Operators; +#else namespace DynamicData.Operators; +#endif /// /// Response from the pagination operator. diff --git a/src/DynamicData/Cache/IPagedChangeSet.cs b/src/DynamicData/Cache/IPagedChangeSet.cs index 4fd88a798..7001c593e 100644 --- a/src/DynamicData/Cache/IPagedChangeSet.cs +++ b/src/DynamicData/Cache/IPagedChangeSet.cs @@ -1,11 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Operators; +#else using DynamicData.Operators; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A paged update collection. diff --git a/src/DynamicData/Cache/IQuery.cs b/src/DynamicData/Cache/IQuery.cs index 4f071c272..c14a069c0 100644 --- a/src/DynamicData/Cache/IQuery.cs +++ b/src/DynamicData/Cache/IQuery.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Exposes internal cache state to enable querying. @@ -44,5 +48,5 @@ public interface IQuery /// /// The key. /// The looked up value. - Optional Lookup(TKey key); + ReactiveUI.Primitives.Optional Lookup(TKey key); } diff --git a/src/DynamicData/Cache/ISortedChangeSet.cs b/src/DynamicData/Cache/ISortedChangeSet.cs index 8379f4992..682564be1 100644 --- a/src/DynamicData/Cache/ISortedChangeSet.cs +++ b/src/DynamicData/Cache/ISortedChangeSet.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An update collection as per the system convention additionally providing a sorted set of the underling state. diff --git a/src/DynamicData/Cache/ISortedChangeSetAdaptor.cs b/src/DynamicData/Cache/ISortedChangeSetAdaptor.cs index 0e904cf22..bbdb108e7 100644 --- a/src/DynamicData/Cache/ISortedChangeSetAdaptor.cs +++ b/src/DynamicData/Cache/ISortedChangeSetAdaptor.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A simple adaptor to inject side effects into a sorted change set observable. diff --git a/src/DynamicData/Cache/ISourceCache.cs b/src/DynamicData/Cache/ISourceCache.cs index a24d693ed..011c9a4d7 100644 --- a/src/DynamicData/Cache/ISourceCache.cs +++ b/src/DynamicData/Cache/ISourceCache.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An observable cache which exposes an update API. Used at the root diff --git a/src/DynamicData/Cache/ISourceUpdater.cs b/src/DynamicData/Cache/ISourceUpdater.cs index 10eb71f22..7e0e7383c 100644 --- a/src/DynamicData/Cache/ISourceUpdater.cs +++ b/src/DynamicData/Cache/ISourceUpdater.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// API for updating a source cache. diff --git a/src/DynamicData/Cache/IVirtualChangeSet.cs b/src/DynamicData/Cache/IVirtualChangeSet.cs index 4c86cbce7..d02c85929 100644 --- a/src/DynamicData/Cache/IVirtualChangeSet.cs +++ b/src/DynamicData/Cache/IVirtualChangeSet.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a subset of data reduced by a defined set of parameters. diff --git a/src/DynamicData/Cache/IVirtualRequest.cs b/src/DynamicData/Cache/IVirtualRequest.cs index cdbee1ee5..e47c05c58 100644 --- a/src/DynamicData/Cache/IVirtualRequest.cs +++ b/src/DynamicData/Cache/IVirtualRequest.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A request to virtualise a stream. diff --git a/src/DynamicData/Cache/IVirtualResponse.cs b/src/DynamicData/Cache/IVirtualResponse.cs index 616e2fb11..422f7af77 100644 --- a/src/DynamicData/Cache/IVirtualResponse.cs +++ b/src/DynamicData/Cache/IVirtualResponse.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Defines values used to virtualise the result set. diff --git a/src/DynamicData/Cache/IndexedItem.cs b/src/DynamicData/Cache/IndexedItem.cs index 7b5c77511..39da83232 100644 --- a/src/DynamicData/Cache/IndexedItem.cs +++ b/src/DynamicData/Cache/IndexedItem.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An item with it's index. @@ -34,9 +38,13 @@ public sealed class IndexedItem(TObject value, TKey key, int inde public TObject Value { get; } = value; /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is IndexedItem indexedKey && Equals(indexedKey); /// + /// The other value. + /// The result of the operation. public bool Equals(IndexedItem? other) { if (other is null) @@ -48,6 +56,7 @@ public bool Equals(IndexedItem? other) } /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -60,5 +69,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"Value: {Value}, Key: {Key}, CurrentIndex: {Index}"; } diff --git a/src/DynamicData/Cache/IntermediateCache.cs b/src/DynamicData/Cache/IntermediateCache.cs index 4494449a5..26bf009a8 100644 --- a/src/DynamicData/Cache/IntermediateCache.cs +++ b/src/DynamicData/Cache/IntermediateCache.cs @@ -3,10 +3,18 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Cache designed to be used for custom operator construction. It requires no key to be specified @@ -19,6 +27,9 @@ public sealed class IntermediateCache : IIntermediateCache + /// The _innerCache field. + /// private readonly ObservableCache _innerCache; /// @@ -28,7 +39,7 @@ public sealed class IntermediateCache : IIntermediateCachesource. public IntermediateCache(IObservable> source) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); _innerCache = new ObservableCache(source); } @@ -54,6 +65,9 @@ public IntermediateCache(IObservable> source) public IReadOnlyDictionary KeyValues => _innerCache.KeyValues; /// + /// The predicate value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public IObservable> Connect(Func? predicate = null, bool suppressEmptyChangeSets = true) => _innerCache.Connect(predicate, suppressEmptyChangeSets); @@ -61,23 +75,37 @@ public IObservable> Connect(Func? predi public void Dispose() => _innerCache.Dispose(); /// + /// The updateAction value. public void Edit(Action> updateAction) => _innerCache.UpdateFromIntermediate(updateAction); /// - public Optional Lookup(TKey key) => _innerCache.Lookup(key); + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _innerCache.Lookup(key); /// + /// The predicate value. + /// The result of the operation. public IObservable> Preview(Func? predicate = null) => _innerCache.Preview(predicate); /// + /// The key value. + /// The result of the operation. public IObservable> Watch(TKey key) => _innerCache.Watch(key); /// + /// The result of the operation. public IDisposable SuspendCount() => _innerCache.SuspendCount(); /// + /// The result of the operation. public IDisposable SuspendNotifications() => _innerCache.SuspendNotifications(); + /// + /// Executes the GetInitialUpdates operation. + /// + /// The filter value. + /// The result of the operation. internal IChangeSet GetInitialUpdates(Func? filter = null) => _innerCache.GetInitialUpdates(filter); } diff --git a/src/DynamicData/Cache/Internal/AbstractFilter.cs b/src/DynamicData/Cache/Internal/AbstractFilter.cs index 5e86dd997..dc397e4b7 100644 --- a/src/DynamicData/Cache/Internal/AbstractFilter.cs +++ b/src/DynamicData/Cache/Internal/AbstractFilter.cs @@ -1,29 +1,56 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the AbstractFilter class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal abstract class AbstractFilter : IFilter where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly ChangeAwareCache _cache; + /// + /// Initializes a new instance of the class. + /// + /// The cache value. + /// The filter value. protected AbstractFilter(ChangeAwareCache cache, Func? filter) { - _cache = cache ?? throw new ArgumentNullException(nameof(cache)); + ArgumentExceptionHelper.ThrowIfNull(cache); + _cache = cache; Filter = filter ?? (_ => true); } + /// + /// Gets the Filter value. + /// public Func Filter { get; } + /// + /// Executes the Refresh operation. + /// + /// The items value. + /// The result of the operation. public IChangeSet Refresh(IEnumerable> items) { // this is an internal method only so we can be sure there are no duplicate keys in the result // (therefore safe to parallelise) - Optional> Factory(KeyValuePair kv) + ReactiveUI.Primitives.Optional> Factory(KeyValuePair kv) { var existing = _cache.Lookup(kv.Key); var matches = Filter(kv.Value); @@ -40,7 +67,7 @@ Optional> Factory(KeyValuePair kv) return new Change(ChangeReason.Remove, kv.Key, kv.Value, existing); } - return Optional.None>(); + return ReactiveUI.Primitives.Optional>.None; } var result = Refresh(items, Factory); @@ -49,16 +76,37 @@ Optional> Factory(KeyValuePair kv) return _cache.CaptureChanges(); } + /// + /// Executes the Update operation. + /// + /// The updates value. + /// The result of the operation. public IChangeSet Update(IChangeSet updates) { var withFilter = GetChangesWithFilter(updates.ToConcreteType()); return ProcessResult(withFilter); } + /// + /// Executes the GetChangesWithFilter operation. + /// + /// The updates value. + /// The result of the operation. protected abstract IEnumerable GetChangesWithFilter(ChangeSet updates); - protected abstract IEnumerable> Refresh(IEnumerable> items, Func, Optional>> factory); + /// + /// Executes the Refresh operation. + /// + /// The items value. + /// The factory value. + /// The result of the operation. + protected abstract IEnumerable> Refresh(IEnumerable> items, Func, ReactiveUI.Primitives.Optional>> factory); + /// + /// Executes the ProcessResult operation. + /// + /// The source value. + /// The result of the operation. private ChangeSet ProcessResult(IEnumerable source) { // Have to process one item at a time as an item can be included multiple @@ -126,16 +174,22 @@ private ChangeSet ProcessResult(IEnumerable sou return _cache.CaptureChanges(); } - /// - /// Initializes a new instance of the struct. - /// Initializes a new instance of the class. - /// - /// If the filter is a match. - /// The change. - protected readonly struct UpdateWithFilter(bool isMatch, Change change) +/// +/// Initializes a new instance of the struct. +/// Initializes a new instance of the class. +/// +/// If the filter is a match. +/// The change. +protected readonly struct UpdateWithFilter(bool isMatch, Change change) { + /// + /// Gets the Change value. + /// public Change Change { get; } = change; + /// + /// Gets the IsMatch value. + /// public bool IsMatch { get; } = isMatch; } } diff --git a/src/DynamicData/Cache/Internal/AnonymousObservableCache.cs b/src/DynamicData/Cache/Internal/AnonymousObservableCache.cs index be5e8d189..4e5dc7640 100644 --- a/src/DynamicData/Cache/Internal/AnonymousObservableCache.cs +++ b/src/DynamicData/Cache/Internal/AnonymousObservableCache.cs @@ -3,53 +3,117 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the AnonymousObservableCache class. +/// +/// The type of the TObject value. +/// The type of the TKey value. [DebuggerDisplay("AnonymousObservableCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] internal sealed class AnonymousObservableCache : IObservableCache where TObject : notnull where TKey : notnull { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed through _cleanUp")] + /// + /// The _cache field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed through _cleanUp")] private readonly IObservableCache _cache; + + /// + /// The _cleanUp field. + /// private readonly IDisposable _cleanUp; + /// + /// Initializes a new instance of the class. + /// + /// The source value. public AnonymousObservableCache(IObservable> source) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); _cache = new ObservableCache(source); _cleanUp = _cache; } + /// + /// Initializes a new instance of the class. + /// + /// The cache value. public AnonymousObservableCache(IObservableCache cache) { - _cache = cache ?? throw new ArgumentNullException(nameof(cache)); + ArgumentExceptionHelper.ThrowIfNull(cache); + _cache = cache; _cleanUp = Disposable.Empty; } + /// + /// Gets the Count value. + /// public int Count => _cache.Count; + /// + /// Gets the CountChanged value. + /// public IObservable CountChanged => _cache.CountChanged; + /// + /// Gets the Items value. + /// public IReadOnlyList Items => _cache.Items; + /// + /// Gets the Keys value. + /// public IReadOnlyList Keys => _cache.Keys; + /// + /// Gets the KeyValues value. + /// public IReadOnlyDictionary KeyValues => _cache.KeyValues; + /// + /// Executes the Connect operation. + /// + /// The predicate value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public IObservable> Connect(Func? predicate = null, bool suppressEmptyChangeSets = true) => _cache.Connect(predicate, suppressEmptyChangeSets); - public Optional Lookup(TKey key) => _cache.Lookup(key); - + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _cache.Lookup(key); + + /// + /// Executes the Preview operation. + /// + /// The predicate value. + /// The result of the operation. public IObservable> Preview(Func? predicate = null) => _cache.Preview(predicate); + /// + /// Executes the Watch operation. + /// + /// The key value. + /// The result of the operation. public IObservable> Watch(TKey key) => _cache.Watch(key); + /// + /// Executes the Dispose operation. + /// public void Dispose() => _cleanUp.Dispose(); } diff --git a/src/DynamicData/Cache/Internal/AnonymousQuery.cs b/src/DynamicData/Cache/Internal/AnonymousQuery.cs index f83fd2018..292cabffe 100644 --- a/src/DynamicData/Cache/Internal/AnonymousQuery.cs +++ b/src/DynamicData/Cache/Internal/AnonymousQuery.cs @@ -1,22 +1,53 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the AnonymousQuery class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The cache value. internal sealed class AnonymousQuery(Cache cache) : IQuery where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly Cache _cache = cache.Clone(); + /// + /// Gets the Count value. + /// public int Count => _cache.Count; + /// + /// Gets the Items value. + /// public IEnumerable Items => _cache.Items; + /// + /// Gets the Keys value. + /// public IEnumerable Keys => _cache.Keys; + /// + /// Gets the KeyValues value. + /// public IEnumerable> KeyValues => _cache.KeyValues; - public Optional Lookup(TKey key) => _cache.Lookup(key); + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _cache.Lookup(key); } diff --git a/src/DynamicData/Cache/Internal/AsyncDisposeMany.cs b/src/DynamicData/Cache/Internal/AsyncDisposeMany.cs index 8699e1c58..3281ce4a6 100644 --- a/src/DynamicData/Cache/Internal/AsyncDisposeMany.cs +++ b/src/DynamicData/Cache/Internal/AsyncDisposeMany.cs @@ -1,75 +1,83 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif #if SUPPORTS_ASYNC_DISPOSABLE + +/// +/// Provides members for the AsyncDisposeMany class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal static class AsyncDisposeMany where TObject : notnull where TKey : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The disposalsCompletedAccessor value. + /// The result of the operation. public static IObservable> Create( IObservable> source, Action> disposalsCompletedAccessor) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - disposalsCompletedAccessor.ThrowArgumentNullExceptionIfNull(nameof(disposalsCompletedAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(disposalsCompletedAccessor); return Observable .Create>(downstreamObserver => { + var gate = new Lock(); var itemsByKey = new Dictionary(); - - var disposals = new Subject>(); - var disposalsCompleted = disposals - .Merge() - .IgnoreElements() - .Concat(Observable.Return(Unit.Default)) - .Publish() - .AutoConnect(0); + var disposalsCompleted = new ReplaySignal(1); + var pendingAsyncDisposals = 0; + var teardownStarted = false; + var teardownCompleted = false; + var disposalsFinalized = false; disposalsCompletedAccessor.Invoke(disposalsCompleted); - var sourceSubscription = source - .SynchronizeSafe() - .SubscribeSafe( - onNext: upstreamChanges => - { - downstreamObserver.OnNext(upstreamChanges); + var sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source.SynchronizeSafe(), + onNext: upstreamChanges => + { + downstreamObserver.OnNext(upstreamChanges); - foreach (var change in upstreamChanges.ToConcreteType()) + foreach (var change in upstreamChanges.ToConcreteType()) + { + switch (change.Reason) { - switch (change.Reason) - { - case ChangeReason.Update: - if (change.Previous.HasValue && !EqualityComparer.Default.Equals(change.Current, change.Previous.Value)) - TryDisposeItem(change.Previous.Value); - break; - - case ChangeReason.Remove: - TryDisposeItem(change.Current); - break; - } + case ChangeReason.Update: + if (change.Previous.HasValue && !EqualityComparer.Default.Equals(change.Current, change.Previous.Value)) + TryDisposeItem(change.Previous.Value); + break; + + case ChangeReason.Remove: + TryDisposeItem(change.Current); + break; } + } - itemsByKey.Clone(upstreamChanges); - }, - onError: error => - { - downstreamObserver.OnError(error); - TearDown(); - }, - onCompleted: () => - { - downstreamObserver.OnCompleted(); - TearDown(); - }); + itemsByKey.Clone(upstreamChanges); + }, + onError: error => + { + downstreamObserver.OnError(error); + TearDown(); + }, + onCompleted: () => + { + downstreamObserver.OnCompleted(); + TearDown(); + }); return Disposable.Create(() => { @@ -79,20 +87,37 @@ public static IObservable> Create( void TearDown() { - if (disposals.HasObservers) + TObject[] items; + + lock (gate) { - try - { - foreach (var item in itemsByKey.Values) - TryDisposeItem(item); - disposals.OnCompleted(); - itemsByKey.Clear(); - } - catch (Exception error) - { - disposals.OnError(error); - } + if (teardownStarted) + return; + + teardownStarted = true; + items = [.. itemsByKey.Values]; + itemsByKey.Clear(); + } + + try + { + foreach (var item in items) + TryDisposeItem(item); + } + catch (Exception error) + { + TryFailDisposals(error); } + + var publishCompleted = false; + lock (gate) + { + teardownCompleted = true; + publishCompleted = TryMarkDisposalsCompleted(); + } + + if (publishCompleted) + PublishDisposalsCompleted(); } void TryDisposeItem(TObject item) @@ -100,9 +125,85 @@ void TryDisposeItem(TObject item) if (item is IDisposable disposable) disposable.Dispose(); else if (item is IAsyncDisposable asyncDisposable) - disposals.OnNext(Observable.FromAsync(() => asyncDisposable.DisposeAsync().AsTask())); + TrackAsyncDisposal(asyncDisposable.DisposeAsync().AsTask()); + } + + void TrackAsyncDisposal(Task disposalTask) + { + lock (gate) + { + ++pendingAsyncDisposals; + } + + if (disposalTask.IsCompleted) + { + CompleteAsyncDisposal(disposalTask); + return; + } + + _ = disposalTask.ContinueWith( + static (completedTask, state) => ((Action)state!).Invoke(completedTask), + (Action)CompleteAsyncDisposal, + CancellationToken.None, + TaskContinuationOptions.ExecuteSynchronously, + TaskScheduler.Default); + } + + void CompleteAsyncDisposal(Task disposalTask) + { + if (disposalTask.IsFaulted) + { + TryFailDisposals(disposalTask.Exception.InnerExceptions.Count == 1 + ? disposalTask.Exception.InnerException! + : disposalTask.Exception); + } + else if (disposalTask.IsCanceled) + { + TryFailDisposals(new TaskCanceledException(disposalTask)); + } + + var publishCompleted = false; + lock (gate) + { + --pendingAsyncDisposals; + publishCompleted = TryMarkDisposalsCompleted(); + } + + if (publishCompleted) + PublishDisposalsCompleted(); + } + + bool TryMarkDisposalsCompleted() + { + if (!teardownCompleted || pendingAsyncDisposals != 0 || disposalsFinalized) + return false; + + disposalsFinalized = true; + return true; + } + + void PublishDisposalsCompleted() + { + disposalsCompleted.OnNext(Unit.Default); + disposalsCompleted.OnCompleted(); + } + + void TryFailDisposals(Exception error) + { + var publishError = false; + lock (gate) + { + if (!disposalsFinalized) + { + disposalsFinalized = true; + publishError = true; + } + } + + if (publishError) + disposalsCompleted.OnError(error); } }); } } -#endif \ No newline at end of file +#endif diff --git a/src/DynamicData/Cache/Internal/AutoRefresh.cs b/src/DynamicData/Cache/Internal/AutoRefresh.cs index ee81fe581..c7b610c6f 100644 --- a/src/DynamicData/Cache/Internal/AutoRefresh.cs +++ b/src/DynamicData/Cache/Internal/AutoRefresh.cs @@ -1,40 +1,290 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the AutoRefresh class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TAny value. +/// The source value. +/// The reEvaluator value. +/// The buffer value. +/// The scheduler value. internal sealed class AutoRefresh(IObservable> source, Func> reEvaluator, TimeSpan? buffer = null, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull { + /// + /// The _reEvaluator field. + /// private readonly Func> _reEvaluator = reEvaluator ?? throw new ArgumentNullException(nameof(reEvaluator)); + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler = scheduler ?? GlobalConfig.DefaultScheduler; + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var shared = _source.Publish(); + var queue = new DeliveryQueue>(observer); + var refreshes = new Signal>(); + var subscriptions = new Dictionary(); + var locker = new object(); + var sourceCompleted = false; + var activeSubscriptions = 0; + var isProcessingSourceChange = false; + List>? pendingRefreshes = null; - // monitor each item observable and create change - var changes = shared.MergeMany((t, k) => _reEvaluator(t, k).Select(_ => new Change(ChangeReason.Refresh, k, t))); - - // create a change set, either buffered or one item at the time IObservable> refreshChanges = buffer is null ? - changes.Select(c => new ChangeSet(new[] { c })) : - changes.Buffer(buffer.Value, _scheduler).Where(list => list.Count > 0).Select(items => new ChangeSet(items)); + refreshes.Select(c => new ChangeSet(new[] { c })) : + refreshes.Buffer(buffer.Value, _scheduler).Where(list => list.Count > 0).Select(items => new ChangeSet(items)); + + var refreshSubscription = refreshChanges.SubscribeSafe(queue); + + var sourceSubscription = _source.Subscribe( + changes => + { + try + { + lock (locker) + { + isProcessingSourceChange = true; + + foreach (var change in changes) + { + switch (change.Reason) + { + case ChangeReason.Add: + case ChangeReason.Update: + AddSubscription(change.Current, change.Key); + break; + + case ChangeReason.Remove: + RemoveSubscription(change.Key); + break; + } + } + } + + queue.OnNext(changes); + + List>? refreshesToEmit; + lock (locker) + { + isProcessingSourceChange = false; + refreshesToEmit = pendingRefreshes; + pendingRefreshes = null; + } + + if (refreshesToEmit is not null) + { + foreach (var refresh in refreshesToEmit) + { + refreshes.OnNext(refresh); + } + } + } + catch (Exception error) + { + lock (locker) + { + isProcessingSourceChange = false; + pendingRefreshes = null; + } + + queue.OnError(error); + } + }, + queue.OnError, + () => + { + var shouldComplete = false; + lock (locker) + { + sourceCompleted = true; + shouldComplete = activeSubscriptions == 0; + } + + if (shouldComplete) + { + refreshes.OnCompleted(); + } + }); + + return new CompositeDisposable( + queue, + sourceSubscription, + refreshSubscription, + Disposable.Create( + () => + { + lock (locker) + { + foreach (var subscription in subscriptions.Values) + { + subscription.Dispose(); + } + + subscriptions.Clear(); + } + }), + refreshes); + + void AddSubscription(TObject item, TKey key) + { + RemoveSubscription(key); + + var observable = _reEvaluator(item, key); + var child = new ChildSubscription(); + subscriptions[key] = child; + activeSubscriptions++; + + var isSubscribing = true; + + try + { + var subscription = observable.Subscribe( + onNext: _ => + { + if (Volatile.Read(ref isSubscribing)) + { + return; + } + + var refresh = new Change(ChangeReason.Refresh, key, item); + var emitNow = false; + + lock (locker) + { + if (!child.IsActive || !subscriptions.TryGetValue(key, out var existingSubscription) || !ReferenceEquals(child, existingSubscription)) + { + return; + } - // publish refreshes and underlying changes - var queue = new SharedDeliveryQueue(); - var publisher = shared.SynchronizeSafe(queue).Merge(refreshChanges.SynchronizeSafe(queue)).SubscribeSafe(observer); + if (isProcessingSourceChange) + { + pendingRefreshes ??= []; + pendingRefreshes.Add(refresh); + } + else + { + emitNow = true; + } + } - return new CompositeDisposable(publisher, shared.Connect(), queue); + if (emitNow) + { + refreshes.OnNext(refresh); + } + }, + onError: _ => CompleteSubscription(key, child), + onCompleted: () => CompleteSubscription(key, child)); + + child.SetDisposable(subscription); + } + catch + { + RemoveSubscription(key); + throw; + } + finally + { + Volatile.Write(ref isSubscribing, false); + } + } + + void RemoveSubscription(TKey key) + { +#if NET8_0_OR_GREATER + if (!subscriptions.Remove(key, out var subscription)) +#else + if (!subscriptions.TryGetValue(key, out var subscription) || !subscriptions.Remove(key)) +#endif + { + return; + } + + if (!subscription.TryDispose()) + { + return; + } + + activeSubscriptions--; + pendingRefreshes?.RemoveAll(change => EqualityComparer.Default.Equals(change.Key, key)); + } + + void CompleteSubscription(TKey key, ChildSubscription subscription) + { + var shouldComplete = false; + + lock (locker) + { + if (!subscription.TryComplete()) + { + return; + } + + if (subscriptions.TryGetValue(key, out var existingSubscription) && ReferenceEquals(subscription, existingSubscription)) + { + subscriptions.Remove(key); + } + + activeSubscriptions--; + shouldComplete = sourceCompleted && activeSubscriptions == 0; + } + + if (shouldComplete) + { + refreshes.OnCompleted(); + } + } }); + + private sealed class ChildSubscription : IDisposable + { + private readonly SingleAssignmentDisposable _disposable = new(); + private int _isStopped; + + public bool IsActive => Volatile.Read(ref _isStopped) == 0; + + public void Dispose() + { + TryDispose(); + GC.SuppressFinalize(this); + } + + public void SetDisposable(IDisposable disposable) => _disposable.Disposable = disposable; + + public bool TryComplete() => TryDispose(); + + public bool TryDispose() + { + if (Interlocked.Exchange(ref _isStopped, 1) != 0) + { + return false; + } + + _disposable.Dispose(); + return true; + } + } } diff --git a/src/DynamicData/Cache/Internal/BatchIf.cs b/src/DynamicData/Cache/Internal/BatchIf.cs index 76af20a61..e4853d6f8 100644 --- a/src/DynamicData/Cache/Internal/BatchIf.cs +++ b/src/DynamicData/Cache/Internal/BatchIf.cs @@ -1,24 +1,48 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the BatchIf class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The pauseIfTrueSelector value. +/// The timeOut value. +/// The initialPauseState value. +/// The intervalTimer value. +/// The scheduler value. internal sealed class BatchIf(IObservable> source, IObservable pauseIfTrueSelector, TimeSpan? timeOut, bool initialPauseState = false, IObservable? intervalTimer = null, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull { + /// + /// The _pauseIfTrueSelector field. + /// private readonly IObservable _pauseIfTrueSelector = pauseIfTrueSelector ?? throw new ArgumentNullException(nameof(pauseIfTrueSelector)); + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler = scheduler ?? GlobalConfig.DefaultScheduler; + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Cache/Internal/Cache.cs b/src/DynamicData/Cache/Internal/Cache.cs index 0a882ad88..d5415dc28 100644 --- a/src/DynamicData/Cache/Internal/Cache.cs +++ b/src/DynamicData/Cache/Internal/Cache.cs @@ -1,42 +1,94 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. using System.Diagnostics; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the Cache class. +/// +/// The type of the TObject value. +/// The type of the TKey value. [DebuggerDisplay("Cache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] internal sealed class Cache : ICache where TObject : notnull where TKey : notnull { + /// + /// The Empty field. + /// public static readonly Cache Empty = new(); + /// + /// The _data field. + /// private readonly Dictionary _data; + /// + /// Initializes a new instance of the class. + /// + /// The capacity value. public Cache(int capacity = -1) => _data = capacity > 1 ? new Dictionary(capacity) : []; + /// + /// Initializes a new instance of the class. + /// + /// The data value. public Cache(Dictionary data) => _data = data; + /// + /// Gets the Count value. + /// public int Count => _data.Count; + /// + /// Gets the Items value. + /// public IEnumerable Items => _data.Values; + /// + /// Gets the Keys value. + /// public IEnumerable Keys => _data.Keys; + /// + /// Gets the KeyValues value. + /// public IEnumerable> KeyValues => _data; + /// + /// Executes the AddOrUpdate operation. + /// + /// The item value. + /// The key value. public void AddOrUpdate(TObject item, TKey key) => _data[key] = item; + /// + /// Executes the Clear operation. + /// public void Clear() => _data.Clear(); + /// + /// Executes the Clone operation. + /// + /// The result of the operation. public Cache Clone() => new(new Dictionary(_data)); + /// + /// Executes the Clone operation. + /// + /// The changes value. public void Clone(IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); foreach (var item in changes.ToConcreteType()) { @@ -57,7 +109,12 @@ public void Clone(IChangeSet changes) } } - public Optional Lookup(TKey key) => _data.Lookup(key); + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _data.Lookup(key); /// /// Sends a signal for operators to recalculate it's state. @@ -82,6 +139,10 @@ public void Refresh(TKey key) { } + /// + /// Executes the Remove operation. + /// + /// The keys value. public void Remove(IEnumerable keys) { if (keys is IList list) @@ -100,5 +161,9 @@ public void Remove(IEnumerable keys) } } + /// + /// Executes the Remove operation. + /// + /// The key value. public void Remove(TKey key) => _data.Remove(key); } diff --git a/src/DynamicData/Cache/Internal/CacheEx.cs b/src/DynamicData/Cache/Internal/CacheEx.cs index 8250f168e..a00adc1dd 100644 --- a/src/DynamicData/Cache/Internal/CacheEx.cs +++ b/src/DynamicData/Cache/Internal/CacheEx.cs @@ -1,11 +1,26 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the CacheEx class. +/// internal static class CacheEx { + /// + /// Executes the Clone operation. + /// + /// The type of the TKey value. + /// The type of the TObject value. + /// The source value. + /// The changes value. public static void Clone(this IDictionary source, IChangeSet changes) where TKey : notnull where TObject : notnull @@ -26,6 +41,14 @@ public static void Clone(this IDictionary source, } } + /// + /// Executes the GetInitialUpdates operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The filter value. + /// The result of the operation. public static IChangeSet GetInitialUpdates(this ChangeAwareCache source, Func? filter = null) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/Internal/CacheUpdater.cs b/src/DynamicData/Cache/Internal/CacheUpdater.cs index 8eb6eadf8..1163817d6 100644 --- a/src/DynamicData/Cache/Internal/CacheUpdater.cs +++ b/src/DynamicData/Cache/Internal/CacheUpdater.cs @@ -1,42 +1,84 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the CacheUpdater class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class CacheUpdater : ISourceUpdater where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly ICache _cache; + /// + /// The _keySelector field. + /// private readonly Func? _keySelector; + /// + /// Initializes a new instance of the class. + /// + /// The cache value. + /// The keySelector value. public CacheUpdater(ICache cache, Func? keySelector = null) { _cache = cache ?? throw new ArgumentNullException(nameof(cache)); _keySelector = keySelector; } + /// + /// Initializes a new instance of the class. + /// + /// The data value. + /// The keySelector value. public CacheUpdater(Dictionary data, Func? keySelector = null) { - data.ThrowArgumentNullExceptionIfNull(nameof(data)); + ArgumentExceptionHelper.ThrowIfNull(data); _cache = new Cache(data); _keySelector = keySelector; } + /// + /// Gets the Count value. + /// public int Count => _cache.Count; + /// + /// Gets the Items value. + /// public IEnumerable Items => _cache.Items; + /// + /// Gets the Keys value. + /// public IEnumerable Keys => _cache.Keys; + /// + /// Gets the KeyValues value. + /// public IEnumerable> KeyValues => _cache.KeyValues; + /// + /// Executes the AddOrUpdate operation. + /// + /// The items value. public void AddOrUpdate(IEnumerable items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); if (_keySelector is null) { @@ -60,14 +102,15 @@ public void AddOrUpdate(IEnumerable items) } } + /// + /// Executes the AddOrUpdate operation. + /// + /// The items value. + /// The comparer value. public void AddOrUpdate(IEnumerable items, IEqualityComparer comparer) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); - - if (comparer is null) - { - throw new ArgumentNullException(nameof(comparer)); - } + ArgumentExceptionHelper.ThrowIfNull(items); + ArgumentExceptionHelper.ThrowIfNull(comparer); if (_keySelector is null) { @@ -111,6 +154,10 @@ void AddOrUpdateImpl(TObject item) } } + /// + /// Executes the AddOrUpdate operation. + /// + /// The item value. public void AddOrUpdate(TObject item) { if (_keySelector is null) @@ -122,6 +169,11 @@ public void AddOrUpdate(TObject item) _cache.AddOrUpdate(item, key); } + /// + /// Executes the AddOrUpdate operation. + /// + /// The item value. + /// The comparer value. public void AddOrUpdate(TObject item, IEqualityComparer comparer) { if (_keySelector is null) @@ -145,6 +197,10 @@ public void AddOrUpdate(TObject item, IEqualityComparer comparer) _cache.AddOrUpdate(item, key); } + /// + /// Executes the AddOrUpdate operation. + /// + /// The itemsPairs value. public void AddOrUpdate(IEnumerable> itemsPairs) { if (itemsPairs is IList> list) @@ -164,14 +220,35 @@ public void AddOrUpdate(IEnumerable> itemsPairs) } } + /// + /// Executes the AddOrUpdate operation. + /// + /// The item value. public void AddOrUpdate(KeyValuePair item) => _cache.AddOrUpdate(item.Value, item.Key); + /// + /// Executes the AddOrUpdate operation. + /// + /// The item value. + /// The key value. public void AddOrUpdate(TObject item, TKey key) => _cache.AddOrUpdate(item, key); + /// + /// Executes the Clear operation. + /// public void Clear() => _cache.Clear(); + /// + /// Executes the Clone operation. + /// + /// The changes value. public void Clone(IChangeSet changes) => _cache.Clone(changes); + /// + /// Executes the GetKey operation. + /// + /// The item value. + /// The result of the operation. public TKey GetKey(TObject item) { if (_keySelector is null) @@ -182,6 +259,11 @@ public TKey GetKey(TObject item) return _keySelector(item); } + /// + /// Executes the GetKeyValues operation. + /// + /// The items value. + /// The result of the operation. public IEnumerable> GetKeyValues(IEnumerable items) { if (_keySelector is null) @@ -192,21 +274,35 @@ public IEnumerable> GetKeyValues(IEnumerable new KeyValuePair(_keySelector(t), t)); } + /// + /// Executes the Load operation. + /// + /// The items value. public void Load(IEnumerable items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); Clear(); AddOrUpdate(items); } - public Optional Lookup(TKey key) + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) { var item = _cache.Lookup(key); - return item.HasValue ? item.Value : Optional.None(); + return item.HasValue ? item.Value : ReactiveUI.Primitives.Optional.None; } - public Optional Lookup(TObject item) + /// + /// Executes the Lookup operation. + /// + /// The item value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TObject item) { if (_keySelector is null) { @@ -217,11 +313,18 @@ public Optional Lookup(TObject item) return Lookup(key); } + /// + /// Executes the Refresh operation. + /// public void Refresh() => _cache.Refresh(); + /// + /// Executes the Refresh operation. + /// + /// The items value. public void Refresh(IEnumerable items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); if (items is IList list) { @@ -240,9 +343,13 @@ public void Refresh(IEnumerable items) } } + /// + /// Executes the Refresh operation. + /// + /// The keys value. public void Refresh(IEnumerable keys) { - keys.ThrowArgumentNullExceptionIfNull(nameof(keys)); + ArgumentExceptionHelper.ThrowIfNull(keys); if (keys is IList list) { @@ -261,6 +368,10 @@ public void Refresh(IEnumerable keys) } } + /// + /// Executes the Refresh operation. + /// + /// The item value. public void Refresh(TObject item) { if (_keySelector is null) @@ -272,11 +383,19 @@ public void Refresh(TObject item) _cache.Refresh(key); } + /// + /// Executes the Refresh operation. + /// + /// The key value. public void Refresh(TKey key) => _cache.Refresh(key); + /// + /// Executes the Remove operation. + /// + /// The items value. public void Remove(IEnumerable items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); if (items is IList list) { @@ -295,9 +414,13 @@ public void Remove(IEnumerable items) } } + /// + /// Executes the Remove operation. + /// + /// The keys value. public void Remove(IEnumerable keys) { - keys.ThrowArgumentNullExceptionIfNull(nameof(keys)); + ArgumentExceptionHelper.ThrowIfNull(keys); if (keys is IList list) { @@ -316,6 +439,10 @@ public void Remove(IEnumerable keys) } } + /// + /// Executes the Remove operation. + /// + /// The item value. public void Remove(TObject item) { if (_keySelector is null) @@ -327,13 +454,21 @@ public void Remove(TObject item) _cache.Remove(key); } + /// + /// Executes the Remove operation. + /// + /// The key value. public void Remove(TKey key) => _cache.Remove(key); + /// + /// Executes the Remove operation. + /// + /// The items value. public void Remove(IEnumerable> items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); - if (items is IList list) + if (items is IList> list) { // zero allocation enumerator foreach (var key in EnumerableIList.Create(list)) @@ -350,16 +485,32 @@ public void Remove(IEnumerable> items) } } + /// + /// Executes the Remove operation. + /// + /// The item value. public void Remove(KeyValuePair item) => Remove(item.Key); + /// + /// Executes the RemoveKey operation. + /// + /// The key value. public void RemoveKey(TKey key) => Remove(key); + /// + /// Executes the RemoveKeys operation. + /// + /// The keys value. public void RemoveKeys(IEnumerable keys) { - keys.ThrowArgumentNullExceptionIfNull(nameof(keys)); + ArgumentExceptionHelper.ThrowIfNull(keys); _cache.Remove(keys); } + /// + /// Executes the Update operation. + /// + /// The changes value. public void Update(IChangeSet changes) => _cache.Clone(changes); } diff --git a/src/DynamicData/Cache/Internal/Cast.cs b/src/DynamicData/Cache/Internal/Cast.cs index 02f62ebb8..bb8462854 100644 --- a/src/DynamicData/Cache/Internal/Cast.cs +++ b/src/DynamicData/Cache/Internal/Cast.cs @@ -1,20 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the Cast class. +/// +/// The type of the TSource value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The source value. +/// The converter value. internal sealed class Cast(IObservable> source, Func converter) where TSource : notnull where TKey : notnull where TDestination : notnull { + /// + /// The _converter field. + /// private readonly Func _converter = converter ?? throw new ArgumentNullException(nameof(converter)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _source.Select( changes => { diff --git a/src/DynamicData/Cache/Internal/ChangeSetCache.cs b/src/DynamicData/Cache/Internal/ChangeSetCache.cs index d63a93bea..c19443a7c 100644 --- a/src/DynamicData/Cache/Internal/ChangeSetCache.cs +++ b/src/DynamicData/Cache/Internal/ChangeSetCache.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Wraps an Observable ChangeSet while maintaining a copy of the aggregated changes. @@ -15,10 +18,20 @@ internal sealed class ChangeSetCache where TObject : notnull where TKey : notnull { + /// + /// Initializes a new instance of the class. + /// + /// The source value. public ChangeSetCache(IObservable> source) => Source = source.Do(Cache.Clone); + /// + /// Gets the Cache value. + /// public Cache Cache { get; } = new(); + /// + /// Gets the Source value. + /// public IObservable> Source { get; } } diff --git a/src/DynamicData/Cache/Internal/ChangeSetMergeTracker.cs b/src/DynamicData/Cache/Internal/ChangeSetMergeTracker.cs index ae973094e..cd30a46ed 100644 --- a/src/DynamicData/Cache/Internal/ChangeSetMergeTracker.cs +++ b/src/DynamicData/Cache/Internal/ChangeSetMergeTracker.cs @@ -1,19 +1,51 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the ChangeSetMergeTracker class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The selectCaches value. +/// The comparer value. +/// The equalityComparer value. internal sealed class ChangeSetMergeTracker(Func>> selectCaches, IComparer? comparer, IEqualityComparer? equalityComparer) where TObject : notnull where TKey : notnull { + /// + /// The _resultCache field. + /// private readonly ChangeAwareCache _resultCache = new(); + + /// + /// The _equalityComparer field. + /// private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; + + /// + /// The _hasCompleted field. + /// private bool _hasCompleted; + /// + /// Executes the MarkComplete operation. + /// public void MarkComplete() => _hasCompleted = true; + /// + /// Executes the RemoveItems operation. + /// + /// The items value. + /// The observer value. public void RemoveItems(IEnumerable> items, IObserver>? observer = null) { var sourceCaches = selectCaches().ToArray(); @@ -41,6 +73,11 @@ public void RemoveItems(IEnumerable> items, IObserve } } + /// + /// Executes the RefreshItems operation. + /// + /// The keys value. + /// The observer value. public void RefreshItems(IEnumerable keys, IObserver>? observer = null) { var sourceCaches = selectCaches().ToArray(); @@ -68,6 +105,11 @@ public void RefreshItems(IEnumerable keys, IObserver + /// Executes the ProcessChangeSet operation. + /// + /// The changes value. + /// The observer value. public void ProcessChangeSet(IChangeSet changes, IObserver>? observer = null) { var sourceCaches = selectCaches().ToArray(); @@ -100,6 +142,10 @@ public void ProcessChangeSet(IChangeSet changes, IObserver + /// Executes the EmitChanges operation. + /// + /// The observer value. public void EmitChanges(IObserver> observer) { var changeSet = _resultCache.CaptureChanges(); @@ -114,6 +160,11 @@ public void EmitChanges(IObserver> observer) } } + /// + /// Executes the OnItemAdded operation. + /// + /// The item value. + /// The key value. private void OnItemAdded(TObject item, TKey key) { var cached = _resultCache.Lookup(key); @@ -129,6 +180,12 @@ private void OnItemAdded(TObject item, TKey key) } } + /// + /// Executes the OnItemRemoved operation. + /// + /// The sourceCaches value. + /// The item value. + /// The key value. private void OnItemRemoved(ChangeSetCache[] sourceCaches, TObject item, TKey key) { var cached = _resultCache.Lookup(key); @@ -141,7 +198,14 @@ private void OnItemRemoved(ChangeSetCache[] sourceCaches, TObject } } - private void OnItemUpdated(ChangeSetCache[] sources, TObject item, TKey key, in Optional prev) + /// + /// Executes the OnItemUpdated operation. + /// + /// The sources value. + /// The item value. + /// The key value. + /// The prev value. + private void OnItemUpdated(ChangeSetCache[] sources, TObject item, TKey key, in ReactiveUI.Primitives.Optional prev) { var cached = _resultCache.Lookup(key); @@ -185,6 +249,12 @@ private void OnItemUpdated(ChangeSetCache[] sources, TObject item } } + /// + /// Executes the OnItemRefreshed operation. + /// + /// The sources value. + /// The item value. + /// The key value. private void OnItemRefreshed(ChangeSetCache[] sources, TObject item, TKey key) { var cached = _resultCache.Lookup(key); @@ -205,6 +275,11 @@ private void OnItemRefreshed(ChangeSetCache[] sources, TObject it } } + /// + /// Executes the ForceEvaluate operation. + /// + /// The sources value. + /// The key value. private void ForceEvaluate(ChangeSetCache[] sources, TKey key) { var cached = _resultCache.Lookup(key); @@ -219,7 +294,14 @@ private void ForceEvaluate(ChangeSetCache[] sources, TKey key) UpdateToBestValue(sources, key, cached); } - private bool UpdateToBestValue(ChangeSetCache[] sources, TKey key, in Optional current) + /// + /// Executes the UpdateToBestValue operation. + /// + /// The sources value. + /// The key value. + /// The current value. + /// The result of the operation. + private bool UpdateToBestValue(ChangeSetCache[] sources, TKey key, in ReactiveUI.Primitives.Optional current) { // Determine which value should be the one seen downstream var candidate = LookupBestValue(sources, key); @@ -248,11 +330,17 @@ private bool UpdateToBestValue(ChangeSetCache[] sources, TKey key return true; } - private Optional LookupBestValue(ChangeSetCache[] sources, TKey key) + /// + /// Executes the LookupBestValue operation. + /// + /// The sources value. + /// The key value. + /// The result of the operation. + private ReactiveUI.Primitives.Optional LookupBestValue(ChangeSetCache[] sources, TKey key) { if (sources.Length == 0) { - return Optional.None(); + return ReactiveUI.Primitives.Optional.None; } var values = sources.Select(s => s.Cache.Lookup(key)).Where(opt => opt.HasValue); @@ -265,10 +353,22 @@ private Optional LookupBestValue(ChangeSetCache[] source return values.FirstOrDefault(); } + /// + /// Executes the CheckEquality operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. private bool CheckEquality(TObject left, TObject right) => _equalityComparer.Equals(left, right); - // Return true if candidate should replace current as the observed downstream value + + /// + /// Executes the ShouldReplace operation. + /// + /// The candidate value. + /// The current value. + /// The result of the operation. private bool ShouldReplace(TObject candidate, TObject current) => comparer?.Compare(candidate, current) < 0; } diff --git a/src/DynamicData/Cache/Internal/CombineOperator.cs b/src/DynamicData/Cache/Internal/CombineOperator.cs index 9bba3dd38..e382a7ab8 100644 --- a/src/DynamicData/Cache/Internal/CombineOperator.cs +++ b/src/DynamicData/Cache/Internal/CombineOperator.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// How the multiple streams are combinedL. diff --git a/src/DynamicData/Cache/Internal/Combiner.cs b/src/DynamicData/Cache/Internal/Combiner.cs index c7734512d..7d1391cb9 100644 --- a/src/DynamicData/Cache/Internal/Combiner.cs +++ b/src/DynamicData/Cache/Internal/Combiner.cs @@ -1,28 +1,45 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Combines multiple caches using logical operators. /// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type value. +/// The updatedCallback value. internal sealed class Combiner(CombineOperator type, Action> updatedCallback) where TObject : notnull where TKey : notnull { + /// + /// The _combinedCache field. + /// private readonly ChangeAwareCache _combinedCache = new(); -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + /// + /// The _sourceCaches field. + /// private readonly IList> _sourceCaches = []; + /// + /// Executes the Subscribe operation. + /// + /// The source value. + /// The result of the operation. public IDisposable Subscribe(IObservable>[] source) { // subscribe @@ -42,6 +59,11 @@ public IDisposable Subscribe(IObservable>[] source) return disposable; } + /// + /// Executes the MatchesConstraint operation. + /// + /// The key value. + /// The result of the operation. private bool MatchesConstraint(TKey key) { switch (type) @@ -73,6 +95,11 @@ private bool MatchesConstraint(TKey key) } } + /// + /// Executes the Update operation. + /// + /// The cache value. + /// The updates value. private void Update(Cache cache, IChangeSet updates) { ChangeSet notifications; @@ -92,6 +119,11 @@ private void Update(Cache cache, IChangeSet update } } + /// + /// Executes the UpdateCombined operation. + /// + /// The updates value. + /// The result of the operation. private ChangeSet UpdateCombined(IChangeSet updates) { // child caches have been updated before we reached this point. diff --git a/src/DynamicData/Cache/Internal/DeferUntilLoaded.cs b/src/DynamicData/Cache/Internal/DeferUntilLoaded.cs index 0402b7b5f..96b281085 100644 --- a/src/DynamicData/Cache/Internal/DeferUntilLoaded.cs +++ b/src/DynamicData/Cache/Internal/DeferUntilLoaded.cs @@ -1,25 +1,48 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the DeferUntilLoaded class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class DeferUntilLoaded where TObject : notnull where TKey : notnull { + /// + /// The _result field. + /// private readonly IObservable> _result; + /// + /// Initializes a new instance of the class. + /// + /// The source value. public DeferUntilLoaded(IObservableCache source) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); _result = source.CountChanged.Where(count => count != 0).Take(1).Select(_ => new ChangeSet()).Concat(source.Connect()).NotEmpty(); } + /// + /// Initializes a new instance of the class. + /// + /// The source value. public DeferUntilLoaded(IObservable> source) => _result = source.MonitorStatus().Where(status => status == ConnectionStatus.Loaded).Take(1).Select(_ => new ChangeSet()).Concat(source).NotEmpty(); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _result; } diff --git a/src/DynamicData/Cache/Internal/DictionaryExtensions.cs b/src/DynamicData/Cache/Internal/DictionaryExtensions.cs index d8d9f27ea..1cacfd769 100644 --- a/src/DynamicData/Cache/Internal/DictionaryExtensions.cs +++ b/src/DynamicData/Cache/Internal/DictionaryExtensions.cs @@ -1,11 +1,27 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the DictionaryExtensions class. +/// internal static class DictionaryExtensions { + /// + /// Executes the GetOrEmpty operation. + /// + /// The type of the TDictKey value. + /// The type of the T value. + /// The dict value. + /// The key value. + /// The result of the operation. internal static IEnumerable GetOrEmpty(this IDictionary> dict, TDictKey key) => dict.TryGetValue(key, out var value) ? value : []; } diff --git a/src/DynamicData/Cache/Internal/DisposeMany.cs b/src/DynamicData/Cache/Internal/DisposeMany.cs index fe97f5c0e..ed18ea5ef 100644 --- a/src/DynamicData/Cache/Internal/DisposeMany.cs +++ b/src/DynamicData/Cache/Internal/DisposeMany.cs @@ -1,19 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the DisposeMany class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. internal sealed class DisposeMany(IObservable> source) where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { diff --git a/src/DynamicData/Cache/Internal/DistinctCalculator.cs b/src/DynamicData/Cache/Internal/DistinctCalculator.cs index 934f17ac3..df7e67da0 100644 --- a/src/DynamicData/Cache/Internal/DistinctCalculator.cs +++ b/src/DynamicData/Cache/Internal/DistinctCalculator.cs @@ -1,25 +1,58 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the DistinctCalculator class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TValue value. +/// The source value. +/// The valueSelector value. internal sealed class DistinctCalculator(IObservable> source, Func valueSelector) where TObject : notnull where TKey : notnull where TValue : notnull { + /// + /// The _itemCache field. + /// private readonly Dictionary _itemCache = []; + /// + /// The _keyCounters field. + /// private readonly Dictionary _keyCounters = []; + + /// + /// The _valueCounters field. + /// private readonly Dictionary _valueCounters = []; + /// + /// The _valueSelector field. + /// private readonly Func _valueSelector = valueSelector ?? throw new ArgumentNullException(nameof(valueSelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => source.Select(Calculate).Where(updates => updates.Count != 0); + /// + /// Executes the Calculate operation. + /// + /// The changes value. + /// The result of the operation. private DistinctChangeSet Calculate(IChangeSet changes) { var result = new DistinctChangeSet(); diff --git a/src/DynamicData/Cache/Internal/DynamicCombiner.cs b/src/DynamicData/Cache/Internal/DynamicCombiner.cs index 41c7e3a8d..aae48656f 100644 --- a/src/DynamicData/Cache/Internal/DynamicCombiner.cs +++ b/src/DynamicData/Cache/Internal/DynamicCombiner.cs @@ -1,18 +1,34 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the DynamicCombiner class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The type value. internal sealed class DynamicCombiner(IObservableList>> source, CombineOperator type) where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservableList>> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -82,6 +98,12 @@ public IObservable> Run() => Observable.Create + /// Executes the MatchesConstraint operation. + /// + /// The sources value. + /// The key value. + /// The result of the operation. private bool MatchesConstraint(MergeContainer[] sources, TKey key) { if (sources.Length == 0) @@ -118,6 +140,12 @@ private bool MatchesConstraint(MergeContainer[] sources, TKey key) } } + /// + /// Executes the ProcessChanges operation. + /// + /// The target value. + /// The sourceLists value. + /// The items value. private void ProcessChanges(ChangeAwareCache target, MergeContainer[] sourceLists, IEnumerable> items) { // check whether the item should be removed from the list (or in the case of And, added) @@ -138,6 +166,13 @@ private void ProcessChanges(ChangeAwareCache target, MergeContain } } + /// + /// Executes the ProcessItem operation. + /// + /// The target value. + /// The sourceLists value. + /// The item value. + /// The key value. private void ProcessItem(ChangeAwareCache target, MergeContainer[] sourceLists, TObject item, TKey key) { var cached = target.Lookup(key); @@ -160,6 +195,12 @@ private void ProcessItem(ChangeAwareCache target, MergeContainer[ } } + /// + /// Executes the UpdateResultList operation. + /// + /// The target value. + /// The sourceLists value. + /// The changes value. private void UpdateResultList(ChangeAwareCache target, MergeContainer[] sourceLists, IChangeSet changes) { foreach (var change in changes.ToConcreteType()) @@ -168,14 +209,31 @@ private void UpdateResultList(ChangeAwareCache target, MergeConta } } - private sealed class MergeContainer +/// +/// Provides members for the MergeContainer class. +/// +private sealed class MergeContainer { + /// + /// Initializes a new instance of the class. + /// + /// The source value. public MergeContainer(IObservable> source) => Source = source.Do(Clone); + /// + /// Gets the Cache value. + /// public Cache Cache { get; } = new(); + /// + /// Gets the Source value. + /// public IObservable> Source { get; } + /// + /// Executes the Clone operation. + /// + /// The changes value. private void Clone(IChangeSet changes) => Cache.Clone(changes); } } diff --git a/src/DynamicData/Cache/Internal/DynamicGrouper.cs b/src/DynamicData/Cache/Internal/DynamicGrouper.cs index cb4880193..99f0ad204 100644 --- a/src/DynamicData/Cache/Internal/DynamicGrouper.cs +++ b/src/DynamicData/Cache/Internal/DynamicGrouper.cs @@ -1,23 +1,60 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the DynamicGrouper class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The groupSelector value. internal sealed class DynamicGrouper(Func? groupSelector = null) : IDisposable where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The _groupCache field. + /// private readonly ChangeAwareCache, TGroupKey> _groupCache = new(); + + /// + /// The _groupKeys field. + /// private readonly Dictionary _groupKeys = []; + + /// + /// The _emptyGroups field. + /// private readonly HashSet> _emptyGroups = []; + + /// + /// The _suspendTracker field. + /// private readonly SuspendTracker _suspendTracker = new(); + + /// + /// The _groupSelector field. + /// private Func? _groupSelector = groupSelector; + /// + /// Executes the AddOrUpdate operation. + /// + /// The key value. + /// The groupKey value. + /// The item value. + /// The observer value. public void AddOrUpdate(TKey key, TGroupKey groupKey, TObject item, IObserver>? observer = null) { // If not emitting the changes, then suspend the notifications @@ -30,6 +67,11 @@ public void AddOrUpdate(TKey key, TGroupKey groupKey, TObject item, IObserver + /// Executes the ProcessChangeSet operation. + /// + /// The changeSet value. + /// The observer value. public void ProcessChangeSet(IChangeSet changeSet, IObserver>? observer = null) { var suspendTracker = (observer, changeSet.Count) switch @@ -53,8 +95,17 @@ public void ProcessChangeSet(IChangeSet changeSet, IObserver + /// Executes the ProcessChange operation. + /// + /// The change value. public void ProcessChange(Change change) => ProcessChange(change, _suspendTracker); + /// + /// Executes the ProcessChange operation. + /// + /// The change value. + /// The suspendTracker value. private void ProcessChange(Change change, SuspendTracker? suspendTracker) { switch (change.Reason) @@ -84,9 +135,13 @@ private void ProcessChange(Change change, SuspendTracker? suspend break; } } - // Re-evaluate the GroupSelector for each item and apply the changes so that each group only emits a single changset // Perform all the adds/removes for each group in a single step + + /// + /// Executes the RegroupAll operation. + /// + /// The observer value. public void RegroupAll(IObserver> observer) { if (_groupSelector == null) @@ -119,12 +174,23 @@ public void RegroupAll(IObserver> obse EmitChanges(observer); } + /// + /// Executes the SetGroupSelector operation. + /// + /// The groupSelector value. + /// The observer value. public void SetGroupSelector(Func groupSelector, IObserver> observer) { _groupSelector = groupSelector; RegroupAll(observer); } + /// + /// Executes the Initialize operation. + /// + /// The initialValues value. + /// The groupSelector value. + /// The observer value. public void Initialize(IEnumerable> initialValues, Func groupSelector, IObserver> observer) { if (_groupSelector != null) @@ -143,6 +209,10 @@ public void Initialize(IEnumerable> initialValues, F EmitChanges(observer); } + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. public void EmitChanges(IObserver> observer) { // Verify logic doesn't capture any non-empty groups @@ -173,13 +243,22 @@ public void EmitChanges(IObserver> obs } } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _suspendTracker.Dispose(); _groupCache.Items.ForEach(group => (group as ManagedGroup)?.Dispose()); } - private static void PerformGroupRefresh(TKey key, in Optional> optionalGroup, SuspendTracker? suspendTracker = null) + /// + /// Executes the PerformGroupRefresh operation. + /// + /// The key value. + /// The optionalGroup value. + /// The suspendTracker value. + private static void PerformGroupRefresh(TKey key, in ReactiveUI.Primitives.Optional> optionalGroup, SuspendTracker? suspendTracker = null) { if (optionalGroup.HasValue) { @@ -192,12 +271,27 @@ private static void PerformGroupRefresh(TKey key, in Optional> LookupGroup(TKey key) => + /// + /// Executes the LookupGroup operation. + /// + /// The key value. + /// The result of the operation. + private ReactiveUI.Primitives.Optional> LookupGroup(TKey key) => _groupKeys.Lookup(key).Convert(LookupGroup); - private Optional> LookupGroup(TGroupKey groupKey) => + /// + /// Executes the LookupGroup operation. + /// + /// The groupKey value. + /// The result of the operation. + private ReactiveUI.Primitives.Optional> LookupGroup(TGroupKey groupKey) => _groupCache.Lookup(groupKey).Convert(static grp => (grp as ManagedGroup)!); + /// + /// Executes the GetOrAddGroup operation. + /// + /// The groupKey value. + /// The result of the operation. private ManagedGroup GetOrAddGroup(TGroupKey groupKey) => LookupGroup(groupKey).ValueOr(() => { @@ -206,6 +300,13 @@ private ManagedGroup GetOrAddGroup(TGroupKey groupKey) return newGroup; }); + /// + /// Executes the PerformAddOrUpdate operation. + /// + /// The key value. + /// The groupKey value. + /// The item value. + /// The suspendTracker value. private void PerformAddOrUpdate(TKey key, TGroupKey groupKey, TObject item, SuspendTracker? suspendTracker = null) { // See if this item already has been grouped @@ -236,6 +337,13 @@ private void PerformAddOrUpdate(TKey key, TGroupKey groupKey, TObject item, Susp PerformGroupAddOrUpdate(key, groupKey, item, suspendTracker); } + /// + /// Executes the PerformGroupAddOrUpdate operation. + /// + /// The key value. + /// The groupKey value. + /// The item value. + /// The suspendTracker value. private void PerformGroupAddOrUpdate(TKey key, TGroupKey groupKey, TObject item, SuspendTracker? suspendTracker = null) { var group = GetOrAddGroup(groupKey); @@ -247,9 +355,21 @@ private void PerformGroupAddOrUpdate(TKey key, TGroupKey groupKey, TObject item, _emptyGroups.Remove(group); } + /// + /// Executes the PerformRefresh operation. + /// + /// The key value. + /// The suspendTracker value. private void PerformRefresh(TKey key, SuspendTracker? suspendTracker = null) => PerformGroupRefresh(key, LookupGroup(key), suspendTracker); - // When the GroupKey is available, check then and move the group if it changed + + /// + /// Executes the PerformRefresh operation. + /// + /// The key value. + /// The newGroupKey value. + /// The item value. + /// The suspendTracker value. private void PerformRefresh(TKey key, TGroupKey newGroupKey, TObject item, SuspendTracker? suspendTracker = null) { if (_groupKeys.TryGetValue(key, out var groupKey)) @@ -273,6 +393,11 @@ private void PerformRefresh(TKey key, TGroupKey newGroupKey, TObject item, Suspe } } + /// + /// Executes the PerformRemove operation. + /// + /// The key value. + /// The suspendTracker value. private void PerformRemove(TKey key, SuspendTracker? suspendTracker = null) { if (_groupKeys.TryGetValue(key, out var groupKey)) @@ -286,6 +411,12 @@ private void PerformRemove(TKey key, SuspendTracker? suspendTracker = null) } } + /// + /// Executes the PerformRemove operation. + /// + /// The key value. + /// The groupKey value. + /// The suspendTracker value. private void PerformRemove(TKey key, TGroupKey groupKey, SuspendTracker? suspendTracker = null) { var optionalGroup = LookupGroup(groupKey); @@ -307,18 +438,40 @@ private void PerformRemove(TKey key, TGroupKey groupKey, SuspendTracker? suspend Debug.Fail("Should not receive a Remove Event for an unknown Group Key"); } } - // Without the new group key, all that can be done is remove the old value // Consumer of the Grouper is resonsible for Adding the New Value. + + /// + /// Executes the PerformUpdate operation. + /// + /// The key value. + /// The suspendTracker value. private void PerformUpdate(TKey key, SuspendTracker? suspendTracker = null) => PerformRemove(key, suspendTracker); - private sealed class SuspendTracker : IDisposable +/// +/// Provides members for the SuspendTracker class. +/// +private sealed class SuspendTracker : IDisposable { + /// + /// The _trackedKeys field. + /// private readonly HashSet _trackedKeys = []; + + /// + /// The _disposables field. + /// private CompositeDisposable _disposables = []; + /// + /// Gets the HasItems value. + /// public bool HasItems => _disposables.Count > 0; + /// + /// Executes the Add operation. + /// + /// The managedGroup value. public void Add(ManagedGroup managedGroup) { if (_trackedKeys.Add(managedGroup.Key)) @@ -327,6 +480,9 @@ public void Add(ManagedGroup managedGroup) } } + /// + /// Executes the Reset operation. + /// public void Reset() { if (_disposables.Count > 0) @@ -337,6 +493,9 @@ public void Reset() } } + /// + /// Executes the Dispose operation. + /// public void Dispose() => _disposables.Dispose(); } } diff --git a/src/DynamicData/Cache/Internal/EditDiff.cs b/src/DynamicData/Cache/Internal/EditDiff.cs index ba6679d03..ca56e0a20 100644 --- a/src/DynamicData/Cache/Internal/EditDiff.cs +++ b/src/DynamicData/Cache/Internal/EditDiff.cs @@ -1,19 +1,44 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the EditDiff class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The areEqual value. internal sealed class EditDiff(ISourceCache source, Func areEqual) where TObject : notnull where TKey : notnull { + /// + /// The _areEqual field. + /// private readonly Func _areEqual = areEqual ?? throw new ArgumentNullException(nameof(areEqual)); + /// + /// The _keyComparer field. + /// private readonly IEqualityComparer> _keyComparer = new KeyComparer(); + /// + /// The _source field. + /// private readonly ISourceCache _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Edit operation. + /// + /// The items value. public void Edit(IEnumerable items) => _source.Edit( innerCache => { diff --git a/src/DynamicData/Cache/Internal/EditDiffChangeSet.cs b/src/DynamicData/Cache/Internal/EditDiffChangeSet.cs index b363a9505..bc054cf08 100644 --- a/src/DynamicData/Cache/Internal/EditDiffChangeSet.cs +++ b/src/DynamicData/Cache/Internal/EditDiffChangeSet.cs @@ -1,19 +1,45 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the EditDiffChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The keySelector value. +/// The equalityComparer value. internal sealed class EditDiffChangeSet(IObservable> source, Func keySelector, IEqualityComparer? equalityComparer) where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _equalityComparer field. + /// private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; + /// + /// The _keySelector field. + /// private readonly Func _keySelector = keySelector ?? throw new ArgumentNullException(nameof(keySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => ObservableChangeSet.Create( cache => _source.Subscribe(items => cache.EditDiff(items, _equalityComparer), () => cache.Dispose()), diff --git a/src/DynamicData/Cache/Internal/EditDiffChangeSetOptional.cs b/src/DynamicData/Cache/Internal/EditDiffChangeSetOptional.cs index f65df1b96..3f7734c41 100644 --- a/src/DynamicData/Cache/Internal/EditDiffChangeSetOptional.cs +++ b/src/DynamicData/Cache/Internal/EditDiffChangeSetOptional.cs @@ -1,24 +1,48 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif -internal sealed class EditDiffChangeSetOptional(IObservable> source, Func keySelector, IEqualityComparer? equalityComparer) +/// +/// Provides members for the EditDiffChangeSetOptional class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The keySelector value. +/// The equalityComparer value. +internal sealed class EditDiffChangeSetOptional(IObservable> source, Func keySelector, IEqualityComparer? equalityComparer) where TObject : notnull where TKey : notnull { - private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _source field. + /// + private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _equalityComparer field. + /// private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; + /// + /// The _keySelector field. + /// private readonly Func _keySelector = keySelector ?? throw new ArgumentNullException(nameof(keySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { - var previous = Optional.None(); + var previous = ReactiveUI.Primitives.Optional.None; return _source.Synchronize().Subscribe( nextValue => @@ -47,6 +71,12 @@ public IObservable> Run() => Observable.Create + /// Executes the CreateUpdateChanges operation. + /// + /// The prev value. + /// The curr value. + /// The result of the operation. private Change[] CreateUpdateChanges(in ValueContainer prev, in ValueContainer curr) { if (EqualityComparer.Default.Equals(prev.Key, curr.Key)) @@ -68,10 +98,21 @@ private Change[] CreateUpdateChanges(in ValueContainer prev, in V ]; } - private readonly struct ValueContainer(TObject obj, TKey key) +/// +/// Represents the ValueContainer value. +/// +/// The obj value. +/// The key value. +private readonly struct ValueContainer(TObject obj, TKey key) { + /// + /// Gets the Object value. + /// public TObject Object { get; } = obj; + /// + /// Gets the Key value. + /// public TKey Key { get; } = key; } } diff --git a/src/DynamicData/Cache/Internal/ExpirableItem.cs b/src/DynamicData/Cache/Internal/ExpirableItem.cs index ab02ac3d1..11cdf6052 100644 --- a/src/DynamicData/Cache/Internal/ExpirableItem.cs +++ b/src/DynamicData/Cache/Internal/ExpirableItem.cs @@ -1,30 +1,27 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else -internal readonly struct ExpirableItem(TObject value, TKey key, DateTime dateTime, long index = 0) : IEquatable> +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Represents the ExpirableItem record. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The Value value. +/// The Key value. +/// The ExpireAt value. +/// The Index value. +internal readonly record struct ExpirableItem(TObject Value, TKey Key, DateTime ExpireAt, long Index = 0) { - public TObject Value { get; } = value; - - public TKey Key { get; } = key; - - public DateTime ExpireAt { get; } = dateTime; - - public long Index { get; } = index; - - public static bool operator ==(in ExpirableItem left, in ExpirableItem right) => left.Equals(right); - - public static bool operator !=(in ExpirableItem left, in ExpirableItem right) => !left.Equals(right); - - /// - public bool Equals(ExpirableItem other) => EqualityComparer.Default.Equals(Key, other.Key) && ExpireAt.Equals(other.ExpireAt); - - /// - public override bool Equals(object? obj) => obj is ExpirableItem expItem && Equals(expItem); - /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -33,5 +30,9 @@ public override int GetHashCode() } } + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Key: {Key}, Expire At: {ExpireAt}"; } diff --git a/src/DynamicData/Cache/Internal/ExpireAfter.ForSource.cs b/src/DynamicData/Cache/Internal/ExpireAfter.ForSource.cs index 60bcd9de2..4ac684ec3 100644 --- a/src/DynamicData/Cache/Internal/ExpireAfter.ForSource.cs +++ b/src/DynamicData/Cache/Internal/ExpireAfter.ForSource.cs @@ -1,29 +1,44 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; - -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ExpireAfter class. +/// internal static partial class ExpireAfter { - public static class ForSource +/// +/// Provides members for the ForSource class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +public static class ForSource where TObject : notnull where TKey : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The timeSelector value. + /// The pollingInterval value. + /// The scheduler value. + /// The result of the operation. public static IObservable>> Create( ISourceCache source, Func timeSelector, TimeSpan? pollingInterval = null, IScheduler? scheduler = null) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - timeSelector.ThrowArgumentNullExceptionIfNull(nameof(timeSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(timeSelector); return Observable.Create>>(observer => (pollingInterval is { } pollingIntervalValue) ? new PollingSubscription( @@ -39,22 +54,74 @@ public static IObservable>> Create( timeSelector: timeSelector)); } - private abstract class SubscriptionBase +/// +/// Provides members for the SubscriptionBase class. +/// +private abstract class SubscriptionBase : IDisposable { + /// + /// The _expirationDueTimesByKey field. + /// private readonly Dictionary _expirationDueTimesByKey; + + /// + /// The _observer field. + /// private readonly IObserver>> _observer; + + /// + /// The _onEditingSource field. + /// private readonly Action> _onEditingSource; + + /// + /// The _proposedExpirationsQueue field. + /// private readonly List _proposedExpirationsQueue; + + /// + /// The _removedItemsBuffer field. + /// private readonly List> _removedItemsBuffer; + + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler; + + /// + /// The _source field. + /// private readonly ISourceCache _source; + + /// + /// The _sourceSubscription field. + /// private readonly IDisposable _sourceSubscription; + + /// + /// The _timeSelector field. + /// private readonly Func _timeSelector; + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _nextScheduledManagement field. + /// private ScheduledManagement? _nextScheduledManagement; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. protected SubscriptionBase( IObserver>> observer, IScheduler? scheduler, @@ -73,17 +140,20 @@ protected SubscriptionBase( _proposedExpirationsQueue = []; _removedItemsBuffer = []; - _sourceSubscription = source - .Connect() - // It's important to set this flag outside the context of a lock, because it'll be read outside of lock as well. - .Finally(() => _hasSourceCompleted = true) - .Synchronize(SynchronizationGate) - .SubscribeSafe( - onNext: OnSourceNext, - onError: OnSourceError, - onCompleted: OnSourceCompleted); + _sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source + .Connect() + // It's important to set this flag outside the context of a lock, because it'll be read outside of lock as well. + .Finally(() => _hasSourceCompleted = true) + .Synchronize(SynchronizationGate), + OnSourceNext, + OnSourceError, + OnSourceCompleted); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { lock (SynchronizationGate) @@ -94,28 +164,53 @@ public void Dispose() } } + /// + /// Gets the Scheduler value. + /// protected IScheduler Scheduler => _scheduler; - // Instead of using a dedicated _synchronizationGate object, we can save an allocation by using any object that is never exposed to public consumers. + + /// + /// Gets the SynchronizationGate value. + /// protected object SynchronizationGate => _expirationDueTimesByKey; + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected abstract DateTimeOffset? GetNextManagementDueTime(); + /// + /// Executes the GetNextProposedExpirationDueTime operation. + /// + /// The result of the operation. protected DateTimeOffset? GetNextProposedExpirationDueTime() => _proposedExpirationsQueue.Count is 0 ? null : _proposedExpirationsQueue[0].DueTime; + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected abstract void OnExpirationsManaged(DateTimeOffset dueTime); + /// + /// Executes the ClearExpiration operation. + /// + /// The key value. private void ClearExpiration(TKey key) // This is what puts the "proposed" in _proposedExpirationsQueue. // Finding the position of the item to remove from the queue would be O(log n), at best, // so just leave it and flush it later during normal processing of the queue. => _expirationDueTimesByKey.Remove(key); + /// + /// Executes the ManageExpirations operation. + /// private void ManageExpirations() { // This check is needed, to make sure we don't try and call .Edit() on a disposed _source, @@ -132,6 +227,10 @@ private void ManageExpirations() _source.Edit(_onEditingSource); } + /// + /// Executes the OnEditingSource operation. + /// + /// The updater value. private void OnEditingSource(ISourceUpdater updater) { lock (SynchronizationGate) @@ -193,6 +292,9 @@ private void OnEditingSource(ISourceUpdater updater) } } + /// + /// Executes the OnExpirationsChanged operation. + /// private void OnExpirationsChanged() { // Clear out any expirations at the front of the queue that are no longer valid. @@ -233,6 +335,9 @@ private void OnExpirationsChanged() } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { // If the source completes, we can no longer remove items from it, so any pending expirations are moot. @@ -241,6 +346,10 @@ private void OnSourceCompleted() _observer.OnCompleted(); } + /// + /// Executes the OnSourceError operation. + /// + /// The error value. private void OnSourceError(Exception error) { TryCancelNextScheduledManagement(); @@ -248,6 +357,10 @@ private void OnSourceError(Exception error) _observer.OnError(error); } + /// + /// Executes the OnSourceNext operation. + /// + /// The changes value. private void OnSourceNext(IChangeSet changes) { try @@ -305,12 +418,21 @@ private void OnSourceNext(IChangeSet changes) } } + /// + /// Executes the TryCancelNextScheduledManagement operation. + /// private void TryCancelNextScheduledManagement() { _nextScheduledManagement?.Cancellation.Dispose(); _nextScheduledManagement = null; } + /// + /// Executes the TrySetExpiration operation. + /// + /// The key value. + /// The dueTime value. + /// The result of the operation. private bool TrySetExpiration( TKey key, DateTimeOffset dueTime) @@ -342,22 +464,47 @@ private bool TrySetExpiration( return true; } - private readonly struct ProposedExpiration +/// +/// Represents the ProposedExpiration value. +/// +private readonly struct ProposedExpiration { + /// + /// Gets or sets the DueTime value. + /// public required DateTimeOffset DueTime { get; init; } + /// + /// Gets or sets the Key value. + /// public required TKey Key { get; init; } } - private readonly struct ScheduledManagement +/// +/// Represents the ScheduledManagement value. +/// +private readonly struct ScheduledManagement { + /// + /// Gets or sets the Cancellation value. + /// public required IDisposable Cancellation { get; init; } + /// + /// Gets or sets the DueTime value. + /// public required DateTimeOffset DueTime { get; init; } } } - private sealed class OnDemandSubscription( +/// +/// Provides members for the OnDemandSubscription class. +/// +/// The observer value. +/// The scheduler value. +/// The source value. +/// The timeSelector value. +private sealed class OnDemandSubscription( IObserver>> observer, IScheduler? scheduler, ISourceCache source, @@ -368,21 +515,46 @@ private sealed class OnDemandSubscription( source, timeSelector) { + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected override DateTimeOffset? GetNextManagementDueTime() => GetNextProposedExpirationDueTime(); + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected override void OnExpirationsManaged(DateTimeOffset dueTime) { } } - private sealed class PollingSubscription +/// +/// Provides members for the PollingSubscription class. +/// +private sealed class PollingSubscription : SubscriptionBase { + /// + /// The _pollingInterval field. + /// private readonly TimeSpan _pollingInterval; + /// + /// The _lastManagementDueTime field. + /// private DateTimeOffset _lastManagementDueTime; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The pollingInterval value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. public PollingSubscription( IObserver>> observer, TimeSpan pollingInterval, @@ -400,6 +572,10 @@ public PollingSubscription( _lastManagementDueTime = Scheduler.Now; } + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected override DateTimeOffset? GetNextManagementDueTime() { var now = Scheduler.Now; @@ -411,6 +587,10 @@ public PollingSubscription( : now; } + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected override void OnExpirationsManaged(DateTimeOffset dueTime) => _lastManagementDueTime = dueTime; } diff --git a/src/DynamicData/Cache/Internal/ExpireAfter.ForStream.cs b/src/DynamicData/Cache/Internal/ExpireAfter.ForStream.cs index d128ada8f..bfa548c8c 100644 --- a/src/DynamicData/Cache/Internal/ExpireAfter.ForStream.cs +++ b/src/DynamicData/Cache/Internal/ExpireAfter.ForStream.cs @@ -1,29 +1,44 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; - -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ExpireAfter class. +/// internal static partial class ExpireAfter { - public static class ForStream +/// +/// Provides members for the ForStream class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +public static class ForStream where TObject : notnull where TKey : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The timeSelector value. + /// The pollingInterval value. + /// The scheduler value. + /// The result of the operation. public static IObservable> Create( IObservable> source, Func timeSelector, TimeSpan? pollingInterval = null, IScheduler? scheduler = null) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - timeSelector.ThrowArgumentNullExceptionIfNull(nameof(timeSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(timeSelector); return Observable.Create>(observer => (pollingInterval is { } pollingIntervalValue) ? new PollingSubscription( @@ -39,20 +54,64 @@ public static IObservable> Create( timeSelector: timeSelector)); } - private abstract class SubscriptionBase +/// +/// Provides members for the SubscriptionBase class. +/// +private abstract class SubscriptionBase : IDisposable { + /// + /// The _expirationDueTimesByKey field. + /// private readonly Dictionary _expirationDueTimesByKey; + + /// + /// The _itemsCache field. + /// private readonly ChangeAwareCache _itemsCache; + + /// + /// The _observer field. + /// private readonly IObserver> _observer; + + /// + /// The _proposedExpirationsQueue field. + /// private readonly List _proposedExpirationsQueue; + + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler; + + /// + /// The _sourceSubscription field. + /// private readonly IDisposable _sourceSubscription; + + /// + /// The _timeSelector field. + /// private readonly Func _timeSelector; + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _nextScheduledManagement field. + /// private ScheduledManagement? _nextScheduledManagement; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. protected SubscriptionBase( IObserver> observer, IScheduler? scheduler, @@ -68,14 +127,16 @@ protected SubscriptionBase( _itemsCache = new(); _proposedExpirationsQueue = []; - _sourceSubscription = source - .Synchronize(SynchronizationGate) - .SubscribeSafe( - onNext: OnSourceNext, - onError: OnSourceError, - onCompleted: OnSourceCompleted); + _sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source.Synchronize(SynchronizationGate), + OnSourceNext, + OnSourceError, + OnSourceCompleted); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { lock (SynchronizationGate) @@ -86,28 +147,53 @@ public void Dispose() } } + /// + /// Gets the Scheduler value. + /// protected IScheduler Scheduler => _scheduler; - // Instead of using a dedicated _synchronizationGate object, we can save an allocation by using any object that is never exposed to public consumers. + + /// + /// Gets the SynchronizationGate value. + /// protected object SynchronizationGate => _expirationDueTimesByKey; + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected abstract DateTimeOffset? GetNextManagementDueTime(); + /// + /// Executes the GetNextProposedExpirationDueTime operation. + /// + /// The result of the operation. protected DateTimeOffset? GetNextProposedExpirationDueTime() => _proposedExpirationsQueue.Count is 0 ? null : _proposedExpirationsQueue[0].DueTime; + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected abstract void OnExpirationsManaged(DateTimeOffset dueTime); + /// + /// Executes the ClearExpiration operation. + /// + /// The key value. private void ClearExpiration(TKey key) // This is what puts the "proposed" in _proposedExpirationsQueue. // Finding the position of the item to remove from the queue would be O(log n), at best, // so just leave it and flush it later during normal processing of the queue. => _expirationDueTimesByKey.Remove(key); + /// + /// Executes the ManageExpirations operation. + /// private void ManageExpirations() { lock (SynchronizationGate) @@ -154,6 +240,9 @@ private void ManageExpirations() } } + /// + /// Executes the OnExpirationsChanged operation. + /// private void OnExpirationsChanged() { // Clear out any expirations at the front of the queue that are no longer valid. @@ -204,6 +293,9 @@ private void OnExpirationsChanged() } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { _hasSourceCompleted = true; @@ -217,6 +309,10 @@ private void OnSourceCompleted() } } + /// + /// Executes the OnSourceError operation. + /// + /// The error value. private void OnSourceError(Exception error) { TryCancelNextScheduledManagement(); @@ -224,6 +320,10 @@ private void OnSourceError(Exception error) _observer.OnError(error); } + /// + /// Executes the OnSourceNext operation. + /// + /// The upstreamChanges value. private void OnSourceNext(IChangeSet upstreamChanges) { try @@ -294,12 +394,21 @@ private void OnSourceNext(IChangeSet upstreamChanges) } } + /// + /// Executes the TryCancelNextScheduledManagement operation. + /// private void TryCancelNextScheduledManagement() { _nextScheduledManagement?.Cancellation.Dispose(); _nextScheduledManagement = null; } + /// + /// Executes the TrySetExpiration operation. + /// + /// The key value. + /// The dueTime value. + /// The result of the operation. private bool TrySetExpiration( TKey key, DateTimeOffset dueTime) @@ -331,22 +440,47 @@ private bool TrySetExpiration( return true; } - private readonly struct ProposedExpiration +/// +/// Represents the ProposedExpiration value. +/// +private readonly struct ProposedExpiration { + /// + /// Gets or sets the DueTime value. + /// public required DateTimeOffset DueTime { get; init; } + /// + /// Gets or sets the Key value. + /// public required TKey Key { get; init; } } - private readonly struct ScheduledManagement +/// +/// Represents the ScheduledManagement value. +/// +private readonly struct ScheduledManagement { + /// + /// Gets or sets the Cancellation value. + /// public required IDisposable Cancellation { get; init; } + /// + /// Gets or sets the DueTime value. + /// public required DateTimeOffset DueTime { get; init; } } } - private sealed class OnDemandSubscription( +/// +/// Provides members for the OnDemandSubscription class. +/// +/// The observer value. +/// The scheduler value. +/// The source value. +/// The timeSelector value. +private sealed class OnDemandSubscription( IObserver> observer, IScheduler? scheduler, IObservable> source, @@ -357,21 +491,46 @@ private sealed class OnDemandSubscription( source, timeSelector) { + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected override DateTimeOffset? GetNextManagementDueTime() => GetNextProposedExpirationDueTime(); + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected override void OnExpirationsManaged(DateTimeOffset dueTime) { } } - private sealed class PollingSubscription +/// +/// Provides members for the PollingSubscription class. +/// +private sealed class PollingSubscription : SubscriptionBase { + /// + /// The _pollingInterval field. + /// private readonly TimeSpan _pollingInterval; + /// + /// The _lastManagementDueTime field. + /// private DateTimeOffset _lastManagementDueTime; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The pollingInterval value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. public PollingSubscription( IObserver> observer, TimeSpan pollingInterval, @@ -389,6 +548,10 @@ public PollingSubscription( _lastManagementDueTime = Scheduler.Now; } + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected override DateTimeOffset? GetNextManagementDueTime() { var now = Scheduler.Now; @@ -400,6 +563,10 @@ public PollingSubscription( : now; } + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected override void OnExpirationsManaged(DateTimeOffset dueTime) => _lastManagementDueTime = dueTime; } diff --git a/src/DynamicData/Cache/Internal/Filter.Dynamic.cs b/src/DynamicData/Cache/Internal/Filter.Dynamic.cs index 350ae272b..87b98aef8 100644 --- a/src/DynamicData/Cache/Internal/Filter.Dynamic.cs +++ b/src/DynamicData/Cache/Internal/Filter.Dynamic.cs @@ -1,19 +1,38 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the Filter class. +/// internal static partial class Filter { - public static class Dynamic +/// +/// Provides members for the Dynamic class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TState value. +public static class Dynamic where TObject : notnull where TKey : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The predicateState value. + /// The predicate value. + /// The reapplyFilter value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public static IObservable> Create( IObservable> source, IObservable predicateState, @@ -21,10 +40,10 @@ public static IObservable> Create( IObservable reapplyFilter, bool suppressEmptyChangeSets) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicateState.ThrowArgumentNullExceptionIfNull(nameof(predicateState)); - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); - reapplyFilter.ThrowArgumentNullExceptionIfNull(nameof(reapplyFilter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicateState); + ArgumentExceptionHelper.ThrowIfNull(predicate); + ArgumentExceptionHelper.ThrowIfNull(reapplyFilter); return Observable.Create>(downstreamObserver => new Subscription( downstreamObserver: downstreamObserver, @@ -35,30 +54,101 @@ public static IObservable> Create( suppressEmptyChangeSets: suppressEmptyChangeSets)); } - private sealed class Subscription +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : IDisposable { + /// + /// The _downstreamChangesBuffer field. + /// private readonly List> _downstreamChangesBuffer; + + /// + /// The _downstreamObserver field. + /// private readonly IObserver> _downstreamObserver; + + /// + /// The _itemStatesByKey field. + /// private readonly Dictionary _itemStatesByKey; + + /// + /// The _predicate field. + /// private readonly Func _predicate; + + /// + /// The _predicateStateSubscription field. + /// private readonly IDisposable? _predicateStateSubscription; + + /// + /// The _reapplyFilterSubscription field. + /// private readonly IDisposable? _reapplyFilterSubscription; + + /// + /// The _sourceSubscription field. + /// private readonly IDisposable? _sourceSubscription; + + /// + /// The _suppressEmptyChangeSets field. + /// private readonly bool _suppressEmptyChangeSets; -#if NET9_0_OR_GREATER + /// + /// The _downstreamGate field. + /// private readonly Lock _downstreamGate = new(); + + /// + /// The _upstreamGate field. + /// private readonly Lock _upstreamGate = new(); -#endif + /// + /// The _hasInitialized field. + /// private bool _hasInitialized; + + /// + /// The _hasPredicateStateCompleted field. + /// private bool _hasPredicateStateCompleted; + + /// + /// The _hasReapplyFilterCompleted field. + /// private bool _hasReapplyFilterCompleted; + + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _isLatestPredicateStateValid field. + /// private bool _isLatestPredicateStateValid; + + /// + /// The _latestPredicateState field. + /// private TState _latestPredicateState; + /// + /// Initializes a new instance of the class. + /// + /// The downstreamObserver value. + /// The predicate value. + /// The predicateState value. + /// The reapplyFilter value. + /// The source value. + /// The suppressEmptyChangeSets value. public Subscription( IObserver> downstreamObserver, Func predicate, @@ -80,23 +170,22 @@ public Subscription( using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); - _predicateStateSubscription = predicateState - .SubscribeSafe( - onNext: OnPredicateStateNext, - onError: onError, - onCompleted: OnPredicateStateCompleted); + _predicateStateSubscription = predicateState.SubscribeSafe(Observer.Create( + onNext: OnPredicateStateNext, + onError: onError, + onCompleted: OnPredicateStateCompleted)); - _reapplyFilterSubscription = reapplyFilter - .SubscribeSafe( - onNext: OnReapplyFilterNext, - onError: onError, - onCompleted: OnReapplyFilterCompleted); + _reapplyFilterSubscription = PrimitivesLinqExtensions.SubscribeSafe( + reapplyFilter, + OnReapplyFilterNext, + onError, + OnReapplyFilterCompleted); - _sourceSubscription = source - .SubscribeSafe( - onNext: OnSourceNext, - onError: onError, - onCompleted: OnSourceCompleted); + _sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source, + OnSourceNext, + onError, + OnSourceCompleted); _hasInitialized = true; @@ -114,6 +203,9 @@ public Subscription( } } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _predicateStateSubscription?.Dispose(); @@ -121,20 +213,22 @@ public void Dispose() _sourceSubscription?.Dispose(); } -#if NET9_0_OR_GREATER + /// + /// Gets the DownstreamSynchronizationGate value. + /// private Lock DownstreamSynchronizationGate => _downstreamGate; + /// + /// Gets the UpstreamSynchronizationGate value. + /// private Lock UpstreamSynchronizationGate => _upstreamGate; -#else - private object DownstreamSynchronizationGate - => _downstreamChangesBuffer; - - private object UpstreamSynchronizationGate - => _itemStatesByKey; -#endif + /// + /// Executes the AssembleDownstreamChanges operation. + /// + /// The result of the operation. private ChangeSet AssembleDownstreamChanges() { if (_downstreamChangesBuffer.Count is 0) @@ -146,6 +240,10 @@ private ChangeSet AssembleDownstreamChanges() return downstreamChanges; } + /// + /// Executes the OnError operation. + /// + /// The error value. private void OnError(Exception error) { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -158,6 +256,9 @@ private void OnError(Exception error) _downstreamObserver.OnError(error); } + /// + /// Executes the OnPredicateStateCompleted operation. + /// private void OnPredicateStateCompleted() { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -176,6 +277,10 @@ private void OnPredicateStateCompleted() } } + /// + /// Executes the OnPredicateStateNext operation. + /// + /// The predicateState value. private void OnPredicateStateNext(TState predicateState) { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -194,6 +299,9 @@ private void OnPredicateStateNext(TState predicateState) } } + /// + /// Executes the OnReapplyFilterCompleted operation. + /// private void OnReapplyFilterCompleted() { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -209,6 +317,10 @@ private void OnReapplyFilterCompleted() } } + /// + /// Executes the OnReapplyFilterNext operation. + /// + /// The value value. private void OnReapplyFilterNext(Unit value) { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -225,6 +337,9 @@ private void OnReapplyFilterNext(Unit value) } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -244,6 +359,10 @@ private void OnSourceCompleted() } } + /// + /// Executes the OnSourceNext operation. + /// + /// The upstreamChanges value. private void OnSourceNext(IChangeSet upstreamChanges) { using var @lock = SwappableLock.CreateAndEnter(UpstreamSynchronizationGate); @@ -376,6 +495,10 @@ private void OnSourceNext(IChangeSet upstreamChanges) } } + /// + /// Executes the ReFilter operation. + /// + /// The predicateState value. private void ReFilter(TState predicateState) { #if SUPPORTS_DICTIONARY_MUTATION_DURING_ENUMERATION @@ -412,10 +535,19 @@ private void ReFilter(TState predicateState) } } - private readonly struct ItemState +/// +/// Represents the ItemState value. +/// +private readonly struct ItemState { + /// + /// Gets or sets the IsIncluded value. + /// public required bool IsIncluded { get; init; } + /// + /// Gets or sets the Item value. + /// public required TObject Item { get; init; } } } diff --git a/src/DynamicData/Cache/Internal/Filter.Static.cs b/src/DynamicData/Cache/Internal/Filter.Static.cs index e53a479bc..b7e6a3885 100644 --- a/src/DynamicData/Cache/Internal/Filter.Static.cs +++ b/src/DynamicData/Cache/Internal/Filter.Static.cs @@ -1,24 +1,42 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the Filter class. +/// internal static partial class Filter { - public static class Static +/// +/// Provides members for the Static class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +public static class Static where TObject : notnull where TKey : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The filter value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public static IObservable> Create( IObservable> source, Func filter, bool suppressEmptyChangeSets) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - filter.ThrowArgumentNullExceptionIfNull(nameof(filter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(filter); return Observable.Create>(downstreamObserver => { diff --git a/src/DynamicData/Cache/Internal/FilterEx.cs b/src/DynamicData/Cache/Internal/FilterEx.cs index f21c493e9..77798b0f5 100644 --- a/src/DynamicData/Cache/Internal/FilterEx.cs +++ b/src/DynamicData/Cache/Internal/FilterEx.cs @@ -1,11 +1,27 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the FilterEx class. +/// internal static class FilterEx { + /// + /// Executes the FilterChanges operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The cache value. + /// The changes value. + /// The predicate value. public static void FilterChanges(this ChangeAwareCache cache, IChangeSet changes, Func predicate) where TObject : notnull where TKey : notnull @@ -70,6 +86,15 @@ public static void FilterChanges(this ChangeAwareCache + /// Executes the RefreshFilteredFrom operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The filtered value. + /// The allData value. + /// The predicate value. + /// The result of the operation. public static IChangeSet RefreshFilteredFrom(this ChangeAwareCache filtered, Cache allData, Func predicate) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/Internal/FilterImmutable.cs b/src/DynamicData/Cache/Internal/FilterImmutable.cs index 67f6ec02d..337fc33cf 100644 --- a/src/DynamicData/Cache/Internal/FilterImmutable.cs +++ b/src/DynamicData/Cache/Internal/FilterImmutable.cs @@ -1,20 +1,44 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the FilterImmutable class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class FilterImmutable where TObject : notnull where TKey : notnull { + /// + /// The _onNextInvoker field. + /// private readonly Action>, IChangeSet> _onNextInvoker; + + /// + /// The _predicate field. + /// private readonly Func _predicate; + + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// Initializes a new instance of the class. + /// + /// The predicate value. + /// The source value. + /// The suppressEmptyChangeSets value. public FilterImmutable( Func predicate, IObservable> source, @@ -35,6 +59,10 @@ public FilterImmutable( : (observer, changes) => observer.OnNext(changes); } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => _source .SubscribeSafe(Observer.Create>( diff --git a/src/DynamicData/Cache/Internal/FilterOnObservable.cs b/src/DynamicData/Cache/Internal/FilterOnObservable.cs index d444d9ac4..9bb18d922 100644 --- a/src/DynamicData/Cache/Internal/FilterOnObservable.cs +++ b/src/DynamicData/Cache/Internal/FilterOnObservable.cs @@ -1,19 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the FilterOnObservable class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The filterFactory value. +/// The buffer value. +/// The scheduler value. internal sealed class FilterOnObservable(IObservable> source, Func> filterFactory, TimeSpan? buffer = null, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull { + /// + /// The _filterFactory field. + /// private readonly Func> _filterFactory = filterFactory ?? throw new ArgumentNullException(nameof(filterFactory)); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _source .Transform((val, key) => new FilterProxy(val, _filterFactory(val, key))) @@ -21,12 +43,26 @@ public IObservable> Run() => .Filter(proxy => proxy.PassesFilter) .TransformImmutable(proxy => proxy.Value); - private sealed class FilterProxy(TObject obj, IObservable observable) +/// +/// Provides members for the FilterProxy class. +/// +/// The obj value. +/// The observable value. +private sealed class FilterProxy(TObject obj, IObservable observable) { + /// + /// Gets the Value value. + /// public TObject Value { get; } = obj; + /// + /// Gets or sets the PassesFilter value. + /// public bool PassesFilter { get; private set; } + /// + /// Gets the FilterObservable value. + /// public IObservable FilterObservable => observable.DistinctUntilChanged().Do(filterValue => PassesFilter = filterValue); } } diff --git a/src/DynamicData/Cache/Internal/FilteredIndexCalculator.cs b/src/DynamicData/Cache/Internal/FilteredIndexCalculator.cs index c8ed437e0..14b439e8b 100644 --- a/src/DynamicData/Cache/Internal/FilteredIndexCalculator.cs +++ b/src/DynamicData/Cache/Internal/FilteredIndexCalculator.cs @@ -1,13 +1,30 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the FilteredIndexCalculator class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal static class FilteredIndexCalculator where TObject : notnull where TKey : notnull { + /// + /// Executes the Calculate operation. + /// + /// The currentItems value. + /// The previousItems value. + /// The sourceUpdates value. + /// The result of the operation. public static IList> Calculate(IKeyValueCollection currentItems, IKeyValueCollection previousItems, IChangeSet? sourceUpdates) { if (currentItems.SortReason == SortReason.ComparerChanged || currentItems.SortReason == SortReason.InitialLoad) @@ -130,6 +147,13 @@ public static IList> Calculate(IKeyValueCollection + /// Executes the GetInsertPositionLinear operation. + /// + /// The list value. + /// The item value. + /// The comparer value. + /// The result of the operation. private static int GetInsertPositionLinear(List> list, KeyValuePair item, IComparer> comparer) { for (var i = 0; i < list.Count; i++) diff --git a/src/DynamicData/Cache/Internal/FinallySafe.cs b/src/DynamicData/Cache/Internal/FinallySafe.cs index d4cb04523..91cb497d7 100644 --- a/src/DynamicData/Cache/Internal/FinallySafe.cs +++ b/src/DynamicData/Cache/Internal/FinallySafe.cs @@ -1,18 +1,36 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the FinallySafe class. +/// +/// The type of the T value. +/// The source value. +/// The finallyAction value. internal sealed class FinallySafe(IObservable source, Action finallyAction) { + /// + /// The _finallyAction field. + /// private readonly Action _finallyAction = finallyAction ?? throw new ArgumentNullException(nameof(finallyAction)); + /// + /// The _source field. + /// private readonly IObservable _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable Run() => Observable.Create( o => { diff --git a/src/DynamicData/Cache/Internal/FullJoin.cs b/src/DynamicData/Cache/Internal/FullJoin.cs index 46bdb663f..5be021403 100644 --- a/src/DynamicData/Cache/Internal/FullJoin.cs +++ b/src/DynamicData/Cache/Internal/FullJoin.cs @@ -1,27 +1,57 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - -internal sealed class FullJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func, Optional, TDestination> resultSelector) +#endif + +/// +/// Provides members for the FullJoin class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. +internal sealed class FullJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { + /// + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); - private readonly Func, Optional, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _resultSelector field. + /// + private readonly Func, ReactiveUI.Primitives.Optional, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -59,7 +89,7 @@ public IObservable> Run() => Observable.Creat else { // update with no left value - joinedCache.AddOrUpdate(_resultSelector(change.Key, Optional.None, rightLookup), change.Key); + joinedCache.AddOrUpdate(_resultSelector(change.Key, ReactiveUI.Primitives.Optional.None, rightLookup), change.Key); } break; @@ -101,7 +131,7 @@ public IObservable> Run() => Observable.Creat else { // update with no right value - joinedCache.AddOrUpdate(_resultSelector(change.Key, left, Optional.None), change.Key); + joinedCache.AddOrUpdate(_resultSelector(change.Key, left, ReactiveUI.Primitives.Optional.None), change.Key); } } diff --git a/src/DynamicData/Cache/Internal/FullJoinMany.cs b/src/DynamicData/Cache/Internal/FullJoinMany.cs index 28ae5a008..02eca05bd 100644 --- a/src/DynamicData/Cache/Internal/FullJoinMany.cs +++ b/src/DynamicData/Cache/Internal/FullJoinMany.cs @@ -1,24 +1,57 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif -internal sealed class FullJoinMany(IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) +/// +/// Provides members for the FullJoinMany class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. +internal sealed class FullJoinMany(IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { + /// + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); - private readonly Func, IGrouping, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _resultSelector field. + /// + private readonly Func, IGrouping, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() { var emptyCache = Cache.Empty; diff --git a/src/DynamicData/Cache/Internal/GroupOn.cs b/src/DynamicData/Cache/Internal/GroupOn.cs index fd0936fe7..3e8e6d62f 100644 --- a/src/DynamicData/Cache/Internal/GroupOn.cs +++ b/src/DynamicData/Cache/Internal/GroupOn.cs @@ -1,24 +1,47 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the GroupOn class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The source value. +/// The groupSelectorKey value. +/// The regrouper value. internal sealed class GroupOn(IObservable> source, Func groupSelectorKey, IObservable? regrouper) where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The _groupSelectorKey field. + /// private readonly Func _groupSelectorKey = groupSelectorKey ?? throw new ArgumentNullException(nameof(groupSelectorKey)); + /// + /// The _regrouper field. + /// private readonly IObservable _regrouper = regrouper ?? Observable.Never(); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -38,11 +61,26 @@ public IObservable> Run() => Observabl return new CompositeDisposable(connected, disposer, subscriber, queue); }); - private sealed class Grouper(Func groupSelectorKey) +/// +/// Provides members for the Grouper class. +/// +/// The groupSelectorKey value. +private sealed class Grouper(Func groupSelectorKey) { + /// + /// The _groupCache field. + /// private readonly Dictionary> _groupCache = []; + + /// + /// The _itemCache field. + /// private readonly Dictionary _itemCache = []; + /// + /// Executes the Regroup operation. + /// + /// The result of the operation. public IGroupChangeSet Regroup() { // re-evaluate all items in the group @@ -50,8 +88,18 @@ public IGroupChangeSet Regroup() return HandleUpdates(new ChangeSet(items), true); } + /// + /// Executes the Update operation. + /// + /// The updates value. + /// The result of the operation. public IGroupChangeSet Update(IChangeSet updates) => HandleUpdates(updates); + /// + /// Executes the GetCache operation. + /// + /// The key value. + /// The result of the operation. private (ManagedGroup group, bool wasCreated) GetCache(TGroupKey key) { var cache = _groupCache.Lookup(key); @@ -65,6 +113,12 @@ public IGroupChangeSet Regroup() return (newcache, true); } + /// + /// Executes the HandleUpdates operation. + /// + /// The changes value. + /// The isRegrouping value. + /// The result of the operation. private GroupChangeSet HandleUpdates(IEnumerable> changes, bool isRegrouping = false) { var result = new List, TGroupKey>>(); @@ -216,34 +270,95 @@ private GroupChangeSet HandleUpdates(IEnumerable(result); } - private readonly struct ChangeWithGroup(Change change, Func keySelector) : IEquatable +/// +/// Represents the ChangeWithGroup value. +/// +/// The change value. +/// The keySelector value. +private readonly struct ChangeWithGroup(Change change, Func keySelector) : IEquatable { + /// + /// Gets the Item value. + /// public TObject Item { get; } = change.Current; + /// + /// Gets the Key value. + /// public TKey Key { get; } = change.Key; + /// + /// Gets the GroupKey value. + /// public TGroupKey GroupKey { get; } = keySelector(change.Current); + /// + /// Gets the Reason value. + /// public ChangeReason Reason { get; } = change.Reason; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(in ChangeWithGroup left, in ChangeWithGroup right) => left.Equals(right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(in ChangeWithGroup left, in ChangeWithGroup right) => !left.Equals(right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ChangeWithGroup other) => EqualityComparer.Default.Equals(Key, other.Key); + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is ChangeWithGroup group && Equals(group); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Key.GetHashCode(); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Key: {Key}, GroupKey: {GroupKey}, Item: {Item}"; } - private sealed class SuspendTracker : IDisposable +/// +/// Provides members for the SuspendTracker class. +/// +private sealed class SuspendTracker : IDisposable { + /// + /// The _trackedKeys field. + /// private readonly HashSet _trackedKeys = []; + + /// + /// The _disposables field. + /// private readonly CompositeDisposable _disposables = []; + /// + /// Executes the Add operation. + /// + /// The managedGroup value. public void Add(ManagedGroup managedGroup) { if (_trackedKeys.Add(managedGroup.Key)) @@ -252,6 +367,9 @@ public void Add(ManagedGroup managedGroup) } } + /// + /// Executes the Dispose operation. + /// public void Dispose() => _disposables.Dispose(); } } diff --git a/src/DynamicData/Cache/Internal/GroupOnDynamic.cs b/src/DynamicData/Cache/Internal/GroupOnDynamic.cs index 0e11bc594..cb35dcc6f 100644 --- a/src/DynamicData/Cache/Internal/GroupOnDynamic.cs +++ b/src/DynamicData/Cache/Internal/GroupOnDynamic.cs @@ -1,18 +1,32 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the GroupOnDynamic class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The source value. +/// The selectGroupObservable value. +/// The regrouper value. internal sealed class GroupOnDynamic(IObservable> source, IObservable> selectGroupObservable, IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { var dynamicGrouper = new DynamicGrouper(); @@ -27,54 +41,55 @@ public IObservable> Run() => Observabl // The first value from the Group Selector should update the Grouper with all the values seen so far // Then indicate a selector has been found. Subsequent values should just update the group selector. - var subGroupSelector = sharedGroupSelector - .SubscribeSafe( - onNext: groupSelector => + var subGroupSelector = PrimitivesLinqExtensions.SubscribeSafe( + sharedGroupSelector, + onNext: groupSelector => + { + if (hasSelector) { - if (hasSelector) - { - dynamicGrouper.SetGroupSelector(groupSelector, observer); - } - else - { - dynamicGrouper.Initialize(notGrouped.KeyValues, groupSelector, observer); - hasSelector = true; - } - }, - onError: observer.OnError); + dynamicGrouper.SetGroupSelector(groupSelector, observer); + } + else + { + dynamicGrouper.Initialize(notGrouped.KeyValues, groupSelector, observer); + hasSelector = true; + } + }, + onError: observer.OnError); // Ignore values until a selector has been provided // Then re-evaluate all the groupings each time it fires - var subRegrouper = sharedRegrouper - .SubscribeSafe( - onNext: _ => + var subRegrouper = PrimitivesLinqExtensions.SubscribeSafe( + sharedRegrouper, + onNext: _ => + { + if (hasSelector) { - if (hasSelector) - { - dynamicGrouper.RegroupAll(observer); - } - }, - onError: observer.OnError); + dynamicGrouper.RegroupAll(observer); + } + }, + onError: observer.OnError); - var subChanges = sharedSource - .SubscribeSafe( - onNext: changeSet => + var subChanges = PrimitivesLinqExtensions.SubscribeSafe( + sharedSource, + onNext: changeSet => + { + if (hasSelector) + { + dynamicGrouper.ProcessChangeSet(changeSet, observer); + } + else { - if (hasSelector) - { - dynamicGrouper.ProcessChangeSet(changeSet, observer); - } - else - { - notGrouped.Clone(changeSet); - } - }, - onError: observer.OnError); + notGrouped.Clone(changeSet); + } + }, + onError: observer.OnError); // Create an observable that completes when all 3 inputs complete so the downstream can be completed as well - var subOnComplete = Observable.Merge(sharedSource.ToUnit(), sharedGroupSelector.ToUnit(), sharedRegrouper) - .IgnoreElements() - .SubscribeSafe(observer.OnError, observer.OnCompleted); + var subOnComplete = PrimitivesLinqExtensions.SubscribeSafe( + Observable.Merge(sharedSource.ToUnit(), sharedGroupSelector.ToUnit(), sharedRegrouper).IgnoreElements(), + observer.OnError, + observer.OnCompleted); return new CompositeDisposable( sharedGroupSelector.Connect(), diff --git a/src/DynamicData/Cache/Internal/GroupOnImmutable.cs b/src/DynamicData/Cache/Internal/GroupOnImmutable.cs index ba33db031..763e04f9c 100644 --- a/src/DynamicData/Cache/Internal/GroupOnImmutable.cs +++ b/src/DynamicData/Cache/Internal/GroupOnImmutable.cs @@ -1,24 +1,47 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the GroupOnImmutable class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The source value. +/// The groupSelectorKey value. +/// The regrouper value. internal sealed class GroupOnImmutable(IObservable> source, Func groupSelectorKey, IObservable? regrouper) where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The _groupSelectorKey field. + /// private readonly Func _groupSelectorKey = groupSelectorKey ?? throw new ArgumentNullException(nameof(groupSelectorKey)); + /// + /// The _regrouper field. + /// private readonly IObservable _regrouper = regrouper ?? Observable.Never(); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -32,11 +55,26 @@ public IObservable> Run() => return new CompositeDisposable(groups.Merge(regroup).SubscribeSafe(observer), queue); }); - private sealed class Grouper(Func groupSelectorKey) +/// +/// Provides members for the Grouper class. +/// +/// The groupSelectorKey value. +private sealed class Grouper(Func groupSelectorKey) { + /// + /// The _allGroupings field. + /// private readonly Dictionary _allGroupings = []; + + /// + /// The _itemCache field. + /// private readonly Dictionary _itemCache = []; + /// + /// Executes the Regroup operation. + /// + /// The result of the operation. public IImmutableGroupChangeSet Regroup() { // re-evaluate all items in the group @@ -44,18 +82,45 @@ public IImmutableGroupChangeSet Regroup() return HandleUpdates(new ChangeSet(items)); } + /// + /// Executes the Update operation. + /// + /// The updates value. + /// The result of the operation. public IImmutableGroupChangeSet Update(IChangeSet updates) => HandleUpdates(updates); + /// + /// Executes the CreateMissingKeyException operation. + /// + /// The reason value. + /// The key value. + /// The result of the operation. private static MissingKeyException CreateMissingKeyException(ChangeReason reason, TKey key) { var message = $"{key} is missing from previous group on {reason}.{Environment.NewLine}Object type {typeof(TObject)}, Key type {typeof(TKey)}, Group key type {typeof(TGroupKey)}"; return new MissingKeyException(message); } + /// + /// Executes the GetGroupState operation. + /// + /// The grouping value. + /// The result of the operation. private static ImmutableGroup GetGroupState(GroupCache grouping) => new(grouping.Key, grouping.Cache); + /// + /// Executes the GetGroupState operation. + /// + /// The key value. + /// The cache value. + /// The result of the operation. private static ImmutableGroup GetGroupState(TGroupKey key, ICache cache) => new(key, cache); + /// + /// Executes the CreateChangeSet operation. + /// + /// The initialGroupState value. + /// The result of the operation. private ImmutableGroupChangeSet CreateChangeSet(IDictionary> initialGroupState) { var result = new List, TGroupKey>>(); @@ -78,7 +143,7 @@ private ImmutableGroupChangeSet CreateChangeSet(IDicti } else { - var previousState = Optional.Some(initialGroup.Value); + var previousState = ReactiveUI.Primitives.Optional.Some(initialGroup.Value); result.Add(new Change, TGroupKey>(ChangeReason.Update, key, currentState, previousState)); } } @@ -87,6 +152,11 @@ private ImmutableGroupChangeSet CreateChangeSet(IDicti return new ImmutableGroupChangeSet(result); } + /// + /// Executes the GetCache operation. + /// + /// The key value. + /// The result of the operation. private Tuple GetCache(TGroupKey key) { var cache = _allGroupings.Lookup(key); @@ -100,6 +170,11 @@ private Tuple GetCache(TGroupKey key) return Tuple.Create(newcache, true); } + /// + /// Executes the HandleUpdates operation. + /// + /// The changes value. + /// The result of the operation. private ImmutableGroupChangeSet HandleUpdates(IEnumerable> changes) { // need to keep track of effected groups to calculate correct notifications @@ -201,6 +276,12 @@ private ImmutableGroupChangeSet HandleUpdates(IEnumera return CreateChangeSet(initialStateOfGroups); } + /// + /// Executes the RemoveFromOldGroup operation. + /// + /// The groupState value. + /// The groupKey value. + /// The currentKey value. private void RemoveFromOldGroup(Dictionary> groupState, TGroupKey groupKey, TKey currentKey) => _allGroupings.Lookup(groupKey).IfHasValue( g => @@ -213,35 +294,92 @@ private void RemoveFromOldGroup(Dictionary change, Func keySelector) : IEquatable +/// +/// Represents the ChangeWithGroup value. +/// +/// The change value. +/// The keySelector value. +private readonly struct ChangeWithGroup(Change change, Func keySelector) : IEquatable { + /// + /// Gets the Item value. + /// public TObject Item { get; } = change.Current; + /// + /// Gets the Key value. + /// public TKey Key { get; } = change.Key; + /// + /// Gets the GroupKey value. + /// public TGroupKey GroupKey { get; } = keySelector(change.Current); + /// + /// Gets the Reason value. + /// public ChangeReason Reason { get; } = change.Reason; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(in ChangeWithGroup left, in ChangeWithGroup right) => left.Equals(right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(in ChangeWithGroup left, in ChangeWithGroup right) => !left.Equals(right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ChangeWithGroup other) => Key.Equals(other.Key); + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is ChangeWithGroup changeGroup && Equals(changeGroup); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Key.GetHashCode(); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Key: {Key}, GroupKey: {GroupKey}, Item: {Item}"; } - private sealed class GroupCache(TGroupKey key) +/// +/// Provides members for the GroupCache class. +/// +/// The key value. +private sealed class GroupCache(TGroupKey key) { + /// + /// Gets the Cache value. + /// public Cache Cache { get; } = new Cache(); + /// + /// Gets the Key value. + /// public TGroupKey Key { get; } = key; } } diff --git a/src/DynamicData/Cache/Internal/GroupOnObservable.cs b/src/DynamicData/Cache/Internal/GroupOnObservable.cs index 0555004e1..9d71fbde5 100644 --- a/src/DynamicData/Cache/Internal/GroupOnObservable.cs +++ b/src/DynamicData/Cache/Internal/GroupOnObservable.cs @@ -1,26 +1,56 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the GroupOnObservable class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The source value. +/// The selectGroup value. internal sealed class GroupOnObservable(IObservable> source, Func> selectGroup) where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => new Subscription(source, selectGroup, observer)); - // Maintains state for a single subscription - private sealed class Subscription : CacheParentSubscription> + +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : CacheParentSubscription> { + /// + /// The _grouper field. + /// private readonly DynamicGrouper _grouper = new(); + + /// + /// The _selectGroup field. + /// private readonly Func> _selectGroup; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The selectGroup value. + /// The observer value. public Subscription(IObservable> source, Func> selectGroup, IObserver> observer) : base(observer) { @@ -28,6 +58,10 @@ public Subscription(IObservable> source, Func + /// Executes the ParentOnNext operation. + /// + /// The changes value. protected override void ParentOnNext(IChangeSet changes) { // Process all the changes at once to preserve the changeset order @@ -51,18 +85,36 @@ protected override void ParentOnNext(IChangeSet changes) } } + /// + /// Executes the ChildOnNext operation. + /// + /// The tuple value. + /// The parentKey value. protected override void ChildOnNext((TGroupKey, TObject) tuple, TKey parentKey) => _grouper.AddOrUpdate(parentKey, tuple.Item1, tuple.Item2); + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. protected override void EmitChanges(IObserver> observer) => _grouper.EmitChanges(observer); + /// + /// Executes the Dispose operation. + /// + /// The disposing value. protected override void Dispose(bool disposing) { _grouper.Dispose(); base.Dispose(disposing); } + /// + /// Executes the AddGroupSubscription operation. + /// + /// The obj value. + /// The key value. private void AddGroupSubscription(TObject obj, TKey key) => AddChildSubscription(MakeChildObservable(_selectGroup(obj, key).DistinctUntilChanged().Select(groupKey => (groupKey, obj))), key); } diff --git a/src/DynamicData/Cache/Internal/GroupOnProperty.cs b/src/DynamicData/Cache/Internal/GroupOnProperty.cs index 8fa06893b..975c70200 100644 --- a/src/DynamicData/Cache/Internal/GroupOnProperty.cs +++ b/src/DynamicData/Cache/Internal/GroupOnProperty.cs @@ -1,22 +1,45 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive.Concurrency; -using System.Reactive.Linq; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the GroupOnProperty class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroup value. +/// The source value. +/// The groupSelectorKey value. +/// The throttle value. +/// The scheduler value. internal sealed class GroupOnProperty(IObservable> source, Expression> groupSelectorKey, TimeSpan? throttle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TKey : notnull where TGroup : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelectorKey.Compile(); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _source.Publish( shared => { diff --git a/src/DynamicData/Cache/Internal/GroupOnPropertyWithImmutableState.cs b/src/DynamicData/Cache/Internal/GroupOnPropertyWithImmutableState.cs index bc3755a44..8d3273142 100644 --- a/src/DynamicData/Cache/Internal/GroupOnPropertyWithImmutableState.cs +++ b/src/DynamicData/Cache/Internal/GroupOnPropertyWithImmutableState.cs @@ -1,24 +1,50 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive.Concurrency; -using System.Reactive.Linq; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the GroupOnPropertyWithImmutableState class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroup value. +/// The source value. +/// The groupSelectorKey value. +/// The throttle value. +/// The scheduler value. internal sealed class GroupOnPropertyWithImmutableState(IObservable> source, Expression> groupSelectorKey, TimeSpan? throttle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TKey : notnull where TGroup : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelectorKey.Compile(); + + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler = scheduler ?? GlobalConfig.DefaultScheduler; + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _source.Publish( shared => { diff --git a/src/DynamicData/Cache/Internal/IFilter.cs b/src/DynamicData/Cache/Internal/IFilter.cs index 6301a0cfa..f7bb17058 100644 --- a/src/DynamicData/Cache/Internal/IFilter.cs +++ b/src/DynamicData/Cache/Internal/IFilter.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Provides a filter. diff --git a/src/DynamicData/Cache/Internal/IKeySelector.cs b/src/DynamicData/Cache/Internal/IKeySelector.cs index 71c6e5aa9..d09206c72 100644 --- a/src/DynamicData/Cache/Internal/IKeySelector.cs +++ b/src/DynamicData/Cache/Internal/IKeySelector.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Selects a key from a item. diff --git a/src/DynamicData/Cache/Internal/ImmutableGroup.cs b/src/DynamicData/Cache/Internal/ImmutableGroup.cs index 82ffaae3d..3ec11d10b 100644 --- a/src/DynamicData/Cache/Internal/ImmutableGroup.cs +++ b/src/DynamicData/Cache/Internal/ImmutableGroup.cs @@ -1,16 +1,35 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the ImmutableGroup class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. internal sealed class ImmutableGroup : IGrouping, IEquatable> where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The _cache field. + /// private readonly Cache _cache; + /// + /// Initializes a new instance of the class. + /// + /// The key value. + /// The cache value. internal ImmutableGroup(TGroupKey key, ICache cache) { Key = key; @@ -18,20 +37,52 @@ internal ImmutableGroup(TGroupKey key, ICache cache) cache.KeyValues.ForEach(kvp => _cache.AddOrUpdate(kvp.Value, kvp.Key)); } + /// + /// Gets the Count value. + /// public int Count => _cache.Count; + /// + /// Gets the Items value. + /// public IEnumerable Items => _cache.Items; + /// + /// Gets the Key value. + /// public TGroupKey Key { get; } + /// + /// Gets the Keys value. + /// public IEnumerable Keys => _cache.Keys; + /// + /// Gets the KeyValues value. + /// public IEnumerable> KeyValues => _cache.KeyValues; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(ImmutableGroup left, ImmutableGroup right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(ImmutableGroup left, ImmutableGroup right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ImmutableGroup? other) { if (ReferenceEquals(this, other)) @@ -42,11 +93,29 @@ public bool Equals(ImmutableGroup? other) return other is not null && EqualityComparer.Default.Equals(Key, other.Key); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is ImmutableGroup value && Equals(value); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => EqualityComparer.Default.GetHashCode(Key); - public Optional Lookup(TKey key) => _cache.Lookup(key); - + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _cache.Lookup(key); + + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Grouping for: {Key} ({Count} items)"; } diff --git a/src/DynamicData/Cache/Internal/ImmutableGroupChangeSet.cs b/src/DynamicData/Cache/Internal/ImmutableGroupChangeSet.cs index 81ebbc290..57af027ab 100644 --- a/src/DynamicData/Cache/Internal/ImmutableGroupChangeSet.cs +++ b/src/DynamicData/Cache/Internal/ImmutableGroupChangeSet.cs @@ -1,21 +1,42 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ImmutableGroupChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. internal sealed class ImmutableGroupChangeSet : ChangeSet, TGroupKey>, IImmutableGroupChangeSet where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The Empty field. + /// public static new readonly IImmutableGroupChangeSet Empty = new ImmutableGroupChangeSet(); + /// + /// Initializes a new instance of the class. + /// + /// The items value. public ImmutableGroupChangeSet(IEnumerable, TGroupKey>> items) : base(items) { } + /// + /// Initializes a new instance of the class. + /// private ImmutableGroupChangeSet() { } diff --git a/src/DynamicData/Cache/Internal/IndexAndNode.cs b/src/DynamicData/Cache/Internal/IndexAndNode.cs index d80b66fd9..1da0dc3ab 100644 --- a/src/DynamicData/Cache/Internal/IndexAndNode.cs +++ b/src/DynamicData/Cache/Internal/IndexAndNode.cs @@ -1,20 +1,45 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Diagnostics.CodeAnalysis; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the IndexAndNode class. +/// internal static class IndexAndNode { + /// + /// Executes the Create operation. + /// + /// The type of the TNodeValue value. + /// The index value. + /// The value value. + /// The result of the operation. public static IndexAndNode Create(int index, LinkedListNode value) => new(index, value); } +/// +/// Provides members for the IndexAndNode class. +/// +/// The type of the TNodeValue value. +/// The index value. +/// The node value. [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Same class name, different generics.")] internal sealed class IndexAndNode(int index, LinkedListNode node) { + /// + /// Gets the Index value. + /// public int Index { get; } = index; + /// + /// Gets the Node value. + /// public LinkedListNode Node { get; } = node; } diff --git a/src/DynamicData/Cache/Internal/IndexCalculator.cs b/src/DynamicData/Cache/Internal/IndexCalculator.cs index 709245408..622023a01 100644 --- a/src/DynamicData/Cache/Internal/IndexCalculator.cs +++ b/src/DynamicData/Cache/Internal/IndexCalculator.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Calculates a sequential change set. @@ -16,14 +21,25 @@ namespace DynamicData.Cache.Internal; /// /// The comparer to use. /// Selected indexing optimisations. +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class IndexCalculator(KeyValueComparer comparer, SortOptimisations optimisations) where TObject : notnull where TKey : notnull { + /// + /// The _comparer field. + /// private KeyValueComparer _comparer = comparer; + /// + /// Gets the Comparer value. + /// public IComparer> Comparer => _comparer; + /// + /// Gets the List value. + /// public List> List { get; private set; } = []; /// @@ -127,6 +143,11 @@ public IChangeSet Calculate(IChangeSet changes) return new ChangeSet(result); } + /// + /// Executes the ChangeComparer operation. + /// + /// The comparer value. + /// The result of the operation. public IChangeSet ChangeComparer(KeyValueComparer comparer) { _comparer = comparer; @@ -147,6 +168,10 @@ public IChangeSet Load(ChangeAwareCache cache) return new ChangeSet(initialItems); } + /// + /// Executes the Reorder operation. + /// + /// The result of the operation. public IChangeSet Reorder() { var result = new List>(); @@ -189,6 +214,11 @@ public IChangeSet Reorder() /// The cache. public void Reset(ChangeAwareCache cache) => List = [.. cache.KeyValues.OrderBy(kv => kv, _comparer)]; + /// + /// Executes the GetCurrentPosition operation. + /// + /// The item value. + /// The result of the operation. private int GetCurrentPosition(KeyValuePair item) { int index; @@ -215,6 +245,11 @@ private int GetCurrentPosition(KeyValuePair item) return index; } + /// + /// Executes the GetInsertPositionBinary operation. + /// + /// The item value. + /// The result of the operation. private int GetInsertPositionBinary(KeyValuePair item) { var index = List.BinarySearch(item, _comparer); @@ -232,6 +267,12 @@ private int GetInsertPositionBinary(KeyValuePair item) return ~index; } + /// + /// Executes the GetInsertPositionLinear operation. + /// + /// The list value. + /// The item value. + /// The result of the operation. private int GetInsertPositionLinear(List> list, KeyValuePair item) { for (var i = 0; i < list.Count; i++) diff --git a/src/DynamicData/Cache/Internal/InnerJoin.cs b/src/DynamicData/Cache/Internal/InnerJoin.cs index e27c565c6..018dd9ae2 100644 --- a/src/DynamicData/Cache/Internal/InnerJoin.cs +++ b/src/DynamicData/Cache/Internal/InnerJoin.cs @@ -1,12 +1,26 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the InnerJoin class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. internal sealed class InnerJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func<(TLeftKey leftKey, TRightKey rightKey), TLeft, TRight, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -14,14 +28,30 @@ internal sealed class InnerJoin + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); + /// + /// The _resultSelector field. + /// private readonly Func<(TLeftKey leftKey, TRightKey rightKey), TLeft, TRight, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Cache/Internal/InnerJoinMany.cs b/src/DynamicData/Cache/Internal/InnerJoinMany.cs index dcec95d86..a52998888 100644 --- a/src/DynamicData/Cache/Internal/InnerJoinMany.cs +++ b/src/DynamicData/Cache/Internal/InnerJoinMany.cs @@ -1,9 +1,26 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the InnerJoinMany class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. internal sealed class InnerJoinMany(IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -11,14 +28,30 @@ internal sealed class InnerJoinMany + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); + /// + /// The _resultSelector field. + /// private readonly Func, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() { var rightGrouped = _right.GroupWithImmutableState(_rightKeySelector); diff --git a/src/DynamicData/Cache/Internal/KeyComparer.cs b/src/DynamicData/Cache/Internal/KeyComparer.cs index 6cc831558..2b76cbf83 100644 --- a/src/DynamicData/Cache/Internal/KeyComparer.cs +++ b/src/DynamicData/Cache/Internal/KeyComparer.cs @@ -1,12 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the KeyComparer class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class KeyComparer : IEqualityComparer> { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(KeyValuePair x, KeyValuePair y) => x.Key?.Equals(y.Key) ?? false; + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(KeyValuePair obj) => obj.Key is null ? 0 : obj.Key.GetHashCode(); } diff --git a/src/DynamicData/Cache/Internal/KeySelector.cs b/src/DynamicData/Cache/Internal/KeySelector.cs index 87127dfcb..b77f876b7 100644 --- a/src/DynamicData/Cache/Internal/KeySelector.cs +++ b/src/DynamicData/Cache/Internal/KeySelector.cs @@ -1,18 +1,38 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Diagnostics.CodeAnalysis; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the KeySelector class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The keySelector value. internal sealed class KeySelector(Func keySelector) : IKeySelector { + /// + /// The _keySelector field. + /// private readonly Func _keySelector = keySelector ?? throw new ArgumentNullException(nameof(keySelector)); + /// + /// Gets the Type value. + /// [SuppressMessage("Design", "CA1822: Member can be static", Justification = "Backwards compatibilty")] public Type Type => typeof(TObject); + /// + /// Executes the GetKey operation. + /// + /// The item value. + /// The result of the operation. public TKey GetKey(TObject item) { try diff --git a/src/DynamicData/Cache/Internal/KeySelectorException.cs b/src/DynamicData/Cache/Internal/KeySelectorException.cs index 5a5fe737b..d539f5e58 100644 --- a/src/DynamicData/Cache/Internal/KeySelectorException.cs +++ b/src/DynamicData/Cache/Internal/KeySelectorException.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// An exception that happens when there is a problem with the key selector. diff --git a/src/DynamicData/Cache/Internal/KeyValueCollection.cs b/src/DynamicData/Cache/Internal/KeyValueCollection.cs index d743073f5..4e2b8c72c 100644 --- a/src/DynamicData/Cache/Internal/KeyValueCollection.cs +++ b/src/DynamicData/Cache/Internal/KeyValueCollection.cs @@ -1,15 +1,33 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the KeyValueCollection class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class KeyValueCollection : IKeyValueCollection { + /// + /// The _items field. + /// private readonly IReadOnlyCollection> _items; + /// + /// Initializes a new instance of the class. + /// + /// The items value. + /// The comparer value. + /// The sortReason value. + /// The optimisations value. public KeyValueCollection(IReadOnlyCollection> items, IComparer> comparer, SortReason sortReason, SortOptimisations optimisations) { _items = items ?? throw new ArgumentNullException(nameof(items)); @@ -18,6 +36,9 @@ public KeyValueCollection(IReadOnlyCollection> items Optimisations = optimisations; } + /// + /// Initializes a new instance of the class. + /// public KeyValueCollection() { Optimisations = SortOptimisations.None; @@ -33,15 +54,36 @@ public KeyValueCollection() /// public IComparer> Comparer { get; } + /// + /// Gets the Count value. + /// public int Count => _items.Count; + /// + /// Gets the Optimisations value. + /// public SortOptimisations Optimisations { get; } + /// + /// Gets the SortReason value. + /// public SortReason SortReason { get; } + /// + /// Gets or sets the indexed value. + /// + /// The index value. public KeyValuePair this[int index] => _items.ElementAt(index); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() => _items.GetEnumerator(); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/Cache/Internal/KeyValueComparer.cs b/src/DynamicData/Cache/Internal/KeyValueComparer.cs index b9f3face6..cc3a96d4f 100644 --- a/src/DynamicData/Cache/Internal/KeyValueComparer.cs +++ b/src/DynamicData/Cache/Internal/KeyValueComparer.cs @@ -1,11 +1,28 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the KeyValueComparer class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The comparer value. internal sealed class KeyValueComparer(IComparer? comparer = null) : IComparer> { + /// + /// Executes the Compare operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public int Compare(KeyValuePair x, KeyValuePair y) { if (comparer is not null) diff --git a/src/DynamicData/Cache/Internal/LeftJoin.cs b/src/DynamicData/Cache/Internal/LeftJoin.cs index f0709cb75..aebe2ea78 100644 --- a/src/DynamicData/Cache/Internal/LeftJoin.cs +++ b/src/DynamicData/Cache/Internal/LeftJoin.cs @@ -1,27 +1,57 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - -internal sealed class LeftJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) +#endif + +/// +/// Provides members for the LeftJoin class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. +internal sealed class LeftJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { + /// + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); - private readonly Func, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _resultSelector field. + /// + private readonly Func, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -92,7 +122,7 @@ public IObservable> Run() => Observable.Creat { var priorLeft = leftCache.Lookup(priorForeignKey); if (priorLeft.HasValue) - joined.AddOrUpdate(_resultSelector(priorForeignKey, priorLeft.Value, Optional.None), priorForeignKey); + joined.AddOrUpdate(_resultSelector(priorForeignKey, priorLeft.Value, ReactiveUI.Primitives.Optional.None), priorForeignKey); } if (left.HasValue) @@ -105,7 +135,7 @@ public IObservable> Run() => Observable.Creat case ChangeReason.Remove: if (left.HasValue) - joined.AddOrUpdate(_resultSelector(foreignKey, left.Value, Optional.None), foreignKey); + joined.AddOrUpdate(_resultSelector(foreignKey, left.Value, ReactiveUI.Primitives.Optional.None), foreignKey); rightForeignKeysByKey.Remove(change.Key); @@ -118,7 +148,7 @@ public IObservable> Run() => Observable.Creat { var priorLeft = leftCache.Lookup(priorForeignKey); if (priorLeft.HasValue) - joined.AddOrUpdate(_resultSelector(priorForeignKey, priorLeft.Value, Optional.None), priorForeignKey); + joined.AddOrUpdate(_resultSelector(priorForeignKey, priorLeft.Value, ReactiveUI.Primitives.Optional.None), priorForeignKey); if (left.HasValue) joined.AddOrUpdate(_resultSelector(foreignKey, left.Value, right), foreignKey); diff --git a/src/DynamicData/Cache/Internal/LeftJoinMany.cs b/src/DynamicData/Cache/Internal/LeftJoinMany.cs index 8ce0b1f06..d9df78498 100644 --- a/src/DynamicData/Cache/Internal/LeftJoinMany.cs +++ b/src/DynamicData/Cache/Internal/LeftJoinMany.cs @@ -1,9 +1,26 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the LeftJoinMany class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. internal sealed class LeftJoinMany(IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -11,14 +28,30 @@ internal sealed class LeftJoinMany + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); + /// + /// The _resultSelector field. + /// private readonly Func, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() { var emptyCache = Cache.Empty; diff --git a/src/DynamicData/Cache/Internal/LockFreeObservableCache.cs b/src/DynamicData/Cache/Internal/LockFreeObservableCache.cs index be539b82c..a67a6fed2 100644 --- a/src/DynamicData/Cache/Internal/LockFreeObservableCache.cs +++ b/src/DynamicData/Cache/Internal/LockFreeObservableCache.cs @@ -1,13 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// An observable cache which exposes an update API. Used at the root @@ -20,19 +22,37 @@ public sealed class LockFreeObservableCache : IObservableCache> _changes = new(); + /// + /// The _changes field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + private readonly Signal> _changes = new(); - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] - private readonly Subject> _changesPreview = new(); + /// + /// The _changesPreview field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + private readonly Signal> _changesPreview = new(); - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] - private readonly Subject _countChanged = new(); + /// + /// The _countChanged field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + private readonly Signal _countChanged = new(); + /// + /// The _cleanUp field. + /// private readonly IDisposable _cleanUp; + /// + /// The _innerCache field. + /// private readonly ChangeAwareCache _innerCache = new(); + /// + /// The _updater field. + /// private readonly ICacheUpdater _updater; /// @@ -41,6 +61,8 @@ public sealed class LockFreeObservableCache : IObservableCacheThe source. public LockFreeObservableCache(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + _updater = new CacheUpdater(_innerCache); var loader = source.Select( @@ -91,6 +113,9 @@ public LockFreeObservableCache() public IReadOnlyDictionary KeyValues => new Dictionary(_innerCache.GetDictionary()); /// + /// The predicate value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public IObservable> Connect(Func? predicate = null, bool suppressEmptyChangeSets = true) => Observable.Defer( () => { @@ -118,10 +143,7 @@ public IObservable> Connect(Func? predi /// The edit action. public void Edit(Action> editAction) { - if (editAction is null) - { - throw new ArgumentNullException(nameof(editAction)); - } + ArgumentExceptionHelper.ThrowIfNull(editAction); editAction(_updater); _changes.OnNext(_innerCache.CaptureChanges()); @@ -135,9 +157,11 @@ public void Edit(Action> editAction) /// /// Fast indexed lookup. /// - public Optional Lookup(TKey key) => _innerCache.Lookup(key); + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _innerCache.Lookup(key); /// + /// The predicate value. + /// The result of the operation. public IObservable> Preview(Func? predicate = null) => predicate is null ? _changesPreview : _changesPreview.Filter(predicate); /// diff --git a/src/DynamicData/Cache/Internal/ManagedGroup.cs b/src/DynamicData/Cache/Internal/ManagedGroup.cs index 02d3583fa..47a7a6817 100644 --- a/src/DynamicData/Cache/Internal/ManagedGroup.cs +++ b/src/DynamicData/Cache/Internal/ManagedGroup.cs @@ -1,23 +1,54 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ManagedGroup class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The groupKey value. internal sealed class ManagedGroup(TGroupKey groupKey) : IGroup, IDisposable where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly IntermediateCache _cache = new(); + /// + /// Gets the Cache value. + /// public IObservableCache Cache => _cache; + /// + /// Gets the Key value. + /// public TGroupKey Key { get; } = groupKey; + /// + /// Gets the Count value. + /// internal int Count => _cache.Count; + /// + /// Executes the Dispose operation. + /// public void Dispose() => _cache.Dispose(); + /// + /// Executes the SuspendNotifications operation. + /// + /// The result of the operation. public IDisposable SuspendNotifications() => _cache.SuspendNotifications(); /// @@ -58,9 +89,22 @@ public override bool Equals(object? obj) /// public override string ToString() => $"Group: {Key}"; + /// + /// Executes the GetInitialUpdates operation. + /// + /// The result of the operation. internal IChangeSet GetInitialUpdates() => _cache.GetInitialUpdates(); + /// + /// Executes the Update operation. + /// + /// The updateAction value. internal void Update(Action> updateAction) => _cache.Edit(updateAction); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. private bool Equals(ManagedGroup other) => EqualityComparer.Default.Equals(Key, other.Key); } diff --git a/src/DynamicData/Cache/Internal/MergeChangeSets.cs b/src/DynamicData/Cache/Internal/MergeChangeSets.cs index ebf4b22f1..674847daa 100644 --- a/src/DynamicData/Cache/Internal/MergeChangeSets.cs +++ b/src/DynamicData/Cache/Internal/MergeChangeSets.cs @@ -1,25 +1,43 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Operator that is similiar to Merge but intelligently handles Cache ChangeSets. /// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The equalityComparer value. +/// The comparer value. internal sealed class MergeChangeSets(IObservable>> source, IEqualityComparer? equalityComparer, IComparer? comparer) where TObject : notnull where TKey : notnull { + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The equalityComparer value. + /// The comparer value. + /// The completable value. + /// The scheduler value. public MergeChangeSets(IEnumerable>> source, IEqualityComparer? equalityComparer, IComparer? comparer, bool completable, IScheduler? scheduler = null) : this(CreateObservable(source, completable, scheduler), equalityComparer, comparer) { } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -30,25 +48,47 @@ public IObservable> Run() => Observable.Create(() => cache.Items, comparer, equalityComparer); // Create a ChangeSet of Caches, synchronize, update the local copy, and merge the sub-observables together. - return new CompositeDisposable(CreateContainerObservable(source, queue) - .SynchronizeSafe(queue) - .Do(cache.Clone) - .MergeMany(mc => mc.Source.Do(static _ => { }, observer.OnError)) - .SubscribeSafe( + return new CompositeDisposable( + PrimitivesLinqExtensions.SubscribeSafe( + CreateContainerObservable(source, queue) + .SynchronizeSafe(queue) + .Do(cache.Clone) + .MergeMany(mc => mc.Source.Do(static _ => { }, observer.OnError)), changes => changeTracker.ProcessChangeSet(changes, observer), observer.OnError, - observer.OnCompleted), queue); + observer.OnCompleted), + queue); }); - // Can optimize for the Add case because that's the only one that applies + + /// + /// Executes the CreateChange operation. + /// + /// The source value. + /// The index value. + /// The queue value. + /// The result of the operation. private static Change, int> CreateChange(IObservable> source, int index, SharedDeliveryQueue queue) => new(ChangeReason.Add, index, new ChangeSetCache(source.IgnoreSameReferenceUpdate().SynchronizeSafe(queue))); - // Create a ChangeSet Observable that produces ChangeSets with a single Add event for each new sub-observable + + /// + /// Executes the CreateContainerObservable operation. + /// + /// The source value. + /// The queue value. + /// The result of the operation. private static IObservable, int>> CreateContainerObservable(IObservable>> source, SharedDeliveryQueue queue) => source.Select((src, index) => new ChangeSet, int>(new[] { CreateChange(src, index, queue) })); - // Create a ChangeSet Observable with a single event that adds all the values in the enum (and then completes, maybe) + + /// + /// Executes the CreateObservable operation. + /// + /// The source value. + /// The completable value. + /// The scheduler value. + /// The result of the operation. private static IObservable>> CreateObservable(IEnumerable>> source, bool completable, IScheduler? scheduler = null) { var obs = (scheduler != null) ? source.ToObservable(scheduler) : source.ToObservable(); diff --git a/src/DynamicData/Cache/Internal/MergeMany.cs b/src/DynamicData/Cache/Internal/MergeMany.cs index fe2eecc75..cd4f34bbf 100644 --- a/src/DynamicData/Cache/Internal/MergeMany.cs +++ b/src/DynamicData/Cache/Internal/MergeMany.cs @@ -1,35 +1,62 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the MergeMany class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TDestination value. internal sealed class MergeMany where TObject : notnull where TKey : notnull { + /// + /// The _observableSelector field. + /// private readonly Func> _observableSelector; + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The observableSelector value. public MergeMany(IObservable> source, Func> observableSelector) { _source = source ?? throw new ArgumentNullException(nameof(source)); _observableSelector = observableSelector ?? throw new ArgumentNullException(nameof(observableSelector)); } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The observableSelector value. public MergeMany(IObservable> source, Func> observableSelector) { - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); _source = source ?? throw new ArgumentNullException(nameof(source)); _observableSelector = (t, _) => observableSelector(t); } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable Run() => Observable.Create( observer => { @@ -51,6 +78,11 @@ public IObservable Run() => Observable.Create( .Subscribe(static _ => { }, observer.OnError)); }); + /// + /// Executes the CheckCompleted operation. + /// + /// The counter value. + /// The queue value. private static void CheckCompleted(StrongBox counter, DeliveryQueue queue) { if (Interlocked.Decrement(ref counter.Value) == 0 && !queue.IsTerminated) diff --git a/src/DynamicData/Cache/Internal/MergeManyCacheChangeSets.cs b/src/DynamicData/Cache/Internal/MergeManyCacheChangeSets.cs index 551cc8bbf..c67107933 100644 --- a/src/DynamicData/Cache/Internal/MergeManyCacheChangeSets.cs +++ b/src/DynamicData/Cache/Internal/MergeManyCacheChangeSets.cs @@ -1,30 +1,62 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Operator that is similiar to MergeMany but intelligently handles Cache ChangeSets. /// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The type of the TDestinationKey value. +/// The source value. +/// The changeSetSelector value. +/// The equalityComparer value. +/// The comparer value. internal sealed class MergeManyCacheChangeSets(IObservable> source, Func>> changeSetSelector, IEqualityComparer? equalityComparer, IComparer? comparer) where TObject : notnull where TKey : notnull where TDestination : notnull where TDestinationKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => new Subscription(source, changeSetSelector, observer, equalityComparer, comparer)); - // Maintains state for a single subscription - private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> + +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> { + /// + /// The _cache field. + /// private readonly Cache, TKey> _cache = new(); + + /// + /// The _changeSetMergeTracker field. + /// private readonly ChangeSetMergeTracker _changeSetMergeTracker; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The changeSetSelector value. + /// The observer value. + /// The equalityComparer value. + /// The comparer value. public Subscription( IObservable> source, Func>> changeSetSelector, @@ -40,7 +72,11 @@ public Subscription( new ChangeSetCache(MakeChildObservable(changeSetSelector(obj, key).IgnoreSameReferenceUpdate())))); } - protected override void ParentOnNext(IChangeSet, TKey> changes) + /// + /// Executes the ParentOnNext operation. + /// + /// The changes value. + protected override void ParentOnNext(IChangeSet, TKey> changes) { // Process all the changes at once to preserve the changeset order foreach (var change in changes.ToConcreteType()) @@ -61,16 +97,25 @@ protected override void ParentOnNext(IChangeSet + /// Executes the ChildOnNext operation. + /// + /// The changes value. + /// The parentKey value. protected override void ChildOnNext(IChangeSet changes, TKey parentKey) => _changeSetMergeTracker.ProcessChangeSet(changes, null); + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. protected override void EmitChanges(IObserver> observer) => _changeSetMergeTracker.EmitChanges(observer); } diff --git a/src/DynamicData/Cache/Internal/MergeManyCacheChangeSetsSourceCompare.cs b/src/DynamicData/Cache/Internal/MergeManyCacheChangeSetsSourceCompare.cs index a49ad8223..65d5fea48 100644 --- a/src/DynamicData/Cache/Internal/MergeManyCacheChangeSetsSourceCompare.cs +++ b/src/DynamicData/Cache/Internal/MergeManyCacheChangeSetsSourceCompare.cs @@ -1,39 +1,87 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Alternate version of MergeManyCacheChangeSets that uses a Comparer of the source, not the destination type /// So that items from the most important source go into the resulting changeset. /// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The type of the TDestinationKey value. +/// The source value. +/// The selector value. +/// The parentCompare value. +/// The equalityComparer value. +/// The childCompare value. +/// The reevalOnRefresh value. internal sealed class MergeManyCacheChangeSetsSourceCompare(IObservable> source, Func>> selector, IComparer parentCompare, IEqualityComparer? equalityComparer, IComparer? childCompare, bool reevalOnRefresh = false) where TObject : notnull where TKey : notnull where TDestination : notnull where TDestinationKey : notnull { + /// + /// The _changeSetSelector field. + /// private readonly Func>> _changeSetSelector = (obj, key) => selector(obj, key).Transform(dest => new ParentChildEntry(obj, dest)); + /// + /// The _comparer field. + /// private readonly IComparer _comparer = (childCompare is null) ? new ParentOnlyCompare(parentCompare) : new ParentChildCompare(parentCompare, childCompare); + /// + /// The _equalityComparer field. + /// private readonly IEqualityComparer? _equalityComparer = (equalityComparer != null) ? new ParentChildEqualityCompare(equalityComparer) : null; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => new Subscription(source, _changeSetSelector, observer, _comparer, _equalityComparer, reevalOnRefresh)) .TransformImmutable(entry => entry.Child); - // Maintains state for a single subscription - private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> + +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> { + /// + /// The _cache field. + /// private readonly Cache, TKey> _cache = new(); + + /// + /// The _changeSetMergeTracker field. + /// private readonly ChangeSetMergeTracker _changeSetMergeTracker; + + /// + /// The _reevalOnRefresh field. + /// private readonly bool _reevalOnRefresh; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The changeSetSelector value. + /// The observer value. + /// The comparer value. + /// The equalityComparer value. + /// The reevalOnRefresh value. public Subscription( IObservable> source, Func>> changeSetSelector, @@ -51,6 +99,10 @@ public Subscription( new ChangeSetCache(MakeChildObservable(changeSetSelector(obj, key).IgnoreSameReferenceUpdate())))); } + /// + /// Executes the ParentOnNext operation. + /// + /// The changes value. protected override void ParentOnNext(IChangeSet, TKey> changes) { // Process all the changes at once to preserve the changeset order @@ -86,17 +138,42 @@ protected override void ParentOnNext(IChangeSet + /// Executes the ChildOnNext operation. + /// + /// The changes value. + /// The parentKey value. protected override void ChildOnNext(IChangeSet changes, TKey parentKey) => _changeSetMergeTracker.ProcessChangeSet(changes, null); + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. protected override void EmitChanges(IObserver> observer) => _changeSetMergeTracker.EmitChanges(observer); } + /// + /// Represents the ParentChildEntry record. + /// + /// The Parent value. + /// The Child value. private sealed record ParentChildEntry(TObject Parent, TDestination Child); - private sealed class ParentChildCompare(IComparer comparerParent, IComparer comparerChild) : Comparer +/// +/// Provides members for the ParentChildCompare class. +/// +/// The comparerParent value. +/// The comparerChild value. +private sealed class ParentChildCompare(IComparer comparerParent, IComparer comparerChild) : Comparer { + /// + /// Executes the Compare operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public override int Compare(ParentChildEntry? x, ParentChildEntry? y) => (x, y) switch { (not null, not null) => comparerParent.Compare(x.Parent, y.Parent) switch @@ -110,8 +187,18 @@ private sealed class ParentChildCompare(IComparer comparerParent, IComp }; } - private sealed class ParentOnlyCompare(IComparer comparer) : Comparer +/// +/// Provides members for the ParentOnlyCompare class. +/// +/// The comparer value. +private sealed class ParentOnlyCompare(IComparer comparer) : Comparer { + /// + /// Executes the Compare operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public override int Compare(ParentChildEntry? x, ParentChildEntry? y) => (x, y) switch { (not null, not null) => comparer.Compare(x.Parent, y.Parent), @@ -121,8 +208,18 @@ private sealed class ParentOnlyCompare(IComparer comparer) : Comparer

comparer) : EqualityComparer +///

+/// Provides members for the ParentChildEqualityCompare class. +/// +/// The comparer value. +private sealed class ParentChildEqualityCompare(IEqualityComparer comparer) : EqualityComparer { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public override bool Equals(ParentChildEntry? x, ParentChildEntry? y) => (x, y) switch { (not null, not null) => comparer.Equals(x.Child, y.Child), @@ -130,6 +227,11 @@ private sealed class ParentChildEqualityCompare(IEqualityComparer _ => false, }; + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public override int GetHashCode(ParentChildEntry obj) => comparer.GetHashCode(obj.Child); } } diff --git a/src/DynamicData/Cache/Internal/MergeManyItems.cs b/src/DynamicData/Cache/Internal/MergeManyItems.cs index 26b85614b..c6bd5e001 100644 --- a/src/DynamicData/Cache/Internal/MergeManyItems.cs +++ b/src/DynamicData/Cache/Internal/MergeManyItems.cs @@ -1,35 +1,65 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the MergeManyItems class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TDestination value. internal sealed class MergeManyItems where TObject : notnull where TKey : notnull { + /// + /// The _observableSelector field. + /// private readonly Func> _observableSelector; + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The observableSelector value. public MergeManyItems(IObservable> source, Func> observableSelector) { - _source = source ?? throw new ArgumentNullException(nameof(source)); - _observableSelector = observableSelector ?? throw new ArgumentNullException(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); + + _source = source; + _observableSelector = observableSelector; } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The observableSelector value. public MergeManyItems(IObservable> source, Func> observableSelector) { - if (observableSelector is null) - { - throw new ArgumentNullException(nameof(observableSelector)); - } + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); - _source = source ?? throw new ArgumentNullException(nameof(source)); + _source = source; _observableSelector = (t, _) => observableSelector(t); } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => _source.SubscribeMany((t, v) => _observableSelector(t, v).Select(z => new ItemWithValue(t, z)).SubscribeSafe(observer)).Subscribe()); } diff --git a/src/DynamicData/Cache/Internal/MergeManyListChangeSets.cs b/src/DynamicData/Cache/Internal/MergeManyListChangeSets.cs index bd7b18f4d..66e6a3d3a 100644 --- a/src/DynamicData/Cache/Internal/MergeManyListChangeSets.cs +++ b/src/DynamicData/Cache/Internal/MergeManyListChangeSets.cs @@ -1,29 +1,60 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Reactive.Linq; -using DynamicData.Internal; using DynamicData.List.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif /// /// Operator that is similiar to MergeMany but intelligently handles List ChangeSets. /// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The source value. +/// The selector value. +/// The equalityComparer value. internal sealed class MergeManyListChangeSets(IObservable> source, Func>> selector, IEqualityComparer? equalityComparer) where TObject : notnull where TKey : notnull where TDestination : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => new Subscription(source, selector, observer, equalityComparer)); - // Maintains state for a single subscription + + /// + /// Provides members for the Subscription class. + /// private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> { + /// + /// The _changeSetMergeTracker field. + /// private readonly ChangeSetMergeTracker _changeSetMergeTracker = new(); + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The selector value. + /// The observer value. + /// The equalityComparer value. public Subscription( IObservable> source, Func>> selector, @@ -36,6 +67,10 @@ public Subscription( new ClonedListChangeSet(MakeChildObservable(selector(obj, key).RemoveIndex()), equalityComparer))); } + /// + /// Executes the ParentOnNext operation. + /// + /// The changes value. protected override void ParentOnNext(IChangeSet, TKey> changes) { // Process all the changes at once to preserve the changeset order @@ -62,9 +97,18 @@ protected override void ParentOnNext(IChangeSet + /// Executes the ChildOnNext operation. + /// + /// The child value. + /// The parentKey value. protected override void ChildOnNext(IChangeSet child, TKey parentKey) => _changeSetMergeTracker.ProcessChangeSet(child, null); + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. protected override void EmitChanges(IObserver> observer) => _changeSetMergeTracker.EmitChanges(observer); } diff --git a/src/DynamicData/Cache/Internal/ObservableWithValue.cs b/src/DynamicData/Cache/Internal/ObservableWithValue.cs index 51ae8ac9d..a651e2e85 100644 --- a/src/DynamicData/Cache/Internal/ObservableWithValue.cs +++ b/src/DynamicData/Cache/Internal/ObservableWithValue.cs @@ -1,23 +1,45 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ObservableWithValue class. +/// +/// The type of the TObject value. +/// The type of the TValue value. internal sealed class ObservableWithValue where TValue : notnull { + /// + /// Initializes a new instance of the class. + /// + /// The item value. + /// The source value. public ObservableWithValue(TObject item, IObservable source) { Item = item; Observable = source.Do(value => LatestValue = value); } + /// + /// Gets the Item value. + /// public TObject Item { get; } - public Optional LatestValue { get; private set; } = Optional.None; + /// + /// Gets the LatestValue value. + /// + public ReactiveUI.Primitives.Optional LatestValue { get; private set; } = ReactiveUI.Primitives.Optional.None; + /// + /// Gets the Observable value. + /// public IObservable Observable { get; } } diff --git a/src/DynamicData/Cache/Internal/OfType.cs b/src/DynamicData/Cache/Internal/OfType.cs index 17546116d..6cf00d286 100644 --- a/src/DynamicData/Cache/Internal/OfType.cs +++ b/src/DynamicData/Cache/Internal/OfType.cs @@ -1,67 +1,81 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the OfType class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The source value. +/// The suppressEmptyChangeSets value. internal sealed class OfType(IObservable> source, bool suppressEmptyChangeSets) where TObject : notnull where TKey : notnull where TDestination : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => - Observable.Create>(observer => source - .SubscribeSafe( - onNext: upstreamChanges => - { - var downstreamChanges = new ChangeSet(capacity: upstreamChanges.Count); + Observable.Create>(observer => PrimitivesLinqExtensions.SubscribeSafe( + source, + onNext: upstreamChanges => + { + var downstreamChanges = new ChangeSet(capacity: upstreamChanges.Count); - try + try + { + foreach (var change in upstreamChanges.ToConcreteType()) { - foreach (var change in upstreamChanges.ToConcreteType()) - { - // Don't propagate moves at all, since we don't preserve indexes. - if (change.Reason is ChangeReason.Moved) - continue; - - Change? transformedChange = (change.Reason, change.Current) switch - { - // Update when Current is the right type, but the Previous was not (Add) - (ChangeReason.Update, TDestination addDestination) when change.Previous.Value is not TDestination => - new(ChangeReason.Add, change.Key, addDestination), + // Don't propagate moves at all, since we don't preserve indexes. + if (change.Reason is ChangeReason.Moved) + continue; - // Update when Current is not the right type, but the Previous was (Remove) - (ChangeReason.Update, not TDestination) when change.Previous.Value is TDestination removeDestination => - new(ChangeReason.Remove, change.Key, removeDestination), + Change? transformedChange = (change.Reason, change.Current) switch + { + // Update when Current is the right type, but the Previous was not (Add) + (ChangeReason.Update, TDestination addDestination) when change.Previous.Value is not TDestination => + new(ChangeReason.Add, change.Key, addDestination), - // For any other change reason, if the Current is the right type, forward with converted types - (_, TDestination otherDestination) => - new(change.Reason, change.Key, otherDestination, change.Previous.HasValue && change.Previous.Value is TDestination pd ? Optional.Some(pd) : default), + // Update when Current is not the right type, but the Previous was (Remove) + (ChangeReason.Update, not TDestination) when change.Previous.Value is TDestination removeDestination => + new(ChangeReason.Remove, change.Key, removeDestination), - // Otherwise, don't do anything at all - _ => default, - }; + // For any other change reason, if the Current is the right type, forward with converted types + (_, TDestination otherDestination) => + new(change.Reason, change.Key, otherDestination, change.Previous.HasValue && change.Previous.Value is TDestination pd ? ReactiveUI.Primitives.Optional.Some(pd) : default), - if (transformedChange is { } c) - { - // Do not propagate indexes, we can't guarantee them to be correct, because we aren't caching items. - downstreamChanges.Add(c); - } - } + // Otherwise, don't do anything at all + _ => default, + }; - if (!suppressEmptyChangeSets || downstreamChanges.Count != 0) + if (transformedChange is { } c) { - observer.OnNext(downstreamChanges); + // Do not propagate indexes, we can't guarantee them to be correct, because we aren't caching items. + downstreamChanges.Add(c); } } - catch (Exception error) + + if (!suppressEmptyChangeSets || downstreamChanges.Count != 0) { - observer.OnError(error); + observer.OnNext(downstreamChanges); } - }, - onError: observer.OnError, - onCompleted: observer.OnCompleted)); + } + catch (Exception error) + { + observer.OnError(error); + } + }, + onError: observer.OnError, + onCompleted: observer.OnCompleted)); } diff --git a/src/DynamicData/Cache/Internal/OnBeingRemoved.cs b/src/DynamicData/Cache/Internal/OnBeingRemoved.cs index 092306f3d..5ab4bcd8b 100644 --- a/src/DynamicData/Cache/Internal/OnBeingRemoved.cs +++ b/src/DynamicData/Cache/Internal/OnBeingRemoved.cs @@ -1,19 +1,39 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the OnBeingRemoved class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The removeAction value. internal sealed class OnBeingRemoved(IObservable> source, Action removeAction) where TObject : notnull where TKey : notnull { + /// + /// The _removeAction field. + /// private readonly Action _removeAction = removeAction ?? throw new ArgumentNullException(nameof(removeAction)); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -31,6 +51,11 @@ public IObservable> Run() => Observable.Create + /// Executes the RegisterForRemoval operation. + /// + /// The changes value. + /// The cache value. private void RegisterForRemoval(IChangeSet changes, Cache cache) { changes.ForEach( diff --git a/src/DynamicData/Cache/Internal/Page.cs b/src/DynamicData/Cache/Internal/Page.cs index e41595871..ed87ac4f7 100644 --- a/src/DynamicData/Cache/Internal/Page.cs +++ b/src/DynamicData/Cache/Internal/Page.cs @@ -1,16 +1,29 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the Page class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The pageRequests value. internal sealed class Page(IObservable> source, IObservable pageRequests) where TObject : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -25,22 +38,45 @@ public IObservable> Run() => Observable.Create +/// Provides members for the Paginator class. +/// +private sealed class Paginator { + /// + /// The _all field. + /// private IKeyValueCollection _all = new KeyValueCollection(); + /// + /// The _current field. + /// private KeyValueCollection _current = new(); + /// + /// The _isLoaded field. + /// private bool _isLoaded; + /// + /// The _request field. + /// private IPageRequest _request; + /// + /// Initializes a new instance of the class. + /// public Paginator() { _request = PageRequest.Default; _isLoaded = false; } + /// + /// Executes the Paginate operation. + /// + /// The parameters value. + /// The result of the operation. public IPagedChangeSet? Paginate(IPageRequest? parameters) { if (parameters is null || parameters.Page < 0 || parameters.Size < 1) @@ -58,6 +94,11 @@ public Paginator() return Paginate(); } + /// + /// Executes the Update operation. + /// + /// The updates value. + /// The result of the operation. public IPagedChangeSet? Update(ISortedChangeSet updates) { _isLoaded = true; @@ -65,6 +106,10 @@ public Paginator() return Paginate(updates); } + /// + /// Executes the CalculatePages operation. + /// + /// The result of the operation. private int CalculatePages() { if (_request.Size >= _all.Count) @@ -83,6 +128,11 @@ private int CalculatePages() return pages + 1; } + /// + /// Executes the Paginate operation. + /// + /// The updates value. + /// The result of the operation. private PagedChangeSet? Paginate(ISortedChangeSet? updates = null) { if (!_isLoaded) diff --git a/src/DynamicData/Cache/Internal/QueryWhenChanged.cs b/src/DynamicData/Cache/Internal/QueryWhenChanged.cs index 01828e85e..45c96fad8 100644 --- a/src/DynamicData/Cache/Internal/QueryWhenChanged.cs +++ b/src/DynamicData/Cache/Internal/QueryWhenChanged.cs @@ -1,18 +1,35 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the QueryWhenChanged class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TValue value. +/// The source value. +/// The itemChangedTrigger value. internal sealed class QueryWhenChanged(IObservable> source, Func>? itemChangedTrigger = null) where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() { if (itemChangedTrigger is null) diff --git a/src/DynamicData/Cache/Internal/ReaderWriter.cs b/src/DynamicData/Cache/Internal/ReaderWriter.cs index bbe56eb14..f9ca51f99 100644 --- a/src/DynamicData/Cache/Internal/ReaderWriter.cs +++ b/src/DynamicData/Cache/Internal/ReaderWriter.cs @@ -1,23 +1,42 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ReaderWriter class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The keySelector value. internal sealed class ReaderWriter(Func? keySelector = null) where TObject : notnull where TKey : notnull { -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + /// + /// The _activeUpdater field. + /// private CacheUpdater? _activeUpdater; + /// + /// The _data field. + /// private Dictionary _data = []; // could do with priming this on first time load + /// + /// Gets the Count value. + /// public int Count { get @@ -29,6 +48,9 @@ public int Count } } + /// + /// Gets the Items value. + /// public TObject[] Items { get @@ -40,6 +62,9 @@ public TObject[] Items } } + /// + /// Gets the Keys value. + /// public TKey[] Keys { get @@ -51,6 +76,9 @@ public TKey[] Keys } } + /// + /// Gets the KeyValues value. + /// public IReadOnlyDictionary KeyValues { get @@ -62,6 +90,11 @@ public IReadOnlyDictionary KeyValues } } + /// + /// Executes the GetInitialUpdates operation. + /// + /// The filter value. + /// The result of the operation. public ChangeSet GetInitialUpdates(Func? filter = null) { lock (_locker) @@ -87,7 +120,12 @@ public ChangeSet GetInitialUpdates(Func? filter = } } - public Optional Lookup(TKey key) + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) { lock (_locker) { @@ -95,27 +133,52 @@ public Optional Lookup(TKey key) } } + /// + /// Executes the Write operation. + /// + /// The changes value. + /// The previewHandler value. + /// The collectChanges value. + /// The result of the operation. public ChangeSet Write(IChangeSet changes, Action>? previewHandler, bool collectChanges) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); return DoUpdate(updater => updater.Clone(changes), previewHandler, collectChanges); } + /// + /// Executes the Write operation. + /// + /// The updateAction value. + /// The previewHandler value. + /// The collectChanges value. + /// The result of the operation. public ChangeSet Write(Action> updateAction, Action>? previewHandler, bool collectChanges) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); return DoUpdate(updateAction, previewHandler, collectChanges); } + /// + /// Executes the Write operation. + /// + /// The updateAction value. + /// The previewHandler value. + /// The collectChanges value. + /// The result of the operation. public ChangeSet Write(Action> updateAction, Action>? previewHandler, bool collectChanges) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); return DoUpdate(updateAction, previewHandler, collectChanges); } + /// + /// Executes the WriteNested operation. + /// + /// The updateAction value. public void WriteNested(Action> updateAction) { lock (_locker) @@ -129,6 +192,13 @@ public void WriteNested(Action> updateAction) } } + /// + /// Executes the DoUpdate operation. + /// + /// The updateAction value. + /// The previewHandler value. + /// The collectChanges value. + /// The result of the operation. private ChangeSet DoUpdate(Action> updateAction, Action>? previewHandler, bool collectChanges) { lock (_locker) diff --git a/src/DynamicData/Cache/Internal/RefCount.cs b/src/DynamicData/Cache/Internal/RefCount.cs index 4c4736391..23786b347 100644 --- a/src/DynamicData/Cache/Internal/RefCount.cs +++ b/src/DynamicData/Cache/Internal/RefCount.cs @@ -1,28 +1,48 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the RefCount class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. internal sealed class RefCount(IObservable> source) where TObject : notnull where TKey : notnull { -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _cache field. + /// private IObservableCache? _cache; + /// + /// The _refCount field. + /// private int _refCount; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Cache/Internal/RemoveKeyEnumerator.cs b/src/DynamicData/Cache/Internal/RemoveKeyEnumerator.cs index 716d847d5..2ca548b1b 100644 --- a/src/DynamicData/Cache/Internal/RemoveKeyEnumerator.cs +++ b/src/DynamicData/Cache/Internal/RemoveKeyEnumerator.cs @@ -1,28 +1,36 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif -/// Initializes a new instance of the class.Converts a to . +/// Initializes a new instance of the class.Converts a Change<TObject, TKey> to ChangeSet<TObject>. /// The change set with a key. /// /// An optional list, if provided it allows the refresh from a key based cache to find the index for the resulting list based refresh. /// If not provided a refresh will dropdown to a replace which may ultimately result in a remove+add change downstream. /// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class RemoveKeyEnumerator(IChangeSet source, IExtendedList? list = null) : IEnumerable> where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IChangeSet _source = source ?? throw new ArgumentNullException(nameof(source)); /// /// Returns an enumerator that iterates through the collection. /// /// - /// A that can be used to iterate through the collection. + /// A IEnumerator<T> that can be used to iterate through the collection. /// public IEnumerator> GetEnumerator() { @@ -72,5 +80,9 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/Cache/Internal/RightJoin.cs b/src/DynamicData/Cache/Internal/RightJoin.cs index 85163f75e..257e43775 100644 --- a/src/DynamicData/Cache/Internal/RightJoin.cs +++ b/src/DynamicData/Cache/Internal/RightJoin.cs @@ -1,27 +1,57 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - -internal sealed class RightJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func, TRight, TDestination> resultSelector) +#endif + +/// +/// Provides members for the RightJoin class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. +internal sealed class RightJoin(IObservable> left, IObservable> right, Func rightKeySelector, Func, TRight, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { + /// + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); - private readonly Func, TRight, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _resultSelector field. + /// + private readonly Func, TRight, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -113,7 +143,7 @@ public IObservable> Run() => Observable.Crea case ChangeReason.Remove: if (right.HasValue) { - joinedCache.AddOrUpdate(_resultSelector(right.Value.key, Optional.None, right.Value.item), right.Value.key); + joinedCache.AddOrUpdate(_resultSelector(right.Value.key, ReactiveUI.Primitives.Optional.None, right.Value.item), right.Value.key); } break; diff --git a/src/DynamicData/Cache/Internal/RightJoinMany.cs b/src/DynamicData/Cache/Internal/RightJoinMany.cs index 825d71a90..0bdff2e97 100644 --- a/src/DynamicData/Cache/Internal/RightJoinMany.cs +++ b/src/DynamicData/Cache/Internal/RightJoinMany.cs @@ -1,24 +1,57 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif -internal sealed class RightJoinMany(IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) +/// +/// Provides members for the RightJoinMany class. +/// +/// The type of the TLeft value. +/// The type of the TLeftKey value. +/// The type of the TRight value. +/// The type of the TRightKey value. +/// The type of the TDestination value. +/// The left value. +/// The right value. +/// The rightKeySelector value. +/// The resultSelector value. +internal sealed class RightJoinMany(IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { + /// + /// The _left field. + /// private readonly IObservable> _left = left ?? throw new ArgumentNullException(nameof(left)); - private readonly Func, IGrouping, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _resultSelector field. + /// + private readonly Func, IGrouping, TDestination> _resultSelector = resultSelector ?? throw new ArgumentNullException(nameof(resultSelector)); + /// + /// The _right field. + /// private readonly IObservable> _right = right ?? throw new ArgumentNullException(nameof(right)); + /// + /// The _rightKeySelector field. + /// private readonly Func _rightKeySelector = rightKeySelector ?? throw new ArgumentNullException(nameof(rightKeySelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() { var rightGrouped = _right.GroupWithImmutableState(_rightKeySelector); diff --git a/src/DynamicData/Cache/Internal/SizeExpirer.cs b/src/DynamicData/Cache/Internal/SizeExpirer.cs index ede14bced..4a104a10b 100644 --- a/src/DynamicData/Cache/Internal/SizeExpirer.cs +++ b/src/DynamicData/Cache/Internal/SizeExpirer.cs @@ -1,20 +1,38 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the SizeExpirer class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SizeExpirer where TObject : notnull where TKey : notnull { + /// + /// The _size field. + /// private readonly int _size; + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The size value. public SizeExpirer(IObservable> source, int size) { if (size <= 0) @@ -26,6 +44,10 @@ public SizeExpirer(IObservable> source, int size) _size = size; } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Cache/Internal/SizeLimiter.cs b/src/DynamicData/Cache/Internal/SizeLimiter.cs index bfd0fa72f..a72935bc7 100644 --- a/src/DynamicData/Cache/Internal/SizeLimiter.cs +++ b/src/DynamicData/Cache/Internal/SizeLimiter.cs @@ -1,15 +1,34 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the SizeLimiter class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The size value. internal sealed class SizeLimiter(int size) where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly ChangeAwareCache, TKey> _cache = new(); + /// + /// Executes the Change operation. + /// + /// The updates value. + /// The result of the operation. public IChangeSet Change(IChangeSet, TKey> updates) { _cache.Clone(updates); @@ -22,11 +41,16 @@ public IChangeSet Change(IChangeSet, } var notifications = _cache.CaptureChanges(); - var changed = notifications.Select(update => new Change(update.Reason, update.Key, update.Current.Value, update.Previous.HasValue ? update.Previous.Value.Value : Optional.None)); + var changed = notifications.Select(update => new Change(update.Reason, update.Key, update.Current.Value, update.Previous.HasValue ? update.Previous.Value.Value : ReactiveUI.Primitives.Optional.None)); return new ChangeSet(changed); } + /// + /// Executes the CloneAndReturnExpiredOnly operation. + /// + /// The updates value. + /// The result of the operation. public KeyValuePair[] CloneAndReturnExpiredOnly(IChangeSet, TKey> updates) { _cache.Clone(updates); diff --git a/src/DynamicData/Cache/Internal/Sort.cs b/src/DynamicData/Cache/Internal/Sort.cs index 11b39035e..e52e84893 100644 --- a/src/DynamicData/Cache/Internal/Sort.cs +++ b/src/DynamicData/Cache/Internal/Sort.cs @@ -1,29 +1,62 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the Sort class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class Sort where TObject : notnull where TKey : notnull { + /// + /// The _comparer field. + /// private readonly IComparer? _comparer; + /// + /// The _comparerChangedObservable field. + /// private readonly IObservable>? _comparerChangedObservable; + /// + /// The _resetThreshold field. + /// private readonly int _resetThreshold; + /// + /// The _resorter field. + /// private readonly IObservable? _resorter; + /// + /// The _sortOptimisations field. + /// private readonly SortOptimisations _sortOptimisations; + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparer value. + /// The sortOptimisations value. + /// The comparerChangedObservable value. + /// The resorter value. + /// The resetThreshold value. public Sort(IObservable> source, IComparer? comparer, SortOptimisations sortOptimisations = SortOptimisations.None, IObservable>? comparerChangedObservable = null, IObservable? resorter = null, int resetThreshold = -1) { if (comparer is null && comparerChangedObservable is null) @@ -39,6 +72,10 @@ public Sort(IObservable> source, IComparer? c _resetThreshold = resetThreshold; } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -60,17 +97,42 @@ public IObservable> Run() => Observable.Create result is not null).Select(x => x!).SubscribeSafe(observer), queue); }); - private sealed class Sorter(SortOptimisations optimisations, IComparer? comparer = null, int resetThreshold = -1) +/// +/// Provides members for the Sorter class. +/// +/// The optimisations value. +/// The comparer value. +/// The resetThreshold value. +private sealed class Sorter(SortOptimisations optimisations, IComparer? comparer = null, int resetThreshold = -1) { + /// + /// The _cache field. + /// private readonly ChangeAwareCache _cache = new(); + + /// + /// The _calculator field. + /// private IndexCalculator? _calculator; + /// + /// The _comparer field. + /// private KeyValueComparer _comparer = new(comparer); + /// + /// The _haveReceivedData field. + /// private bool _haveReceivedData; + /// + /// The _initialised field. + /// private bool _initialised; + /// + /// The _sorted field. + /// private IKeyValueCollection _sorted = new KeyValueCollection(); /// diff --git a/src/DynamicData/Cache/Internal/SortAndPage.cs b/src/DynamicData/Cache/Internal/SortAndPage.cs index 2d612a9b6..fd89676cf 100644 --- a/src/DynamicData/Cache/Internal/SortAndPage.cs +++ b/src/DynamicData/Cache/Internal/SortAndPage.cs @@ -1,24 +1,62 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the SortAndPage class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SortAndPage where TObject : notnull where TKey : notnull { + /// + /// The _keyComparer field. + /// private static readonly KeyComparer _keyComparer = new(); + /// + /// The _source field. + /// private readonly IObservable> _source; + + /// + /// The _comparerChanged field. + /// private readonly IObservable> _comparerChanged; + + /// + /// The _pageRequests field. + /// private readonly IObservable _pageRequests; + + /// + /// The _options field. + /// private readonly SortAndPageOptions _options; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparer value. + /// The virtualRequests value. + /// The options value. public SortAndPage(IObservable> source, IComparer comparer, IObservable virtualRequests, @@ -27,6 +65,13 @@ public SortAndPage(IObservable> source, { } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparerChanged value. + /// The virtualRequests value. + /// The options value. public SortAndPage(IObservable> source, IObservable> comparerChanged, IObservable virtualRequests, @@ -38,8 +83,15 @@ public SortAndPage(IObservable> source, _pageRequests = virtualRequests ?? throw new ArgumentNullException(nameof(virtualRequests)); } + /// + /// The Empty field. + /// private static readonly ChangeSet> Empty = new(0, PageContext.Empty); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable>> Run() => Observable.Create>>( observer => @@ -159,8 +211,16 @@ static int CalculatePages(IPageRequest request, int totalCount) return pages + 1; } }); - // Calculates any changes within the paged range. + + /// + /// Executes the CalculatePageChanges operation. + /// + /// The context value. + /// The currentItems value. + /// The previousItems value. + /// The changes value. + /// The result of the operation. private static ChangeSet> CalculatePageChanges(PageContext context, List> currentItems, List> previousItems, diff --git a/src/DynamicData/Cache/Internal/SortAndVirtualize.cs b/src/DynamicData/Cache/Internal/SortAndVirtualize.cs index 44c6d3dc3..fcbf138c3 100644 --- a/src/DynamicData/Cache/Internal/SortAndVirtualize.cs +++ b/src/DynamicData/Cache/Internal/SortAndVirtualize.cs @@ -1,24 +1,62 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the SortAndVirtualize class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SortAndVirtualize where TObject : notnull where TKey : notnull { + /// + /// The _keyComparer field. + /// private static readonly KeyComparer _keyComparer = new(); + /// + /// The _source field. + /// private readonly IObservable> _source; + + /// + /// The _comparerChanged field. + /// private readonly IObservable> _comparerChanged; + + /// + /// The _virtualRequests field. + /// private readonly IObservable _virtualRequests; + + /// + /// The _options field. + /// private readonly SortAndVirtualizeOptions _options; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparer value. + /// The virtualRequests value. + /// The options value. public SortAndVirtualize(IObservable> source, IComparer comparer, IObservable virtualRequests, @@ -27,6 +65,13 @@ public SortAndVirtualize(IObservable> source, { } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The comparerChanged value. + /// The virtualRequests value. + /// The options value. public SortAndVirtualize(IObservable> source, IObservable> comparerChanged, IObservable virtualRequests, @@ -38,8 +83,15 @@ public SortAndVirtualize(IObservable> source, _virtualRequests = virtualRequests ?? throw new ArgumentNullException(nameof(virtualRequests)); } + /// + /// The Empty field. + /// private static readonly ChangeSet> Empty = new(0, VirtualContext.Empty); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable>> Run() => Observable.Create>>( observer => @@ -137,8 +189,16 @@ ChangeSet> ApplyVirtualChanges(IChangeSet return virtualChanges; } }); - // Calculates any changes within the virtualized range. + + /// + /// Executes the CalculateVirtualChanges operation. + /// + /// The context value. + /// The currentItems value. + /// The previousItems value. + /// The changes value. + /// The result of the operation. private static ChangeSet> CalculateVirtualChanges(VirtualContext context, List> currentItems, List> previousItems, diff --git a/src/DynamicData/Cache/Internal/SortExtensions.cs b/src/DynamicData/Cache/Internal/SortExtensions.cs index c6275a358..10c0c5a5e 100644 --- a/src/DynamicData/Cache/Internal/SortExtensions.cs +++ b/src/DynamicData/Cache/Internal/SortExtensions.cs @@ -1,13 +1,28 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections.ObjectModel; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the SortExtensions class. +/// internal static class SortExtensions { + /// + /// Executes the GetCurrentPosition operation. + /// + /// The type of the TItem value. + /// The source value. + /// The item value. + /// The comparer value. + /// The useBinarySearch value. + /// The result of the operation. public static int GetCurrentPosition(this IList source, TItem item, IComparer comparer, bool useBinarySearch = false) { var index = useBinarySearch ? source.BinarySearch(item, comparer) : source.IndexOf(item); @@ -20,6 +35,15 @@ public static int GetCurrentPosition(this IList source, TItem item return index; } + /// + /// Executes the GetInsertPosition operation. + /// + /// The type of the T value. + /// The source value. + /// The item value. + /// The comparer value. + /// The useBinarySearch value. + /// The result of the operation. public static int GetInsertPosition(this IList source, T item, IComparer comparer, bool useBinarySearch = false) { return useBinarySearch @@ -27,6 +51,14 @@ public static int GetInsertPosition(this IList source, T item, IComparer + /// Executes the GetInsertPositionBinary operation. + /// + /// The type of the TItem value. + /// The list value. + /// The t value. + /// The c value. + /// The result of the operation. public static int GetInsertPositionBinary(this IList list, TItem t, IComparer c) { var index = list.BinarySearch(t, c); @@ -52,6 +84,14 @@ public static int GetInsertPositionBinary(this IList list, TItem t return insertIndex; } + /// + /// Executes the GetInsertPositionLinear operation. + /// + /// The type of the TItem value. + /// The list value. + /// The t value. + /// The c value. + /// The result of the operation. public static int GetInsertPositionLinear(this IList list, TItem t, IComparer c) { for (var i = 0; i < list.Count; i++) @@ -65,6 +105,14 @@ public static int GetInsertPositionLinear(this IList list, TItem t return list.Count; } + /// + /// Executes the Move operation. + /// + /// The type of the TItem value. + /// The list value. + /// The original value. + /// The destination value. + /// The item value. public static void Move(this IList list, int original, int destination, TItem item) { // If the list supports the Move method, use it instead of removing and inserting. diff --git a/src/DynamicData/Cache/Internal/SortedKeyValueApplicator.cs b/src/DynamicData/Cache/Internal/SortedKeyValueApplicator.cs index 4ab732ceb..1424b24ef 100644 --- a/src/DynamicData/Cache/Internal/SortedKeyValueApplicator.cs +++ b/src/DynamicData/Cache/Internal/SortedKeyValueApplicator.cs @@ -1,26 +1,61 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_SHIM -namespace DynamicData.Cache.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else +namespace DynamicData.Cache.Internal; +#endif /* * Object which maintains a sorted list of key value pair and produces a change set. * * Used by virtualise and page. */ + +/// +/// Provides members for the SortedKeyValueApplicator class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SortedKeyValueApplicator where TObject : notnull where TKey : notnull { + /// + /// The _cache field. + /// private readonly Cache _cache = new(); + + /// + /// The _target field. + /// private readonly List> _target; + + /// + /// The _options field. + /// private readonly SortAndBindOptions _options; + /// + /// The _comparer field. + /// private KeyValueComparer _comparer; + /// + /// Initializes a new instance of the class. + /// + /// The target value. + /// The comparer value. + /// The options value. public SortedKeyValueApplicator(List> target, KeyValueComparer comparer, SortAndBindOptions options) @@ -30,6 +65,10 @@ public SortedKeyValueApplicator(List> target, _comparer = comparer; } + /// + /// Executes the ChangeComparer operation. + /// + /// The comparer value. public void ChangeComparer(KeyValueComparer comparer) { _comparer = comparer; @@ -37,6 +76,10 @@ public void ChangeComparer(KeyValueComparer comparer) _target.Sort(comparer); } + /// + /// Executes the ProcessChanges operation. + /// + /// The changes value. public void ProcessChanges(IChangeSet changes) { _cache.Clone(changes); @@ -53,6 +96,9 @@ public void ProcessChanges(IChangeSet changes) } } + /// + /// Executes the Reset operation. + /// public void Reset() { var sorted = _cache.KeyValues.OrderBy(t => t, _comparer); @@ -60,6 +106,10 @@ public void Reset() _target.AddRange(sorted); } + /// + /// Executes the ApplyChanges operation. + /// + /// The changes value. private void ApplyChanges(IChangeSet changes) { // iterate through collection, find sorted position and apply changes @@ -122,7 +172,17 @@ private void ApplyChanges(IChangeSet changes) } } + /// + /// Executes the GetCurrentPosition operation. + /// + /// The item value. + /// The result of the operation. private int GetCurrentPosition(KeyValuePair item) => _target.GetCurrentPosition(item, _comparer, _options.UseBinarySearch); + /// + /// Executes the GetInsertPosition operation. + /// + /// The item value. + /// The result of the operation. private int GetInsertPosition(KeyValuePair item) => _target.GetInsertPosition(item, _comparer, _options.UseBinarySearch); } diff --git a/src/DynamicData/Cache/Internal/SpecifiedGrouper.cs b/src/DynamicData/Cache/Internal/SpecifiedGrouper.cs index 863f2d6d6..7d8f4e080 100644 --- a/src/DynamicData/Cache/Internal/SpecifiedGrouper.cs +++ b/src/DynamicData/Cache/Internal/SpecifiedGrouper.cs @@ -1,23 +1,47 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the SpecifiedGrouper class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TGroupKey value. +/// The source value. +/// The groupSelector value. +/// The resultGroupSource value. internal sealed class SpecifiedGrouper(IObservable> source, Func groupSelector, IObservable> resultGroupSource) where TObject : notnull where TKey : notnull where TGroupKey : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelector ?? throw new ArgumentNullException(nameof(groupSelector)); + /// + /// The _resultGroupSource field. + /// private readonly IObservable> _resultGroupSource = resultGroupSource ?? throw new ArgumentNullException(nameof(resultGroupSource)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Cache/Internal/StatusMonitor.cs b/src/DynamicData/Cache/Internal/StatusMonitor.cs index 445074b63..19b9d5d26 100644 --- a/src/DynamicData/Cache/Internal/StatusMonitor.cs +++ b/src/DynamicData/Cache/Internal/StatusMonitor.cs @@ -1,19 +1,29 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the StatusMonitor class. +/// +/// The type of the T value. +/// The source value. internal sealed class StatusMonitor(IObservable source) { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable Run() => Observable.Create( observer => { - var statusSubject = new Subject(); + var statusSubject = new Signal(); var status = ConnectionStatus.Pending; void Error(Exception ex) diff --git a/src/DynamicData/Cache/Internal/SubscribeMany.cs b/src/DynamicData/Cache/Internal/SubscribeMany.cs index 78579fbeb..60899da49 100644 --- a/src/DynamicData/Cache/Internal/SubscribeMany.cs +++ b/src/DynamicData/Cache/Internal/SubscribeMany.cs @@ -1,35 +1,61 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the SubscribeMany class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SubscribeMany where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// The _subscriptionFactory field. + /// private readonly Func _subscriptionFactory; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The subscriptionFactory value. public SubscribeMany(IObservable> source, Func subscriptionFactory) { - subscriptionFactory.ThrowArgumentNullExceptionIfNull(nameof(subscriptionFactory)); + ArgumentExceptionHelper.ThrowIfNull(subscriptionFactory); _source = source ?? throw new ArgumentNullException(nameof(source)); _subscriptionFactory = (t, _) => subscriptionFactory(t); } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The subscriptionFactory value. public SubscribeMany(IObservable> source, Func subscriptionFactory) { _source = source ?? throw new ArgumentNullException(nameof(source)); _subscriptionFactory = subscriptionFactory ?? throw new ArgumentNullException(nameof(subscriptionFactory)); } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Cache/Internal/Switch.cs b/src/DynamicData/Cache/Internal/Switch.cs index 28eef90a2..16a0d4151 100644 --- a/src/DynamicData/Cache/Internal/Switch.cs +++ b/src/DynamicData/Cache/Internal/Switch.cs @@ -1,80 +1,106 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the Switch class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The sources value. internal sealed class Switch(IObservable>> sources) where TObject : notnull where TKey : notnull { + /// + /// The _sources field. + /// private readonly IObservable>> _sources = sources ?? throw new ArgumentNullException(nameof(sources)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { // Switching is done by hand rather than with Observable.Switch, which holds its gate for // the whole of downstream delivery. The queue enqueues and returns instead, so a producer // is never held up by whatever a subscriber does with the notification, and a pipeline - // crossing into another cache cannot deadlock against it. + // crossing into another collection cannot deadlock against it. var queue = new DeliveryQueue>(observer); // What the current source has contributed, so that switching away can take it back out. - var current = new Cache(); + var current = new ChangeAwareCache(); var subscription = new SerialDisposable(); // Identifies the current source. A superseded one may still be mid-delivery, and anything // it produces after this point belongs to a source that has already been switched away from. - var activeSourceId = 0; + var active = 0; var isSourceRunning = false; var areSourcesComplete = false; - var outer = _sources.SubscribeSafe( + var outer = _sources.SubscribeSafe(Observer.Create>>( source => { - int sourceId; + int id; using (var scope = queue.AcquireLock()) { - sourceId = ++activeSourceId; + id = ++active; isSourceRunning = true; if (current.Count != 0) { - scope.EnqueueNext(new ChangeSet( - current.KeyValues.Select(static pair => new Change(ChangeReason.Remove, pair.Key, pair.Value)))); - current.Clear(); + var clears = current.CaptureChanges(); + + if (clears.Count != 0) + { + scope.EnqueueNext(clears); + } } } // Subscribed outside the lock. The source may deliver synchronously, and that // delivery takes the lock for itself. - subscription.Disposable = source.SubscribeSafe( + if (id != Volatile.Read(ref active)) + { + return; + } + + var innerSubscription = new SingleAssignmentDisposable(); + subscription.Disposable = innerSubscription; + innerSubscription.Disposable = source.SubscribeSafe(Observer.Create>( changes => { using var scope = queue.AcquireLock(); - if (sourceId != activeSourceId) + if (id != active) { return; } current.Clone(changes); + var capturedChanges = current.CaptureChanges(); - if (changes.Count != 0) + if (capturedChanges.Count != 0) { - scope.EnqueueNext(changes); + scope.EnqueueNext(capturedChanges); } }, error => { using var scope = queue.AcquireLock(); - if (sourceId != activeSourceId) + if (id != active) { return; } @@ -85,7 +111,7 @@ public IObservable> Run() => Observable.Create> Run() => Observable.Create @@ -110,7 +136,7 @@ public IObservable> Run() => Observable.Create +/// Provides members for the ToObservableChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal static class ToObservableChangeSet where TObject : notnull where TKey : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The keySelector value. + /// The expireAfter value. + /// The limitSizeTo value. + /// The scheduler value. + /// The result of the operation. public static IObservable> Create( IObservable source, Func keySelector, @@ -38,6 +51,15 @@ public static IObservable> Create( .SubscribeSafe(downstreamObserver); }); + /// + /// Executes the Create operation. + /// + /// The source value. + /// The keySelector value. + /// The expireAfter value. + /// The limitSizeTo value. + /// The scheduler value. + /// The result of the operation. public static IObservable> Create( IObservable> source, Func keySelector, @@ -52,29 +74,91 @@ public static IObservable> Create( scheduler: scheduler, source: source)); - private sealed class Subscription +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : IDisposable { + /// + /// The _downstreamItems field. + /// private readonly ChangeAwareCache _downstreamItems; + + /// + /// The _downstreamObserver field. + /// private readonly IObserver> _downstreamObserver; + + /// + /// The _evictionQueue field. + /// private readonly Queue _evictionQueue; + + /// + /// The _expirationQueue field. + /// private readonly List _expirationQueue; + + /// + /// The _expireAfter field. + /// private readonly Func? _expireAfter; + + /// + /// The _expireAtsByKey field. + /// private readonly Dictionary _expireAtsByKey; + + /// + /// The _keySelector field. + /// private readonly Func _keySelector; + + /// + /// The _limitSizeTo field. + /// private readonly int _limitSizeTo; + + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler; + + /// + /// The _sourceSubscription field. + /// private readonly IDisposable _sourceSubscription; - #if NET9_0_OR_GREATER + + /// + /// The _synchronizationGate field. + /// private readonly Lock _synchronizationGate; - #else - private readonly object _synchronizationGate; - #endif + /// + /// The _hasInitialized field. + /// private bool _hasInitialized; + + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _scheduledExpiration field. + /// private ScheduledExpiration? _scheduledExpiration; + /// + /// Initializes a new instance of the class. + /// + /// The downstreamObserver value. + /// The expireAfter value. + /// The keySelector value. + /// The limitSizeTo value. + /// The scheduler value. + /// The source value. public Subscription( IObserver> downstreamObserver, Func? expireAfter, @@ -94,7 +178,8 @@ public Subscription( _scheduler = scheduler ?? GlobalConfig.DefaultScheduler; _synchronizationGate = new(); - _sourceSubscription = source.SubscribeSafe( + _sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source, onNext: OnSourceNext, onError: downstreamObserver.OnError, onCompleted: OnSourceCompleted); @@ -108,12 +193,20 @@ public Subscription( } } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _sourceSubscription.Dispose(); _scheduledExpiration?.Cancellation.Dispose(); } + /// + /// Executes the OnScheduledExpirationInvoked operation. + /// + /// The intendedExpiration value. + /// The result of the operation. private IDisposable OnScheduledExpirationInvoked(Expiration intendedExpiration) { try @@ -167,6 +260,10 @@ private IDisposable OnScheduledExpirationInvoked(Expiration intendedExpiration) return Disposable.Empty; } + /// + /// Executes the OnSourceNext operation. + /// + /// The upstreamItems value. private void OnSourceNext(IEnumerable upstreamItems) { try @@ -234,6 +331,9 @@ private void OnSourceNext(IEnumerable upstreamItems) } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { lock (_synchronizationGate) @@ -243,13 +343,18 @@ private void OnSourceCompleted() TryPublishCompletion(); } } - // This method must NOT be invoked under the umbrella of _synchronizationGate, // as some IScheduler implementations perform locking internally, which can result in deadlocking if we invoke the scheduler within our own lock. // // Additionally, some IScheduler implementations can invoke actions synchronously, // so it's important that scheduler invocation is only performed AFTER downstream changes have been processed. // Otherwise, downstream notifications can end up published out-of-order. + + /// + /// Executes the FinishSchedulingExpiration operation. + /// + /// The unfinishedExpiration value. + /// The scheduler value. private void FinishSchedulingExpiration( ScheduledExpiration unfinishedExpiration, IScheduler scheduler) @@ -269,6 +374,9 @@ private void FinishSchedulingExpiration( return Disposable.Empty; }); + /// + /// Executes the TryPublishCompletion operation. + /// private void TryPublishCompletion() { // There needs to be no possibility of a new changeset being emitted before we can call the stream complete. @@ -276,6 +384,9 @@ private void TryPublishCompletion() _downstreamObserver.OnCompleted(); } + /// + /// Executes the TryPublishDownstreamChanges operation. + /// private void TryPublishDownstreamChanges() { var downstreamChanges = _downstreamItems.CaptureChanges(); @@ -287,6 +398,10 @@ private void TryPublishDownstreamChanges() } } + /// + /// Executes the TryBeginSchedulingExpiration operation. + /// + /// The result of the operation. private ScheduledExpiration? TryBeginSchedulingExpiration() { // If there's no expirations currently queued up, we don't need to schedule anything. @@ -312,20 +427,43 @@ private void TryPublishDownstreamChanges() } } - private readonly struct ScheduledExpiration +/// +/// Represents the ScheduledExpiration value. +/// +private readonly struct ScheduledExpiration { + /// + /// Gets or sets the Cancellation value. + /// public required SingleAssignmentDisposable Cancellation { get; init; } + /// + /// Gets or sets the Expiration value. + /// public required Expiration Expiration { get; init; } } - private readonly record struct Expiration +/// +/// Represents the Expiration record. +/// +private readonly record struct Expiration : IComparable { + /// + /// Gets or sets the ExpireAt value. + /// public required DateTimeOffset ExpireAt { get; init; } + /// + /// Gets or sets the Key value. + /// public required TKey Key { get; init; } + /// + /// Executes the CompareTo operation. + /// + /// The other value. + /// The result of the operation. public int CompareTo(Expiration other) => ExpireAt.CompareTo(other.ExpireAt); } diff --git a/src/DynamicData/Cache/Internal/ToObservableOptional.cs b/src/DynamicData/Cache/Internal/ToObservableOptional.cs index 47efd420c..e8d7078ad 100644 --- a/src/DynamicData/Cache/Internal/ToObservableOptional.cs +++ b/src/DynamicData/Cache/Internal/ToObservableOptional.cs @@ -1,22 +1,48 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the ToObservableOptional class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The key value. +/// The equalityComparer value. internal sealed class ToObservableOptional(IObservable> source, TKey key, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull { + /// + /// The _equalityComparer field. + /// private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + + /// + /// The _key field. + /// private readonly TKey _key = key; - public IObservable> Run() => Observable.Create>(observer => + /// + /// Executes the Run operation. + /// + /// The result of the operation. + public IObservable> Run() => Observable.Create>(observer => { - var lastValue = Optional.None(); + var lastValue = ReactiveUI.Primitives.Optional.None; return _source.Subscribe( changes => lastValue = EmitChanges(changes, observer, lastValue), @@ -24,7 +50,14 @@ public IObservable> Run() => Observable.Create EmitChanges(IChangeSet changes, IObserver> observer, Optional lastValue) + /// + /// Executes the EmitChanges operation. + /// + /// The changes value. + /// The observer value. + /// The lastValue value. + /// The result of the operation. + private ReactiveUI.Primitives.Optional EmitChanges(IChangeSet changes, IObserver> observer, ReactiveUI.Primitives.Optional lastValue) { foreach (var change in changes.ToConcreteType()) { @@ -37,8 +70,8 @@ private Optional EmitChanges(IChangeSet changes, IObserv // Remove is None, everything else is the current value var emitValue = change switch { - { Reason: ChangeReason.Remove } => Optional.None(), - _ => Optional.Some(change.Current), + { Reason: ChangeReason.Remove } => ReactiveUI.Primitives.Optional.None, + _ => ReactiveUI.Primitives.Optional.Some(change.Current), }; // Emit the value if it has changed diff --git a/src/DynamicData/Cache/Internal/Transform.cs b/src/DynamicData/Cache/Internal/Transform.cs index 0934d1061..a7202804e 100644 --- a/src/DynamicData/Cache/Internal/Transform.cs +++ b/src/DynamicData/Cache/Internal/Transform.cs @@ -1,18 +1,39 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif -internal sealed class Transform(IObservable> source, Func, TKey, TDestination> transformFactory, Action>? exceptionCallback = null, bool transformOnRefresh = false) +/// +/// Provides members for the Transform class. +/// +/// The type of the TDestination value. +/// The type of the TSource value. +/// The type of the TKey value. +/// The source value. +/// The transformFactory value. +/// The exceptionCallback value. +/// The transformOnRefresh value. +internal sealed class Transform(IObservable> source, Func, TKey, TDestination> transformFactory, Action>? exceptionCallback = null, bool transformOnRefresh = false) where TDestination : notnull where TSource : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Defer(RunImpl); + /// + /// Executes the RunImpl operation. + /// + /// The result of the operation. private IObservable> RunImpl() => source.Scan( (ChangeAwareCache?)null, (cache, changes) => diff --git a/src/DynamicData/Cache/Internal/TransformAsync.cs b/src/DynamicData/Cache/Internal/TransformAsync.cs index 803fed8cd..bbdc7b47e 100644 --- a/src/DynamicData/Cache/Internal/TransformAsync.cs +++ b/src/DynamicData/Cache/Internal/TransformAsync.cs @@ -1,16 +1,29 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Threading.Tasks; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the TransformAsync class. +/// +/// The type of the TDestination value. +/// The type of the TSource value. +/// The type of the TKey value. +/// The source value. +/// The transformFactory value. +/// The exceptionCallback value. +/// The forceTransform value. +/// The maximumConcurrency value. +/// The transformOnRefresh value. internal class TransformAsync( IObservable> source, - Func, TKey, CancellationToken, Task> transformFactory, + Func, TKey, CancellationToken, Task> transformFactory, Action>? exceptionCallback, IObservable>? forceTransform = null, int? maximumConcurrency = null, @@ -19,6 +32,10 @@ internal class TransformAsync( where TSource : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { @@ -40,6 +57,12 @@ public IObservable> Run() => return transformer.SubscribeSafe(observer); }); + /// + /// Executes the DoTransform operation. + /// + /// The cache value. + /// The shouldTransform value. + /// The result of the operation. private IObservable> DoTransform(ChangeAwareCache cache, Func shouldTransform) { var toTransform = cache.KeyValues.Where(kvp => shouldTransform(kvp.Value.Source, kvp.Key)).Select(kvp => @@ -51,6 +74,12 @@ private IObservable> DoTransform(ChangeAwareCache .Select(transformed => ProcessUpdates(cache, transformed)); } + /// + /// Executes the DoTransform operation. + /// + /// The cache value. + /// The changes value. + /// The result of the operation. private IObservable> DoTransform( ChangeAwareCache cache, IChangeSet changes) { @@ -60,6 +89,12 @@ private IObservable> DoTransform( .Select(transformed => ProcessUpdates(cache, transformed)); } + /// + /// Executes the ProcessUpdates operation. + /// + /// The cache value. + /// The transformedItems value. + /// The result of the operation. private ChangeSet ProcessUpdates(ChangeAwareCache cache, TransformResult[] transformedItems) { // check for errors and callback if a handler has been specified @@ -105,6 +140,12 @@ private ChangeSet ProcessUpdates(ChangeAwareCache(transformed); } + /// + /// Executes the Transform operation. + /// + /// The change value. + /// Cancels the asynchronous item transformation. + /// The result of the operation. private async Task Transform(Change change, CancellationToken cancellationToken) { try @@ -130,15 +171,34 @@ private async Task Transform(Change change, Canc } } + /// + /// Represents the TransformedItemContainer value. + /// + /// The source value. + /// The destination value. private readonly struct TransformedItemContainer(TSource source, TDestination destination) { + /// + /// Gets the Destination value. + /// public TDestination Destination { get; } = destination; + /// + /// Gets the Source value. + /// public TSource Source { get; } = source; } + /// + /// Provides members for the TransformResult class. + /// private sealed class TransformResult { + /// + /// Initializes a new instance of the class. + /// + /// The change value. + /// The container value. public TransformResult(in Change change, in TransformedItemContainer container) { Change = change; @@ -147,14 +207,23 @@ public TransformResult(in Change change, in TransformedItemContai Key = change.Key; } + /// + /// Initializes a new instance of the class. + /// + /// The change value. public TransformResult(in Change change) { Change = change; - Container = Optional.None; + Container = ReactiveUI.Primitives.Optional.None; Success = true; Key = change.Key; } + /// + /// Initializes a new instance of the class. + /// + /// The change value. + /// The error value. public TransformResult(in Change change, Exception error) { Change = change; @@ -163,14 +232,29 @@ public TransformResult(in Change change, Exception error) Key = change.Key; } + /// + /// Gets the Change value. + /// public Change Change { get; } - public Optional Container { get; } + /// + /// Gets the Container value. + /// + public ReactiveUI.Primitives.Optional Container { get; } + /// + /// Gets the Error value. + /// public Exception? Error { get; } + /// + /// Gets the Key value. + /// public TKey Key { get; } + /// + /// Gets the Success value. + /// public bool Success { get; } } } diff --git a/src/DynamicData/Cache/Internal/TransformImmutable.cs b/src/DynamicData/Cache/Internal/TransformImmutable.cs index 6090f034c..38fe3c38c 100644 --- a/src/DynamicData/Cache/Internal/TransformImmutable.cs +++ b/src/DynamicData/Cache/Internal/TransformImmutable.cs @@ -1,20 +1,40 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the TransformImmutable class. +/// +/// The type of the TDestination value. +/// The type of the TSource value. +/// The type of the TKey value. internal sealed class TransformImmutable where TDestination : notnull where TSource : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source; + + /// + /// The _transformFactory field. + /// private readonly Func _transformFactory; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The transformFactory value. public TransformImmutable( IObservable> source, Func transformFactory) @@ -23,6 +43,10 @@ public TransformImmutable( _transformFactory = transformFactory; } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => _source .SubscribeSafe(Observer.Create>( @@ -40,7 +64,7 @@ public IObservable> Run() current: _transformFactory.Invoke(change.Current), previous: change.Previous.HasValue ? _transformFactory.Invoke(change.Previous.Value) - : Optional.None(), + : ReactiveUI.Primitives.Optional.None, currentIndex: change.CurrentIndex, previousIndex: change.PreviousIndex)); } diff --git a/src/DynamicData/Cache/Internal/TransformMany.cs b/src/DynamicData/Cache/Internal/TransformMany.cs index f38853c08..d525acc49 100644 --- a/src/DynamicData/Cache/Internal/TransformMany.cs +++ b/src/DynamicData/Cache/Internal/TransformMany.cs @@ -1,230 +1,327 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Collections; -using System.Collections.ObjectModel; -using System.Reactive.Disposables; -using System.Reactive.Linq; - -using DynamicData.Binding; - -namespace DynamicData.Cache.Internal; - -internal sealed class TransformMany(IObservable> source, Func> manySelector, Func keySelector, Func>>? childChanges = null) - where TDestination : notnull - where TDestinationKey : notnull - where TSource : notnull - where TSourceKey : notnull -{ - public TransformMany(IObservable> source, Func> manySelector, Func keySelector) - : this( - source, - manySelector, - keySelector, - t => Observable.Defer( - () => - { - var subsequentChanges = manySelector(t).ToObservableChangeSet(keySelector); - - if (manySelector(t).Count > 0) - { - return subsequentChanges; - } - - return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); - })) - { - } - - public TransformMany(IObservable> source, Func> manySelector, Func keySelector) - : this( - source, - manySelector, - keySelector, - t => Observable.Defer( - () => - { - var subsequentChanges = manySelector(t).ToObservableChangeSet(keySelector); - - if (manySelector(t).Count > 0) - { - return subsequentChanges; - } - - return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); - })) - { - } - - public TransformMany(IObservable> source, Func> manySelector, Func keySelector) - : this( - source, - x => manySelector(x).Items, - keySelector, - t => Observable.Defer( - () => - { - var subsequentChanges = Observable.Create>(o => manySelector(t).Connect().Subscribe(o)); - - if (manySelector(t).Count > 0) - { - return subsequentChanges; - } - - return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); - })) - { - } - - public IObservable> Run() => childChanges is null ? Create() : CreateWithChangeSet(); - - private IObservable> Create() => source.Transform( - (t, _) => - { - var destination = manySelector(t).Select(m => new DestinationContainer(m, keySelector(m))).ToArray(); - return new ManyContainer(() => destination); - }, - true).Select(changes => new ChangeSet(new DestinationEnumerator(changes))); - - private IObservable> CreateWithChangeSet() - { - if (childChanges is null) - { - throw new InvalidOperationException("The childChanges is null and should not be."); - } - - return Observable.Create>( - observer => - { - var result = new ChangeAwareCache(); - - var transformed = source.Transform( - (t, _) => - { - // Only skip initial for first time Adds where there is initial data records - var locker = InternalEx.NewLock(); - var changes = childChanges(t).Synchronize(locker).Skip(1); - return new ManyContainer( - () => - { - var collection = manySelector(t); - lock (locker) - { - return collection.Select(m => new DestinationContainer(m, keySelector(m))).ToArray(); - } - }, - changes); - }).Publish(); - - var queue = new SharedDeliveryQueue(); - var initial = transformed.SynchronizeSafe(queue).Select(changes => new ChangeSet(new DestinationEnumerator(changes))); - - var subsequent = transformed.MergeMany(x => x.Changes).SynchronizeSafe(queue); - - var allChanges = initial.Merge(subsequent).Select( - changes => - { - result.Clone(changes); - return result.CaptureChanges(); - }); - - return new CompositeDisposable(allChanges.SubscribeSafe(observer), transformed.Connect(), queue); - }); - } - - private sealed class DestinationContainer(TDestination item, TDestinationKey key) - { - public static IEqualityComparer KeyComparer { get; } = new KeyEqualityComparer(); - - public TDestination Item { get; } = item; - - public TDestinationKey Key { get; } = key; - - private sealed class KeyEqualityComparer : IEqualityComparer - { - public bool Equals(DestinationContainer? x, DestinationContainer? y) - { - if (x is null && y is null) - { - return true; - } - - if (x is null || y is null) - { - return false; - } - - return EqualityComparer.Default.Equals(x.Key, y.Key); - } - - public int GetHashCode(DestinationContainer obj) => EqualityComparer.Default.GetHashCode(obj.Key); - } - } - - private sealed class DestinationEnumerator(IChangeSet changes) : IEnumerable> - { - public IEnumerator> GetEnumerator() - { - foreach (var change in changes.ToConcreteType()) - { - switch (change.Reason) - { - case ChangeReason.Add: - case ChangeReason.Remove: - case ChangeReason.Refresh: - { - foreach (var destination in change.Current.Destination) - { - yield return new Change(change.Reason, destination.Key, destination.Item); - } - } - - break; - case ChangeReason.Update: - { - var previousItems = change.Previous.Value.Destination.AsArray(); - var currentItems = change.Current.Destination.AsArray(); - - var removes = previousItems.Except(currentItems, DestinationContainer.KeyComparer); - var adds = currentItems.Except(previousItems, DestinationContainer.KeyComparer); - var updates = currentItems.Intersect(previousItems, DestinationContainer.KeyComparer); - - foreach (var destination in removes) - { - yield return new Change(ChangeReason.Remove, destination.Key, destination.Item); - } - - foreach (var destination in adds) - { - yield return new Change(ChangeReason.Add, destination.Key, destination.Item); - } - - foreach (var destination in updates) - { - var current = currentItems.First(d => d.Key.Equals(destination.Key)); - var previous = previousItems.First(d => d.Key.Equals(destination.Key)); - - // Do not update is items are the same reference - if (!ReferenceEquals(current.Item, previous.Item)) - { - yield return new Change(ChangeReason.Update, destination.Key, current.Item, previous.Item); - } - } - } - - break; - } - } - } - - IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - } - - private sealed class ManyContainer(Func> initial, IObservable>? changes = null) - { - public IObservable> Changes { get; } = changes ?? Observable.Empty>(); - - public IEnumerable Destination => initial(); - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else + +using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Cache.Internal; +#else + +namespace DynamicData.Cache.Internal; +#endif + +/// +/// Provides members for the TransformMany class. +/// +/// The type of the TDestination value. +/// The type of the TDestinationKey value. +/// The type of the TSource value. +/// The type of the TSourceKey value. +/// The source value. +/// The manySelector value. +/// The keySelector value. +/// The childChanges value. +internal sealed class TransformMany(IObservable> source, Func> manySelector, Func keySelector, Func>>? childChanges = null) + where TDestination : notnull + where TDestinationKey : notnull + where TSource : notnull + where TSourceKey : notnull +{ + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The manySelector value. + /// The keySelector value. + public TransformMany(IObservable> source, Func> manySelector, Func keySelector) + : this( + source, + manySelector, + keySelector, + t => Observable.Defer( + () => + { + var subsequentChanges = manySelector(t).ToObservableChangeSet(keySelector); + + if (manySelector(t).Count > 0) + { + return subsequentChanges; + } + + return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); + })) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The manySelector value. + /// The keySelector value. + public TransformMany(IObservable> source, Func> manySelector, Func keySelector) + : this( + source, + manySelector, + keySelector, + t => Observable.Defer( + () => + { + var subsequentChanges = manySelector(t).ToObservableChangeSet(keySelector); + + if (manySelector(t).Count > 0) + { + return subsequentChanges; + } + + return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); + })) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The manySelector value. + /// The keySelector value. + public TransformMany(IObservable> source, Func> manySelector, Func keySelector) + : this( + source, + x => manySelector(x).Items, + keySelector, + t => Observable.Defer( + () => + { + var subsequentChanges = Observable.Create>(o => manySelector(t).Connect().Subscribe(o)); + + if (manySelector(t).Count > 0) + { + return subsequentChanges; + } + + return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); + })) + { + } + + /// + /// Executes the Run operation. + /// + /// The result of the operation. + public IObservable> Run() => childChanges is null ? Create() : CreateWithChangeSet(); + + /// + /// Executes the Create operation. + /// + /// The result of the operation. + private IObservable> Create() => source.Transform( + (t, _) => + { + var destination = manySelector(t).Select(m => new DestinationContainer(m, keySelector(m))).ToArray(); + return new ManyContainer(() => destination); + }, + true).Select(changes => new ChangeSet(new DestinationEnumerator(changes))); + + /// + /// Executes the CreateWithChangeSet operation. + /// + /// The result of the operation. + private IObservable> CreateWithChangeSet() + { + if (childChanges is null) + { + throw new InvalidOperationException("The childChanges is null and should not be."); + } + + return Observable.Create>( + observer => + { + var result = new ChangeAwareCache(); + + var transformed = source.Transform( + (t, _) => + { + // Only skip initial for first time Adds where there is initial data records + var locker = InternalEx.NewMonitorGate(); + var changes = childChanges(t).Synchronize(locker).Skip(1); + return new ManyContainer( + () => + { + var collection = manySelector(t); + lock (locker) + { + return collection.Select(m => new DestinationContainer(m, keySelector(m))).ToArray(); + } + }, + changes); + }).Publish(); + + var queue = new SharedDeliveryQueue(); + var initial = transformed.SynchronizeSafe(queue).Select(changes => new ChangeSet(new DestinationEnumerator(changes))); + + var subsequent = transformed.MergeMany(x => x.Changes).SynchronizeSafe(queue); + + var allChanges = initial.Merge(subsequent).Select( + changes => + { + result.Clone(changes); + return result.CaptureChanges(); + }); + + return new CompositeDisposable(allChanges.SubscribeSafe(observer), transformed.Connect(), queue); + }); + } + + /// + /// Provides members for the DestinationContainer class. + /// + /// The item value. + /// The key value. + private sealed class DestinationContainer(TDestination item, TDestinationKey key) + { + /// + /// Gets the KeyComparer value. + /// + public static IEqualityComparer KeyComparer { get; } = new KeyEqualityComparer(); + + /// + /// Gets the Item value. + /// + public TDestination Item { get; } = item; + + /// + /// Gets the Key value. + /// + public TDestinationKey Key { get; } = key; + + /// + /// Provides members for the KeyEqualityComparer class. + /// + private sealed class KeyEqualityComparer : IEqualityComparer + { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. + public bool Equals(DestinationContainer? x, DestinationContainer? y) + { + if (x is null && y is null) + { + return true; + } + + if (x is null || y is null) + { + return false; + } + + return EqualityComparer.Default.Equals(x.Key, y.Key); + } + + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. + public int GetHashCode(DestinationContainer obj) => EqualityComparer.Default.GetHashCode(obj.Key); + } + } + + /// + /// Provides members for the DestinationEnumerator class. + /// + /// The changes value. + private sealed class DestinationEnumerator(IChangeSet changes) : IEnumerable> + { + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. + public IEnumerator> GetEnumerator() + { + foreach (var change in changes.ToConcreteType()) + { + switch (change.Reason) + { + case ChangeReason.Add: + case ChangeReason.Remove: + case ChangeReason.Refresh: + { + foreach (var destination in change.Current.Destination) + { + yield return new Change(change.Reason, destination.Key, destination.Item); + } + } + + break; + case ChangeReason.Update: + { + var previousItems = change.Previous.Value.Destination.AsArray(); + var currentItems = change.Current.Destination.AsArray(); + + var removes = previousItems.Except(currentItems, DestinationContainer.KeyComparer); + var adds = currentItems.Except(previousItems, DestinationContainer.KeyComparer); + var updates = currentItems.Intersect(previousItems, DestinationContainer.KeyComparer); + + foreach (var destination in removes) + { + yield return new Change(ChangeReason.Remove, destination.Key, destination.Item); + } + + foreach (var destination in adds) + { + yield return new Change(ChangeReason.Add, destination.Key, destination.Item); + } + + foreach (var destination in updates) + { + var current = currentItems.First(d => d.Key.Equals(destination.Key)); + var previous = previousItems.First(d => d.Key.Equals(destination.Key)); + + // Do not update is items are the same reference + if (!ReferenceEquals(current.Item, previous.Item)) + { + yield return new Change(ChangeReason.Update, destination.Key, current.Item, previous.Item); + } + } + } + + break; + } + } + } + + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); + } + + /// + /// Provides members for the ManyContainer class. + /// + /// The initial value. + /// The changes value. + private sealed class ManyContainer(Func> initial, IObservable>? changes = null) + { + /// + /// Gets the Changes value. + /// + public IObservable> Changes { get; } = changes ?? Observable.Empty>(); + + /// + /// Gets the Destination value. + /// + public IEnumerable Destination => initial(); + } +} diff --git a/src/DynamicData/Cache/Internal/TransformManyAsync.cs b/src/DynamicData/Cache/Internal/TransformManyAsync.cs index b202cb307..eafc2504c 100644 --- a/src/DynamicData/Cache/Internal/TransformManyAsync.cs +++ b/src/DynamicData/Cache/Internal/TransformManyAsync.cs @@ -1,27 +1,64 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the TransformManyAsync class. +/// +/// The type of the TSource value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The type of the TDestinationKey value. +/// The source value. +/// The transformer value. +/// The equalityComparer value. +/// The comparer value. +/// The errorHandler value. internal sealed class TransformManyAsync(IObservable> source, Func>>> transformer, IEqualityComparer? equalityComparer, IComparer? comparer, Action>? errorHandler = null) where TSource : notnull where TKey : notnull where TDestination : notnull where TDestinationKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => new Subscription(source, transformer, observer, equalityComparer, comparer, errorHandler)); - // Maintains state for a single subscription - private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> + +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : CacheParentSubscription, TKey, IChangeSet, IChangeSet> { + /// + /// The _cache field. + /// private readonly Cache, TKey> _cache = new(); + + /// + /// The _changeSetMergeTracker field. + /// private readonly ChangeSetMergeTracker _changeSetMergeTracker; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The transform value. + /// The observer value. + /// The equalityComparer value. + /// The comparer value. + /// The errorHandler value. public Subscription(IObservable> source, Func>>> transform, IObserver> observer, IEqualityComparer? equalityComparer, IComparer? comparer, Action>? errorHandler = null) : base(observer) { @@ -57,6 +94,10 @@ ChangeSetCache SafeTransformer(TSource obj, TKey } } + /// + /// Executes the ParentOnNext operation. + /// + /// The changes value. protected override void ParentOnNext(IChangeSet, TKey> changes) { // Process all the changes at once to preserve the changeset order @@ -85,9 +126,18 @@ protected override void ParentOnNext(IChangeSet + /// Executes the ChildOnNext operation. + /// + /// The child value. + /// The parentKey value. protected override void ChildOnNext(IChangeSet child, TKey parentKey) => _changeSetMergeTracker.ProcessChangeSet(child); + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. protected override void EmitChanges(IObserver> observer) => _changeSetMergeTracker.EmitChanges(observer); } diff --git a/src/DynamicData/Cache/Internal/TransformOnObservable.cs b/src/DynamicData/Cache/Internal/TransformOnObservable.cs index b88e4f1c6..210104e31 100644 --- a/src/DynamicData/Cache/Internal/TransformOnObservable.cs +++ b/src/DynamicData/Cache/Internal/TransformOnObservable.cs @@ -1,27 +1,63 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; -using DynamicData.Internal; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the TransformOnObservable class. +/// +/// The type of the TSource value. +/// The type of the TKey value. +/// The type of the TDestination value. +/// The source value. +/// The transform value. +/// The transformOnRefresh value. internal sealed class TransformOnObservable(IObservable> source, Func> transform, bool transformOnRefresh = false) where TSource : notnull where TKey : notnull where TDestination : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => new Subscription(source, transform, observer, transformOnRefresh)); - // Maintains state for a single subscription - private sealed class Subscription : CacheParentSubscription> + +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : CacheParentSubscription> { + /// + /// The _cache field. + /// private readonly ChangeAwareCache _cache = new(); + + /// + /// The _transform field. + /// private readonly Func> _transform; + + /// + /// The _transformOnRefresh field. + /// private readonly bool _transformOnRefresh; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The transform value. + /// The observer value. + /// The transformOnRefresh value. public Subscription(IObservable> source, Func> transform, IObserver> observer, bool transformOnRefresh) : base(observer) { @@ -30,6 +66,10 @@ public Subscription(IObservable> source, Func + /// Executes the ParentOnNext operation. + /// + /// The changes value. protected override void ParentOnNext(IChangeSet changes) { // Process all the changes at once to preserve the changeset order @@ -64,9 +104,18 @@ protected override void ParentOnNext(IChangeSet changes) } } + /// + /// Executes the ChildOnNext operation. + /// + /// The child value. + /// The parentKey value. protected override void ChildOnNext(TDestination child, TKey parentKey) => _cache.AddOrUpdate(child, parentKey); + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. protected override void EmitChanges(IObserver> observer) { var changes = _cache.CaptureChanges(); @@ -76,6 +125,11 @@ protected override void EmitChanges(IObserver> ob } } + /// + /// Executes the AddTransformSubscription operation. + /// + /// The obj value. + /// The key value. private void AddTransformSubscription(TSource obj, TKey key) => AddChildSubscription(MakeChildObservable(_transform(obj, key).DistinctUntilChanged()), key); } diff --git a/src/DynamicData/Cache/Internal/TransformWithForcedTransform.cs b/src/DynamicData/Cache/Internal/TransformWithForcedTransform.cs index c7c95aa66..e056fcf75 100644 --- a/src/DynamicData/Cache/Internal/TransformWithForcedTransform.cs +++ b/src/DynamicData/Cache/Internal/TransformWithForcedTransform.cs @@ -1,17 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - -internal sealed class TransformWithForcedTransform(IObservable> source, Func, TKey, TDestination> transformFactory, IObservable> forceTransform, Action>? exceptionCallback = null) +#endif + +/// +/// Provides members for the TransformWithForcedTransform class. +/// +/// The type of the TDestination value. +/// The type of the TSource value. +/// The type of the TKey value. +/// The source value. +/// The transformFactory value. +/// The forceTransform value. +/// The exceptionCallback value. +internal sealed class TransformWithForcedTransform(IObservable> source, Func, TKey, TDestination> transformFactory, IObservable> forceTransform, Action>? exceptionCallback = null) where TDestination : notnull where TSource : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -33,6 +49,12 @@ public IObservable> Run() => Observable.Create + /// Executes the CaptureChanges operation. + /// + /// The cache value. + /// The shouldTransform value. + /// The result of the operation. private static IEnumerable> CaptureChanges(Cache cache, Func shouldTransform) => cache.KeyValues.Where(kvp => shouldTransform(kvp.Value, kvp.Key)).Select(kvp => new Change(ChangeReason.Refresh, kvp.Key, kvp.Value)); } diff --git a/src/DynamicData/Cache/Internal/TransformWithInlineUpdate.cs b/src/DynamicData/Cache/Internal/TransformWithInlineUpdate.cs index 322a50eb1..217b38d8f 100644 --- a/src/DynamicData/Cache/Internal/TransformWithInlineUpdate.cs +++ b/src/DynamicData/Cache/Internal/TransformWithInlineUpdate.cs @@ -1,11 +1,25 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the TransformWithInlineUpdate class. +/// +/// The type of the TDestination value. +/// The type of the TSource value. +/// The type of the TKey value. +/// The source value. +/// The transformFactory value. +/// The updateAction value. +/// The exceptionCallback value. +/// The transformOnRefresh value. internal sealed class TransformWithInlineUpdate(IObservable> source, Func transformFactory, Action updateAction, @@ -15,8 +29,16 @@ internal sealed class TransformWithInlineUpdate(IOb where TSource : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Defer(RunImpl); + /// + /// Executes the RunImpl operation. + /// + /// The result of the operation. private IObservable> RunImpl() => source.Scan( (ChangeAwareCache?)null, (cache, changes) => @@ -62,6 +84,11 @@ private IObservable> RunImpl() => source.Scan( .Where(x => x is not null) .Select(cache => cache!.CaptureChanges()); + /// + /// Executes the Transform operation. + /// + /// The cache value. + /// The change value. private void Transform(ChangeAwareCache cache, in Change change) { TDestination transformed; @@ -84,6 +111,11 @@ private void Transform(ChangeAwareCache cache, in Change + /// Executes the InlineUpdate operation. + /// + /// The cache value. + /// The change value. private void InlineUpdate(ChangeAwareCache cache, Change change) { var previous = cache.Lookup(change.Key) diff --git a/src/DynamicData/Cache/Internal/TreeBuilder.cs b/src/DynamicData/Cache/Internal/TreeBuilder.cs index bf379ef99..9ab405db2 100644 --- a/src/DynamicData/Cache/Internal/TreeBuilder.cs +++ b/src/DynamicData/Cache/Internal/TreeBuilder.cs @@ -1,31 +1,55 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the TreeBuilder class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The pivotOn value. +/// The predicateChanged value. internal sealed class TreeBuilder(IObservable> source, Func pivotOn, IObservable, bool>>? predicateChanged) where TObject : class where TKey : notnull { + /// + /// The _pivotOn field. + /// private readonly Func _pivotOn = pivotOn ?? throw new ArgumentNullException(nameof(pivotOn)); + /// + /// The _predicateChanged field. + /// private readonly IObservable, bool>> _predicateChanged = predicateChanged ?? Observable.Return(DefaultPredicate); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Gets the DefaultPredicate value. + /// private static Func, bool> DefaultPredicate => node => node.IsRoot; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable, TKey>> Run() => Observable.Create, TKey>>( observer => { var queue = new SharedDeliveryQueue(); - var reFilterObservable = new BehaviorSubject(Unit.Default); + var reFilterObservable = new StateSignal(Unit.Default); var allData = _source.SynchronizeSafe(queue).AsObservableCache(); diff --git a/src/DynamicData/Cache/Internal/TrueFor.cs b/src/DynamicData/Cache/Internal/TrueFor.cs index 28e036298..d3447619a 100644 --- a/src/DynamicData/Cache/Internal/TrueFor.cs +++ b/src/DynamicData/Cache/Internal/TrueFor.cs @@ -1,23 +1,47 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the TrueFor class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The type of the TValue value. +/// The source value. +/// The observableSelector value. +/// The collectionMatcher value. internal sealed class TrueFor(IObservable> source, Func> observableSelector, Func>, bool> collectionMatcher) where TObject : notnull where TKey : notnull where TValue : notnull { + /// + /// The _collectionMatcher field. + /// private readonly Func>, bool> _collectionMatcher = collectionMatcher ?? throw new ArgumentNullException(nameof(collectionMatcher)); + /// + /// The _observableSelector field. + /// private readonly Func> _observableSelector = observableSelector ?? throw new ArgumentNullException(nameof(observableSelector)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable Run() => Observable.Create(observer => { @@ -28,9 +52,9 @@ public IObservable Run() .Publish(); var subscription = itemsWithValues.MergeMany(item => item.Observable).CombineLatest( - second: itemsWithValues.ToCollection(), + itemsWithValues.ToCollection(), // We don't need to actually look at the changed values, we just need them as a trigger to re-evaluate the matcher method. - resultSelector: (_, itemsWithValues) => _collectionMatcher.Invoke(itemsWithValues)) + (_, itemsWithValues) => _collectionMatcher.Invoke(itemsWithValues)) .DistinctUntilChanged() .SubscribeSafe(observer); diff --git a/src/DynamicData/Cache/Internal/UniquenessEnforcer.cs b/src/DynamicData/Cache/Internal/UniquenessEnforcer.cs index 0c858419c..a5d3d6ef7 100644 --- a/src/DynamicData/Cache/Internal/UniquenessEnforcer.cs +++ b/src/DynamicData/Cache/Internal/UniquenessEnforcer.cs @@ -1,15 +1,28 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; +#endif +/// +/// Provides members for the UniquenessEnforcer class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. internal sealed class UniquenessEnforcer(IObservable> source) where TObject : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => /* For refresh, we need to check whether there was a previous add or update in the batch. If not use refresh, diff --git a/src/DynamicData/Cache/Internal/Virtualise.cs b/src/DynamicData/Cache/Internal/Virtualise.cs index 9a5fefbcc..1d750b5df 100644 --- a/src/DynamicData/Cache/Internal/Virtualise.cs +++ b/src/DynamicData/Cache/Internal/Virtualise.cs @@ -1,20 +1,39 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Cache.Internal; +#else namespace DynamicData.Cache.Internal; - +#endif + +/// +/// Provides members for the Virtualise class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The virtualRequests value. internal sealed class Virtualise(IObservable> source, IObservable virtualRequests) where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _virtualRequests field. + /// private readonly IObservable _virtualRequests = virtualRequests ?? throw new ArgumentNullException(nameof(virtualRequests)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -26,16 +45,37 @@ public IObservable> Run() => Observable.Create< return new CompositeDisposable(request.Merge(dataChange).Where(updates => updates is not null).SubscribeSafe(observer), queue); }); - private sealed class Virtualiser(VirtualRequest? request = null) +/// +/// Provides members for the Virtualiser class. +/// +/// The request value. +private sealed class Virtualiser(VirtualRequest? request = null) { + /// + /// The _all field. + /// private IKeyValueCollection _all = new KeyValueCollection(); + /// + /// The _current field. + /// private KeyValueCollection _current = new(); + /// + /// The _isLoaded field. + /// private bool _isLoaded; + /// + /// The _parameters field. + /// private IVirtualRequest _parameters = request ?? new VirtualRequest(); + /// + /// Executes the Update operation. + /// + /// The updates value. + /// The result of the operation. public IVirtualChangeSet? Update(ISortedChangeSet updates) { _isLoaded = true; @@ -43,6 +83,11 @@ private sealed class Virtualiser(VirtualRequest? request = null) return Virtualise(updates); } + /// + /// Executes the Virtualise operation. + /// + /// The parameters value. + /// The result of the operation. public IVirtualChangeSet? Virtualise(IVirtualRequest? parameters) { if (parameters is null || parameters.StartIndex < 0 || parameters.Size < 1) @@ -59,6 +104,11 @@ private sealed class Virtualiser(VirtualRequest? request = null) return Virtualise(); } + /// + /// Executes the Virtualise operation. + /// + /// The updates value. + /// The result of the operation. private VirtualChangeSet? Virtualise(ISortedChangeSet? updates = null) { if (!_isLoaded) diff --git a/src/DynamicData/Cache/MissingKeyException.cs b/src/DynamicData/Cache/MissingKeyException.cs index 72b2b2bea..7635165d9 100644 --- a/src/DynamicData/Cache/MissingKeyException.cs +++ b/src/DynamicData/Cache/MissingKeyException.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Thrown when a key is expected in a cache but not found. diff --git a/src/DynamicData/Cache/Node.cs b/src/DynamicData/Cache/Node.cs index 44918b4c1..5d53c30d8 100644 --- a/src/DynamicData/Cache/Node.cs +++ b/src/DynamicData/Cache/Node.cs @@ -2,10 +2,12 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Reactive.Disposables; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Node describing the relationship between and item and it's ancestors and descendent. @@ -16,11 +18,20 @@ public class Node : IDisposable, IEquatable> where TObject : class where TKey : notnull { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + /// + /// The _children field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] private readonly SourceCache, TKey> _children = new(n => n.Key); + /// + /// The _cleanUp field. + /// private readonly CompositeDisposable _cleanUp; + /// + /// The _isDisposed field. + /// private bool _isDisposed; /// @@ -39,13 +50,13 @@ public Node(TObject item, TKey key) /// The item. /// The key. /// The parent. - public Node(TObject item, TKey key, in Optional> parent) + public Node(TObject item, TKey key, in ReactiveUI.Primitives.Optional> parent) { Item = item ?? throw new ArgumentNullException(nameof(item)); Key = key; Parent = parent; Children = _children.AsObservableCache(); - _cleanUp = new(Children, _children); + _cleanUp = new CompositeDisposable(Children, _children); } /// @@ -93,7 +104,7 @@ public int Depth /// /// Gets the parent if it has one. /// - public Optional> Parent { get; internal set; } + public ReactiveUI.Primitives.Optional> Parent { get; internal set; } /// /// Determines whether the specified objects are equal. @@ -179,6 +190,10 @@ public override string ToString() return $"{Item}{count}"; } + /// + /// Executes the Update operation. + /// + /// The updateAction value. internal void Update(Action, TKey>> updateAction) => _children.Edit(updateAction); /// diff --git a/src/DynamicData/Cache/ObservableCache.cs b/src/DynamicData/Cache/ObservableCache.cs index 745e06ba1..ab4388d36 100644 --- a/src/DynamicData/Cache/ObservableCache.cs +++ b/src/DynamicData/Cache/ObservableCache.cs @@ -3,53 +3,102 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; - +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the ObservableCache class. +/// +/// The type of the TObject value. +/// The type of the TKey value. [DebuggerDisplay("ObservableCache<{typeof(TObject).Name}, {typeof(TKey).Name}> ({Count} Items)")] internal sealed class ObservableCache : IObservableCache, INotifyCollectionChangedSuspender where TObject : notnull where TKey : notnull { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] - private readonly Subject> _changes = new(); + /// + /// The _changes field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + private readonly Signal> _changes = new(); - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] - private readonly Subject> _changesPreview = new(); + /// + /// The _changesPreview field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + private readonly Signal> _changesPreview = new(); + /// + /// The _cleanUp field. + /// private readonly IDisposable _cleanUp; - private readonly Lazy> _countChanged = new(() => new Subject()); + /// + /// The _countChanged field. + /// + private readonly Lazy> _countChanged = new(() => new Signal()); + /// + /// The _suspensionTracker field. + /// private readonly Lazy _suspensionTracker; -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + /// + /// The _readerWriter field. + /// private readonly ReaderWriter _readerWriter; - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Terminated via NotifyCompleted in _cleanUp")] + /// + /// The _notifications field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Terminated via NotifyCompleted in _cleanUp")] private readonly DeliveryQueue _notifications; - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] - private readonly Lazy> _isEditInProgress; + /// + /// The _isEditInProgress field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Completed with _cleanUp and explicit disposal is redundant.")] + private readonly Lazy> _isEditInProgress; + /// + /// The _editLevel field. + /// private int _editLevel; // The level of recursion in editing. + /// + /// The _currentVersion field. + /// private long _currentVersion; // Monotonic counter incremented under lock for each enqueued change notification. + /// + /// The _currentDeliveryVersion field. + /// private long _currentDeliveryVersion; // Version of the item currently being delivered. Set before _changes.OnNext. + /// + /// Initializes a new instance of the class. + /// + /// The source value. public ObservableCache(IObservable> source) { _readerWriter = new ReaderWriter(); @@ -81,6 +130,10 @@ public ObservableCache(IObservable> source) }); } + /// + /// Initializes a new instance of the class. + /// + /// The keySelector value. public ObservableCache(Func? keySelector = null) { _readerWriter = new ReaderWriter(keySelector); @@ -91,8 +144,14 @@ public ObservableCache(Func? keySelector = null) _cleanUp = Disposable.Create(NotifyCompleted); } + /// + /// Gets the Count value. + /// public int Count => _readerWriter.Count; + /// + /// Gets the CountChanged value. + /// public IObservable CountChanged => Observable.Create( observer => @@ -108,26 +167,61 @@ public ObservableCache(Func? keySelector = null) return source.SubscribeSafe(observer); }); + /// + /// Gets the Items value. + /// public IReadOnlyList Items => _readerWriter.Items; + /// + /// Gets the Keys value. + /// public IReadOnlyList Keys => _readerWriter.Keys; + /// + /// Gets the KeyValues value. + /// public IReadOnlyDictionary KeyValues => _readerWriter.KeyValues; - public IObservable> Connect( - Func? predicate = null, - bool suppressEmptyChangeSets = true) - => CreateDeferredNotificationObservable(() => CreateConnectObservable(predicate, suppressEmptyChangeSets)); + /// + /// Executes the Connect operation. + /// + /// The predicate value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. + public IObservable> Connect(Func? predicate = null, bool suppressEmptyChangeSets = true) => + CreateDeferredNotificationObservable(() => CreateConnectObservable(predicate, suppressEmptyChangeSets)); + /// + /// Executes the Dispose operation. + /// public void Dispose() => _cleanUp.Dispose(); - public Optional Lookup(TKey key) => _readerWriter.Lookup(key); + /// + /// Executes the Lookup operation. + /// + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _readerWriter.Lookup(key); + /// + /// Executes the Preview operation. + /// + /// The predicate value. + /// The result of the operation. public IObservable> Preview(Func? predicate = null) => predicate is null ? _changesPreview : _changesPreview.Filter(predicate); - public IObservable> Watch(TKey key) - => CreateDeferredNotificationObservable(() => CreateWatchObservable(key)); + /// + /// Executes the Watch operation. + /// + /// The key value. + /// The result of the operation. + public IObservable> Watch(TKey key) => + CreateDeferredNotificationObservable(() => CreateWatchObservable(key)); + /// + /// Executes the SuspendCount operation. + /// + /// The result of the operation. public IDisposable SuspendCount() { lock (_locker) @@ -137,6 +231,10 @@ public IDisposable SuspendCount() } } + /// + /// Executes the SuspendNotifications operation. + /// + /// The result of the operation. public IDisposable SuspendNotifications() { lock (_locker) @@ -146,11 +244,20 @@ public IDisposable SuspendNotifications() } } + /// + /// Executes the GetInitialUpdates operation. + /// + /// The filter value. + /// The result of the operation. internal ChangeSet GetInitialUpdates(Func? filter = null) => _readerWriter.GetInitialUpdates(filter); + /// + /// Executes the UpdateFromIntermediate operation. + /// + /// The updateAction value. internal void UpdateFromIntermediate(Action> updateAction) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); using var notifications = _notifications.AcquireLock(); @@ -158,7 +265,10 @@ internal void UpdateFromIntermediate(Action> update _editLevel++; if (_isEditInProgress.IsValueCreated && (_editLevel is 1)) + { _isEditInProgress.Value.OnNext(true); + } + try { if (_editLevel == 1) @@ -181,13 +291,19 @@ internal void UpdateFromIntermediate(Action> update } if (_isEditInProgress.IsValueCreated && (_editLevel is 0)) + { _isEditInProgress.Value.OnNext(false); + } } } + /// + /// Executes the UpdateFromSource operation. + /// + /// The updateAction value. internal void UpdateFromSource(Action> updateAction) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); using var notifications = _notifications.AcquireLock(); @@ -195,7 +311,10 @@ internal void UpdateFromSource(Action> updateActio _editLevel++; if (_isEditInProgress.IsValueCreated && (_editLevel is 1)) + { _isEditInProgress.Value.OnNext(true); + } + try { if (_editLevel == 1) @@ -218,10 +337,18 @@ internal void UpdateFromSource(Action> updateActio } if (_isEditInProgress.IsValueCreated && (_editLevel is 0)) + { _isEditInProgress.Value.OnNext(false); + } } } + /// + /// Executes the CreateConnectObservable operation. + /// + /// The predicate value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. private IObservable> CreateConnectObservable(Func? predicate, bool suppressEmptyChangeSets) => Observable.Create>( observer => @@ -257,50 +384,28 @@ private IObservable CreateDeferredNotificationObservable(Func factory.Invoke(), - - // Edit system is active, suspension system isn't - // Need to avoid activating the suspension system if we don't absolutely need to, as it adds - // locking overhead to edit operations. But then when the edit is done, we need to check if a - // suspension came in. If so, do a followup wait with the full logic for both systems. It - // needs to be the full logic, in case an edit comes in during the suspension, and so on. - (false, true) => _isEditInProgress.Value - .Where(static isEditInProgress => !isEditInProgress) - .Take(1) - .SelectMany(_ => (_suspensionTracker.IsValueCreated && _suspensionTracker.Value.AreNotificationsSuspended) - ? CreateFullyDeferredConnection() - : factory.Invoke()), - - // Suspension system is active, edit system isn't - // Same case as above, but reversed. Just wait on the suspension system, but then do a followup - // wait if needed. - (true, false) => _suspensionTracker.Value.NotificationsSuspendedObservable - .Where(static isSuspensionInProgress => !isSuspensionInProgress) - .Take(1) - .SelectMany(_ => (_isEditInProgress.IsValueCreated && _isEditInProgress.Value.Value) - ? CreateFullyDeferredConnection() - : factory.Invoke()), - - // If both systems are already active, we can monitor both systems simultaneously, and make the - // connection as soon as both are idle at the same time. - _ => CreateFullyDeferredConnection() - }; + var observable = (_suspensionTracker.IsValueCreated, _isEditInProgress.IsValueCreated || (_editLevel is not 0)) switch + { + (false, false) => factory.Invoke(), + (false, true) => _isEditInProgress.Value + .Where(static isEditInProgress => !isEditInProgress) + .Take(1) + .SelectMany(_ => (_suspensionTracker.IsValueCreated && _suspensionTracker.Value.AreNotificationsSuspended) + ? CreateFullyDeferredConnection() + : factory.Invoke()), + (true, false) => _suspensionTracker.Value.NotificationsSuspendedObservable + .Where(static areNotificationsSuspended => !areNotificationsSuspended) + .Take(1) + .SelectMany(_ => (_isEditInProgress.IsValueCreated && _isEditInProgress.Value.Value) + ? CreateFullyDeferredConnection() + : factory.Invoke()), + _ => CreateFullyDeferredConnection() + }; return observable.SubscribeSafe(observer); IObservable CreateFullyDeferredConnection() - => Observable.CombineLatest( - _suspensionTracker.Value.NotificationsSuspendedObservable, + => _suspensionTracker.Value.NotificationsSuspendedObservable.CombineLatest( _isEditInProgress.Value, static (areNotificationsSuspended, isEditInProgress) => areNotificationsSuspended || isEditInProgress) .Do(static _ => { }, observer.OnCompleted) @@ -311,6 +416,11 @@ IObservable CreateFullyDeferredConnection() } }); + /// + /// Executes the CreateWatchObservable operation. + /// + /// The key value. + /// The result of the operation. private IObservable> CreateWatchObservable(TKey key) => Observable.Create>( observer => @@ -350,6 +460,7 @@ private IObservable> CreateWatchObservable(TKey key) => /// called by ReaderWriter during a write, between two data swaps, so it MUST /// fire under the lock with the pre-write state visible to subscribers. /// + /// The changes value. private void InvokePreview(ChangeSet changes) { if (changes.Count != 0 && !_notifications.IsTerminated) @@ -358,12 +469,19 @@ private void InvokePreview(ChangeSet changes) } } + /// + /// Executes the NotifyCompleted operation. + /// private void NotifyCompleted() { using var notifications = _notifications.AcquireLock(); notifications.EnqueueCompleted(); } + /// + /// Executes the NotifyError operation. + /// + /// The ex value. private void NotifyError(Exception ex) { using var notifications = _notifications.AcquireLock(); @@ -373,7 +491,7 @@ private void NotifyError(Exception ex) /// /// Delivers a single notification to subscribers. This method is the delivery /// callback for and must never be called directly. - /// It is invoked by the after releasing the + /// It is invoked by the DeliveryQueue<TItem> after releasing the /// lock, which guarantees that no lock is held when subscriber code runs. The /// queue's single-deliverer token ensures this method is never called concurrently, /// preserving the Rx serialization contract across all subjects. @@ -391,10 +509,12 @@ private void ResumeCount() } } + /// + /// Executes the ResumeNotifications operation. + /// private void ResumeNotifications() { using var notifications = _notifications.AcquireLock(); - Debug.Assert(_suspensionTracker.IsValueCreated, "Should not be Resuming Notifications without Suspend Notifications instance"); var (changes, emitResume) = _suspensionTracker.Value.ResumeNotifications(); @@ -418,14 +538,22 @@ private void ResumeNotifications() /// /// The notification payload for cache delivery. Null Changes = count-only notification. /// + /// The Changes value. + /// The Count value. + /// The Version value. private readonly record struct CacheUpdate(ChangeSet? Changes, int Count, long Version = 0); /// /// Observer that dispatches items to the cache's /// downstream subjects. Used as the delivery target for . /// + /// The cache value. private sealed class CacheUpdateObserver(ObservableCache cache) : IObserver { + /// + /// Executes the OnNext operation. + /// + /// The value value. public void OnNext(CacheUpdate value) { if (value.Changes is not null) @@ -437,6 +565,10 @@ public void OnNext(CacheUpdate value) EmitCount(value.Count); } + /// + /// Executes the OnError operation. + /// + /// The error value. public void OnError(Exception error) { cache._changesPreview.OnError(error); @@ -458,6 +590,9 @@ public void OnError(Exception error) } } + /// + /// Executes the OnCompleted operation. + /// public void OnCompleted() { cache._changes.OnCompleted(); @@ -479,6 +614,10 @@ public void OnCompleted() } } + /// + /// Executes the EmitChanges operation. + /// + /// The changes value. private void EmitChanges(ChangeSet changes) { if (cache._suspensionTracker.IsValueCreated) @@ -496,6 +635,10 @@ private void EmitChanges(ChangeSet changes) cache._changes.OnNext(changes); } + /// + /// Executes the EmitCount operation. + /// + /// The count value. private void EmitCount(int count) { if (cache._suspensionTracker.IsValueCreated) @@ -516,22 +659,50 @@ private void EmitCount(int count) } } + /// + /// Provides members for the SuspensionTracker class. + /// private sealed class SuspensionTracker : IDisposable { - private readonly BehaviorSubject _areNotificationsSuspended = new(false); - + /// + /// The _areNotificationsSuspended field. + /// + private readonly BehaviorSignal _areNotificationsSuspended = new(false); + + /// + /// The _pendingChanges field. + /// private List> _pendingChanges = []; + /// + /// The _countSuspendCount field. + /// private int _countSuspendCount; + /// + /// The _notifySuspendCount field. + /// private int _notifySuspendCount; + /// + /// Gets the IsCountSuspended value. + /// public bool IsCountSuspended => _countSuspendCount > 0; + /// + /// Gets the AreNotificationsSuspended value. + /// public bool AreNotificationsSuspended => _notifySuspendCount > 0; + /// + /// Gets the NotificationsSuspendedObservable value. + /// public IObservable NotificationsSuspendedObservable => _areNotificationsSuspended; + /// + /// Executes the EnqueueChanges operation. + /// + /// The changes value. public void EnqueueChanges(IEnumerable> changes) { Debug.Assert(changes is not null, "Don't pass in a null Enumerable"); @@ -539,6 +710,9 @@ public void EnqueueChanges(IEnumerable> changes) _pendingChanges.AddRange(changes); } + /// + /// Executes the SuspendNotifications operation. + /// public void SuspendNotifications() { if ((++_notifySuspendCount == 1) && !_areNotificationsSuspended.IsDisposed) @@ -549,10 +723,21 @@ public void SuspendNotifications() } } + /// + /// Executes the SuspendCount operation. + /// public void SuspendCount() => ++_countSuspendCount; + /// + /// Executes the ResumeCount operation. + /// + /// The result of the operation. public bool ResumeCount() => --_countSuspendCount == 0; + /// + /// Executes the ResumeNotifications operation. + /// + /// The result of the operation. public (ChangeSet? Changes, bool EmitResume) ResumeNotifications() { if (--_notifySuspendCount == 0 && !_areNotificationsSuspended.IsDisposed) @@ -588,6 +773,9 @@ public void Fault(Exception error) _areNotificationsSuspended.Dispose(); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _areNotificationsSuspended.OnCompleted(); diff --git a/src/DynamicData/Cache/ObservableCacheEx.Adapt.cs b/src/DynamicData/Cache/ObservableCacheEx.Adapt.cs index f99f46747..28d155f56 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Adapt.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Adapt.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,13 +24,13 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Injects a side effect into the changeset stream by calling . + /// Injects a side effect into the changeset stream by calling .IChangeSetAdaptor<TObject, TKey>.Adapt(IChangeSet<TObject, TKey>) /// for every changeset, then forwarding it downstream unchanged. /// /// The type of items in the cache. /// The type of the key. - /// The source to observe and adapt. - /// The whose Adapt method is called for each changeset. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe and adapt. + /// The IChangeSetAdaptor<TObject, TKey> whose Adapt method is called for each changeset. /// An observable that emits the same changesets as , after the adaptor has processed each one. /// /// @@ -41,28 +39,33 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// + /// Adapt<TObject, TKey>(IObservable<ISortedChangeSet<TObject, TKey>>, ISortedChangeSetAdaptor<TObject, TKey>) + /// Bind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservableCollection<TObject>, IObservableCollectionAdaptor<TObject, TKey>) public static IObservable> Adapt(this IObservable> source, IChangeSetAdaptor adaptor) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - adaptor.ThrowArgumentNullExceptionIfNull(nameof(adaptor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(adaptor); return source.Do(adaptor.Adapt); } - /// - /// The source to observe and adapt. - /// The whose Adapt method is called for each changeset. - /// This overload operates on . Delegates to Rx's Do operator. + /// + /// Provides an overload of Adapt for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to observe and adapt. + /// The ISortedChangeSetAdaptor<TObject, TKey> whose Adapt method is called for each changeset. + /// The resulting observable sequence. + /// This overload operates on ISortedChangeSet<TObject, TKey>. Delegates to Rx's Do operator. public static IObservable> Adapt(this IObservable> source, ISortedChangeSetAdaptor adaptor) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - adaptor.ThrowArgumentNullExceptionIfNull(nameof(adaptor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(adaptor); return source.Do(adaptor.Adapt); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.AdaptSelector.cs b/src/DynamicData/Cache/ObservableCacheEx.AdaptSelector.cs index 07c984029..a8dafbbba 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.AdaptSelector.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.AdaptSelector.cs @@ -2,23 +2,14 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,6 +17,15 @@ namespace DynamicData; public static partial class ObservableCacheEx { // TODO: Apply the Adapter to more places + + /// + /// Executes the AdaptSelector operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TResult value. + /// The other value. + /// The result of the operation. private static Func AdaptSelector(Func other) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.AddOrUpdate.cs b/src/DynamicData/Cache/ObservableCacheEx.AddOrUpdate.cs index 3b217f6ed..2f2204782 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.AddOrUpdate.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.AddOrUpdate.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,10 +22,10 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The to add or update items in. + /// The ISourceCache<TObject, TKey> to add or update items in. /// The item to add or update. /// - /// Convenience method that wraps a single-item mutation inside . + /// Convenience method that wraps a single-item mutation inside ISourceCache<TObject,TKey>.Edit. /// /// EventBehavior /// AddProduced when the key does not already exist in the cache. @@ -44,69 +35,92 @@ public static partial class ObservableCacheEx /// /// /// is . - /// - /// + /// EditDiff<TObject, TKey>(ISourceCache<TObject, TKey>, IEnumerable<TObject>, IEqualityComparer<TObject>) + /// Remove<TObject, TKey>(ISourceCache<TObject, TKey>, TObject) public static void AddOrUpdate(this ISourceCache source, TObject item) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(item); source.Edit(updater => updater.AddOrUpdate(item)); } - /// - /// The to add or update items in. + /// + /// Provides an overload of AddOrUpdate for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The ISourceCache<TObject, TKey> to add or update items in. /// The item to add or update. - /// The used to determine whether a new item is the same as an existing cached item. When equal, the update is skipped. + /// The IEqualityComparer<TObject> used to determine whether a new item is the same as an existing cached item. When equal, the update is skipped. /// This overload uses to suppress no-op updates when the new value equals the existing one. public static void AddOrUpdate(this ISourceCache source, TObject item, IEqualityComparer equalityComparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(item); + ArgumentExceptionHelper.ThrowIfNull(equalityComparer); source.Edit(updater => updater.AddOrUpdate(item, equalityComparer)); } - /// - /// The to add or update items in. - /// The of items to add or update. - /// Batch overload. All items are added/updated inside a single call, producing one changeset. + /// + /// Provides an overload of AddOrUpdate for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The ISourceCache<TObject, TKey> to add or update items in. + /// The IEnumerable<TObject> of items to add or update. + /// Batch overload. All items are added/updated inside a single ISourceCache<TObject,TKey>.Edit call, producing one changeset. public static void AddOrUpdate(this ISourceCache source, IEnumerable items) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); source.Edit(updater => updater.AddOrUpdate(items)); } - /// - /// The to add or update items in. - /// The of items to add or update. - /// The used to determine whether a new item is the same as an existing cached item. When equal, the update is skipped. - /// Batch overload with equality comparison. All items are added/updated inside a single call. + /// + /// Provides an overload of AddOrUpdate for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The ISourceCache<TObject, TKey> to add or update items in. + /// The IEnumerable<TObject> of items to add or update. + /// The IEqualityComparer<TObject> used to determine whether a new item is the same as an existing cached item. When equal, the update is skipped. + /// Batch overload with equality comparison. All items are added/updated inside a single ISourceCache<TObject,TKey>.Edit call. public static void AddOrUpdate(this ISourceCache source, IEnumerable items, IEqualityComparer equalityComparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); + ArgumentExceptionHelper.ThrowIfNull(equalityComparer); source.Edit(updater => updater.AddOrUpdate(items, equalityComparer)); } - /// - /// The to add or update items in. + /// + /// Provides an overload of AddOrUpdate for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The IIntermediateCache<TObject, TKey> to add or update items in. /// The item to add or update. /// The key to associate with the item. - /// This overload operates on , which requires an explicit key parameter. + /// This overload operates on IIntermediateCache<TObject, TKey>, which requires an explicit key parameter. public static void AddOrUpdate(this IIntermediateCache source, TObject item, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - item.ThrowArgumentNullExceptionIfNull(nameof(item)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(item); + ArgumentExceptionHelper.ThrowIfNull(key); source.Edit(updater => updater.AddOrUpdate(item, key)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.And.cs b/src/DynamicData/Cache/ObservableCacheEx.And.cs index bae09dd4e..95c91039c 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.And.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.And.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,16 +29,16 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to combine. - /// The additional streams to combine with. + /// The source IObservable<IChangeSet<TObject, TKey>> to combine. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to combine with. /// An observable which emits change sets. /// source or others. - /// + /// ObservableListEx.And public static IObservable> And(this IObservable> source, params IObservable>[] others) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return others is null || others.Length == 0 ? throw new ArgumentNullException(nameof(others)) @@ -52,7 +50,7 @@ public static IObservable> And(this IOb /// /// The type of the object. /// The type of the key. - /// The of streams to combine. + /// The ICollection<T> of streams to combine. /// An observable which emits change sets. /// /// source @@ -63,7 +61,7 @@ public static IObservable> And(this ICo where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.And); } @@ -74,13 +72,13 @@ public static IObservable> And(this ICo /// /// The type of the object. /// The type of the key. - /// The of streams to combine. + /// The IObservableList<T> of streams to combine. /// An observable which emits change sets. public static IObservable> And(this IObservableList>> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.And); } @@ -91,13 +89,13 @@ public static IObservable> And(this IOb /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<IObservableCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits change sets. public static IObservable> And(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.And); } @@ -108,13 +106,13 @@ public static IObservable> And(this IOb /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<ISourceCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits change sets. public static IObservable> And(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.And); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.AsObservableCache.cs b/src/DynamicData/Cache/ObservableCacheEx.AsObservableCache.cs index 3a9f58875..9b571d6a2 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.AsObservableCache.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.AsObservableCache.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,30 +24,30 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Wraps an in a read-only facade, hiding the mutable API. + /// Wraps an IObservableCache<TObject, TKey> in a read-only facade, hiding the mutable API. /// /// The type of the object. /// The type of the key. - /// The to operate on. - /// A read-only . + /// The IObservableCache<TObject, TKey> to operate on. + /// A read-only IObservableCache<TObject, TKey>. /// is . - /// + /// AsObservableCache<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, bool) public static IObservableCache AsObservableCache(this IObservableCache source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new AnonymousObservableCache(source); } /// - /// Materializes a changeset stream into a queryable, read-only . + /// Materializes a changeset stream into a queryable, read-only IObservableCache<TObject, TKey>. /// The cache subscribes to the source on first access and maintains a live snapshot of all items. /// /// The type of the object. /// The type of the key. - /// The source to materialize into a read-only cache. + /// The source IObservable<IChangeSet<TObject, TKey>> to materialize into a read-only cache. /// If (default), all cache operations are synchronized. Set to when the caller guarantees single-threaded access. /// A read-only observable cache that reflects the current state of the pipeline. /// @@ -57,16 +55,16 @@ public static IObservableCache AsObservableCache(t /// Disposing the returned cache unsubscribes from the source stream. The cache's Connect() /// method provides a changeset stream of its own, which re-emits the current state on each new subscriber. /// - /// When is , a is used internally. + /// When is , a LockFreeObservableCache<TObject, TKey> is used internally. /// /// is . - /// - /// + /// AsObservableCache<TObject, TKey>(IObservableCache<TObject, TKey>) + /// PopulateInto<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, ISourceCache<TObject, TKey>) public static IObservableCache AsObservableCache(this IObservable> source, bool applyLocking = true) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (applyLocking) { diff --git a/src/DynamicData/Cache/ObservableCacheEx.AsyncDisposeMany.cs b/src/DynamicData/Cache/ObservableCacheEx.AsyncDisposeMany.cs index 0a15843d5..95499d53c 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.AsyncDisposeMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.AsyncDisposeMany.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -37,10 +28,10 @@ public static partial class ObservableCacheEx /// /// The type of items in the cache. /// The type of the key. - /// The source to track for async disposal on removal. + /// The source IObservable<IChangeSet<TObject, TKey>> to track for async disposal on removal. /// /// - /// Invoked once per subscription, providing an that signals when all + /// Invoked once per subscription, providing an IObservable<Unit> that signals when all /// calls have finished. The signal emits a single value /// and then completes. /// @@ -68,7 +59,7 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// + /// DisposeMany<TObject,TKey> public static IObservable> AsyncDisposeMany( this IObservable> source, Action> disposalsCompletedAccessor) diff --git a/src/DynamicData/Cache/ObservableCacheEx.AutoRefresh.cs b/src/DynamicData/Cache/ObservableCacheEx.AutoRefresh.cs index 1e7bfb428..087a3ecbb 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.AutoRefresh.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.AutoRefresh.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,17 +28,17 @@ public static partial class ObservableCacheEx /// /// The object of the change set. /// The key of the change set. - /// The source to monitor for property-driven refresh signals. + /// The source IObservable<IChangeSet<TObject, TKey>> to monitor for property-driven refresh signals. /// An optional buffer duration. Batches multiple refresh signals into a single changeset, improving performance when many elements change in quick succession. This greatly increases performance when many elements have successive property changes. /// An optional throttle applied to each item's property change notifications, preventing excessive refresh invocations. /// An optional for scheduling work. /// An observable change set with additional refresh changes. - /// + /// ObservableListEx.AutoRefresh public static IObservable> AutoRefresh(this IObservable> source, TimeSpan? changeSetBuffer = null, TimeSpan? propertyChangeThrottle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.AutoRefreshOnObservable( (t, _) => @@ -62,8 +60,8 @@ public static IObservable> AutoRefresh( /// The object of the change set. /// The key of the change set. /// The type of the property. - /// The source to monitor for property-driven refresh signals. - /// A that specify a property to observe changes. When it changes a Refresh is invoked. + /// The source IObservable<IChangeSet<TObject, TKey>> to monitor for property-driven refresh signals. + /// A Expression<TDelegate> that specify a property to observe changes. When it changes a Refresh is invoked. /// An optional buffer duration. Batches multiple refresh signals into a single changeset, improving performance when many elements change in quick succession. This greatly increases performance when many elements have successive property changes. /// An optional throttle applied to each item's property change notifications, preventing excessive refresh invocations. /// An optional for scheduling work. @@ -72,7 +70,8 @@ public static IObservable> AutoRefresh diff --git a/src/DynamicData/Cache/ObservableCacheEx.AutoRefreshOnObservable.cs b/src/DynamicData/Cache/ObservableCacheEx.AutoRefreshOnObservable.cs index 39a04294e..ba8c16ff8 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.AutoRefreshOnObservable.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.AutoRefreshOnObservable.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,15 +29,21 @@ public static partial class ObservableCacheEx /// The object of the change set. /// The key of the change set. /// The type of evaluation. - /// The source to monitor for observable-driven refresh signals. - /// The observable which acts on items within the collection and produces a value when the item should be refreshed. + /// The source IObservable<IChangeSet<TObject, TKey>> to monitor for observable-driven refresh signals. + /// The Func<TObject, IObservable<TAny>> observable which acts on items within the collection and produces a value when the item should be refreshed. /// An optional buffer duration. Batches multiple refresh signals into a single changeset, improving performance when many elements change in quick succession. This greatly increases performance when many elements require a refresh. /// An optional for scheduling work. /// An observable change set with additional refresh changes. - /// + /// ObservableListEx.AutoRefreshOnObservable public static IObservable> AutoRefreshOnObservable(this IObservable> source, Func> reevaluator, TimeSpan? changeSetBuffer = null, IScheduler? scheduler = null) where TObject : notnull - where TKey : notnull => source.AutoRefreshOnObservable((t, _) => reevaluator(t), changeSetBuffer, scheduler); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(reevaluator); + + return source.AutoRefreshOnObservable((t, _) => reevaluator(t), changeSetBuffer, scheduler); + } /// /// Automatically refresh downstream operator. The refresh is triggered when the observable receives a notification. @@ -47,8 +51,8 @@ public static IObservable> AutoRefreshOnObservableThe object of the change set. /// The key of the change set. /// The type of evaluation. - /// The source to monitor for observable-driven refresh signals. - /// The observable which acts on items within the collection and produces a value when the item should be refreshed. + /// The source IObservable<IChangeSet<TObject, TKey>> to monitor for observable-driven refresh signals. + /// The Func<TObject, TKey, IObservable<TAny>> observable which acts on items within the collection and produces a value when the item should be refreshed. /// An optional buffer duration. Batches multiple refresh signals into a single changeset, improving performance when many elements change in quick succession. This greatly increases performance when many elements require a refresh. /// An optional for scheduling work. /// An observable change set with additional refresh changes. @@ -59,8 +63,8 @@ public static IObservable> AutoRefreshOnObservable(source, reevaluator, changeSetBuffer, scheduler).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Batch.cs b/src/DynamicData/Cache/ObservableCacheEx.Batch.cs index 1ed843deb..bb0f6bdfe 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Batch.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Batch.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,11 +18,11 @@ public static partial class ObservableCacheEx { /// /// Collects changesets emitted within a time window and merges them into a single changeset. - /// Uses Rx's Buffer operator followed by . + /// Uses Rx's Buffer operator followed by FlattenBufferResult<TObject, TKey>. /// /// The type of the object. /// The type of the key. - /// The source to batch. + /// The source IObservable<IChangeSet<TObject, TKey>> to batch. /// The time window for batching. /// The scheduler for timing. Defaults to . /// An observable that emits merged changesets, one per time window. @@ -51,13 +42,13 @@ public static partial class ObservableCacheEx /// Worth noting: The merged changeset may contain contradictory changes (e.g., Add then Remove for the same key). Downstream operators handle this correctly, but raw inspection of the changeset may be surprising. /// /// is . - /// - /// + /// BatchIf<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<bool>, bool, TimeSpan?, IScheduler?) + /// BufferInitial<TObject, TKey> public static IObservable> Batch(this IObservable> source, TimeSpan timeSpan, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Buffer(timeSpan, scheduler ?? GlobalConfig.DefaultScheduler).FlattenBufferResult(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.BatchIf.cs b/src/DynamicData/Cache/ObservableCacheEx.BatchIf.cs index e8733432c..846350944 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.BatchIf.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.BatchIf.cs @@ -1,49 +1,67 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// This overload delegates to the primary overload with initialPauseState: false and no scheduler. - public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector) - where TObject : notnull - where TKey : notnull => BatchIf(source, pauseIfTrueSelector, false, (IScheduler?)null); - - /// + /// + /// Provides an overload of BatchIf for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The pauseIfTrueSelector value. + /// The scheduler value. + /// The resulting observable sequence. /// This overload delegates to the primary overload with initialPauseState: false. public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull => BatchIf(source, pauseIfTrueSelector, false, scheduler); - /// + /// + /// Provides an overload of Run for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The pauseIfTrueSelector value. + /// The initialPauseState value. + /// The scheduler value. + /// The resulting observable sequence. /// This overload delegates to the primary overload with default initialPauseState: false. public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull => new BatchIf(source, pauseIfTrueSelector, null, initialPauseState, scheduler: scheduler).Run(); - /// + /// + /// Provides an overload of BatchIf for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The pauseIfTrueSelector value. + /// The timeOut value. + /// The scheduler value. + /// The resulting observable sequence. /// This overload omits initialPauseState (defaults to ) but accepts a timeout. public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector, TimeSpan? timeOut, IScheduler? scheduler = null) where TObject : notnull @@ -55,8 +73,8 @@ public static IObservable> BatchIf(this /// /// The type of the object. /// The type of the key. - /// The source to conditionally buffer. - /// An that when , buffering begins. When , the buffer is flushed. + /// The source IObservable<IChangeSet<TObject, TKey>> to conditionally buffer. + /// An IObservable<bool> that when , buffering begins. When , the buffer is flushed. /// If , starts in a paused (buffering) state. /// A that maximum time the buffer stays open. When elapsed, the buffer is flushed regardless of pause state. /// The for timeout timing. @@ -78,24 +96,29 @@ public static IObservable> BatchIf(this /// Worth noting: If the source completes while paused, buffered data IS flushed before OnCompleted. However, if the source errors while paused, buffered data is lost. /// /// or is . - /// - /// - public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState, TimeSpan? timeOut, IScheduler? scheduler = null) + /// Batch<TObject, TKey> + /// BufferInitial<TObject, TKey> + public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState = false, TimeSpan? timeOut = null, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pauseIfTrueSelector.ThrowArgumentNullExceptionIfNull(nameof(pauseIfTrueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pauseIfTrueSelector); return new BatchIf(source, pauseIfTrueSelector, timeOut, initialPauseState, scheduler: scheduler).Run(); } - /// - /// The source to conditionally buffer. - /// An that controls buffering: begins buffering, flushes the buffer. + /// + /// Provides an overload of Run for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to conditionally buffer. + /// An IObservable<bool> that controls buffering: begins buffering, flushes the buffer. /// If , starts in a paused (buffering) state. - /// An optional timer. The buffer is flushed each time the timer produces a value, and buffering ceases when it completes. + /// An optional IObservable<Unit> timer. The buffer is flushed each time the timer produces a value, and buffering ceases when it completes. /// An optional for scheduling work. + /// The resulting observable sequence. /// This overload accepts an explicit timer observable instead of a timeout. public static IObservable> BatchIf(this IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState, IObservable? timer, IScheduler? scheduler = null) where TObject : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.Bind.cs b/src/DynamicData/Cache/ObservableCacheEx.Bind.cs index ec591efa2..06bc2f86b 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Bind.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Bind.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,17 +28,17 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The that will receive the changes. + /// The source IObservable<IChangeSet<TObject, TKey>> to bind to a collection. + /// The IObservableCollection<TObject> that will receive the changes. /// The number of changes before a reset notification is triggered. /// An observable which will emit change sets. - /// source. - /// + /// source. + /// ObservableListEx.Bind public static IObservable> Bind(this IObservable> source, IObservableCollection destination, int refreshThreshold = BindingOptions.DefaultResetThreshold) where TObject : notnull where TKey : notnull { - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(destination); // if user has not specified different defaults, use system wide defaults instead. // This is a hack to retro fit system wide defaults which override the hard coded defaults above @@ -58,16 +56,16 @@ public static IObservable> Bind(this IO /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The that will receive the changes. + /// The source IObservable<IChangeSet<TObject, TKey>> to bind to a collection. + /// The IObservableCollection<TObject> that will receive the changes. /// The that controls binding behavior. /// An observable which will emit change sets. - /// source. + /// source. public static IObservable> Bind(this IObservable> source, IObservableCollection destination, BindingOptions options) where TObject : notnull where TKey : notnull { - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(destination); return source?.Bind(destination, new ObservableCollectionAdaptor(options)) ?? throw new ArgumentNullException(nameof(source)); } @@ -77,18 +75,18 @@ public static IObservable> Bind(this IO /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The that will receive the changes. - /// The that applies changes to the bound collection. + /// The source IObservable<IChangeSet<TObject, TKey>> to bind to a collection. + /// The IObservableCollection<TObject> that will receive the changes. + /// The IObservableCollectionAdaptor<TObject, TKey> that applies changes to the bound collection. /// An observable which will emit change sets. /// source. public static IObservable> Bind(this IObservable> source, IObservableCollection destination, IObservableCollectionAdaptor updater) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); - updater.ThrowArgumentNullExceptionIfNull(nameof(updater)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); + ArgumentExceptionHelper.ThrowIfNull(updater); return Observable.Create>( observer => @@ -105,16 +103,16 @@ public static IObservable> Bind(this IO /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The output that will be populated with the results. + /// The source IObservable<IChangeSet<TObject, TKey>> to bind to a collection. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the results. /// The that controls binding behavior. /// An observable which will emit change sets. - /// source. + /// source. public static IObservable> Bind(this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, BindingOptions options) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); var target = new ObservableCollectionExtended(); readOnlyObservableCollection = new ReadOnlyObservableCollection(target); @@ -126,18 +124,18 @@ public static IObservable> Bind(this IO /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The output that will be populated with the results. + /// The source IObservable<IChangeSet<TObject, TKey>> to bind to a collection. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the results. /// The number of changes before a reset notification is triggered. /// When , uses Replace instead of Remove/Add for updates in the bound collection. Not all platforms support replace notifications. - /// An optional that controls how the target collection is updated. + /// An optional IObservableCollectionAdaptor<TObject, TKey> that controls how the target collection is updated. /// An observable which will emit change sets. - /// source. + /// source. public static IObservable> Bind(this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = BindingOptions.DefaultResetThreshold, bool useReplaceForUpdates = BindingOptions.DefaultUseReplaceForUpdates, IObservableCollectionAdaptor? adaptor = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (adaptor is not null) { @@ -162,16 +160,16 @@ public static IObservable> Bind(this IO /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The that will receive the changes. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to bind to a collection. + /// The IObservableCollection<TObject> that will receive the changes. /// An observable which will emit change sets. /// source. public static IObservable> Bind(this IObservable> source, IObservableCollection destination) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); return source.Bind(destination, DynamicDataOptions.Binding); } @@ -181,17 +179,17 @@ public static IObservable> Bind(t /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The that will receive the changes. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to bind to a collection. + /// The IObservableCollection<TObject> that will receive the changes. /// The that controls binding behavior. /// An observable which will emit change sets. - /// source. + /// source. public static IObservable> Bind(this IObservable> source, IObservableCollection destination, BindingOptions options) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); var updater = new SortedObservableCollectionAdaptor(options); return source.Bind(destination, updater); @@ -202,18 +200,18 @@ public static IObservable> Bind(t /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The that will receive the changes. - /// The that applies changes to the bound collection. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to bind to a collection. + /// The IObservableCollection<TObject> that will receive the changes. + /// The ISortedObservableCollectionAdaptor<TObject, TKey> that applies changes to the bound collection. /// An observable which will emit change sets. /// source. public static IObservable> Bind(this IObservable> source, IObservableCollection destination, ISortedObservableCollectionAdaptor updater) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); - updater.ThrowArgumentNullExceptionIfNull(nameof(updater)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); + ArgumentExceptionHelper.ThrowIfNull(updater); return Observable.Create>( observer => @@ -230,16 +228,16 @@ public static IObservable> Bind(t /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The output that will be populated with the results. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to bind to a collection. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the results. /// The that controls binding behavior. /// An observable which will emit change sets. - /// source. + /// source. public static IObservable> Bind(this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, BindingOptions options) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); var target = new ObservableCollectionExtended(); var result = new ReadOnlyObservableCollection(target); @@ -253,18 +251,18 @@ public static IObservable> Bind(this IO /// /// The type of the object. /// The type of the key. - /// The source to bind to a collection. - /// The output that will be populated with the results. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to bind to a collection. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the results. /// The number of changes before a reset event is called on the observable collection. /// When , uses Replace instead of Remove/Add for updates in the bound collection. Not all platforms support replace notifications. - /// An that specify an adaptor to change the algorithm to update the target collection. + /// An IChangeSetAdaptor<TObject, TKey> that specify an adaptor to change the algorithm to update the target collection. /// An observable which will emit change sets. - /// source. + /// source. public static IObservable> Bind(this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = BindingOptions.DefaultResetThreshold, bool useReplaceForUpdates = BindingOptions.DefaultUseReplaceForUpdates, ISortedObservableCollectionAdaptor? adaptor = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); // if user has not specified different defaults, use system wide defaults instead. // This is a hack to retro fit system wide defaults which override the hard coded defaults above @@ -279,15 +277,15 @@ public static IObservable> Bind(this IO readOnlyObservableCollection = new ReadOnlyObservableCollection(target); return source.Bind(target, adaptor); } - #if SUPPORTS_BINDINGLIST + /// /// Binds a clone of the observable change set to the target observable collection. /// /// The object type. /// The key type. - /// The source to bind to a collection. - /// The that will receive the changes. + /// The source IObservable<IChangeSet<TObject, TKey>> to bind to a collection. + /// The BindingList<TObject> that will receive the changes. /// The reset threshold. /// An observable which will emit change sets. /// @@ -299,8 +297,8 @@ public static IObservable> Bind(this IO where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - bindingList.ThrowArgumentNullExceptionIfNull(nameof(bindingList)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(bindingList); return source.Adapt(new BindingListAdaptor(bindingList, resetThreshold)); } @@ -310,8 +308,8 @@ public static IObservable> Bind(this IO /// /// The object type. /// The key type. - /// The source to bind to a collection. - /// The that will receive the changes. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to bind to a collection. + /// The BindingList<TObject> that will receive the changes. /// The reset threshold. /// An observable which will emit change sets. /// @@ -323,8 +321,8 @@ public static IObservable> Bind(this IO where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - bindingList.ThrowArgumentNullExceptionIfNull(nameof(bindingList)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(bindingList); return source.Adapt(new SortedBindingListAdaptor(bindingList, resetThreshold)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.BufferInitial.cs b/src/DynamicData/Cache/ObservableCacheEx.BufferInitial.cs index c8d709c85..7db16f95d 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.BufferInitial.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.BufferInitial.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,7 +22,7 @@ public static partial class ObservableCacheEx /// /// The object type. /// The type of the key. - /// The source to buffer during the initial loading period. + /// The source IObservable<IChangeSet<TObject, TKey>> to buffer during the initial loading period. /// The time window to buffer, measured from when the first changeset arrives. /// The scheduler for timing. Defaults to . /// An observable that emits one merged changeset for the initial burst, then passthrough for the rest. @@ -40,10 +31,10 @@ public static partial class ObservableCacheEx /// Useful for aggregating the initial snapshot (which may arrive as many small changesets) into a /// single changeset for efficient downstream processing, while leaving subsequent live updates untouched. /// - /// Internally uses , Rx Buffer, and . + /// Internally uses DeferUntilLoaded<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>), Rx Buffer, and FlattenBufferResult<TObject, TKey>. /// - /// - /// + /// Batch<TObject, TKey> + /// DeferUntilLoaded<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable> BufferInitial(this IObservable> source, TimeSpan initialBuffer, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull => source.DeferUntilLoaded().Publish( diff --git a/src/DynamicData/Cache/ObservableCacheEx.Cast.cs b/src/DynamicData/Cache/ObservableCacheEx.Cast.cs index 90aa68b00..3d6214ed9 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Cast.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Cast.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,14 +25,14 @@ public static partial class ObservableCacheEx { /// /// Casts each item in the changeset to a new type using the provided converter function. - /// Equivalent to + /// Equivalent to Transform<TDestination, TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TDestination>, bool) /// but named for discoverability when a simple type cast or conversion is needed. /// /// The type of the source object. /// The type of the key. /// The type of the destination object. - /// The source to cast. - /// The conversion function applied to each item. + /// The source IObservable<IChangeSet<TSource, TKey>> to cast. + /// The Func<TSource, TDestination> conversion function applied to each item. /// An observable changeset of converted items. /// /// @@ -45,13 +43,13 @@ public static partial class ObservableCacheEx /// RefreshForwarded as Refresh. The converter is not called. /// /// - /// + /// OfType<TObject, TKey, TDestination> public static IObservable> Cast(this IObservable> source, Func converter) where TSource : notnull where TKey : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new Cast(source, converter).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ChangeKey.cs b/src/DynamicData/Cache/ObservableCacheEx.ChangeKey.cs index 53dc96e5d..19f1792db 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ChangeKey.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ChangeKey.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,8 +23,8 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the source key. /// The type of the destination key. - /// The source to re-key. - /// The that computes the destination key from the item, e.g. (item) => item.NewId. + /// The source IObservable<IChangeSet<TObject, TSourceKey>> to re-key. + /// The Func<TObject, TDestinationKey> that computes the destination key from the item, e.g. (item) => item.NewId. /// An observable changeset with items re-keyed using . /// /// @@ -44,14 +35,14 @@ public static partial class ObservableCacheEx /// Refresh is called on the item. A Refresh is emitted with the destination key. /// /// - /// + /// Transform<TDestination, TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TDestination>, bool) public static IObservable> ChangeKey(this IObservable> source, Func keySelector) where TObject : notnull where TSourceKey : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return source.Select( updates => @@ -61,7 +52,15 @@ public static IObservable> ChangeKey + /// + /// Provides an overload of ChangeKey for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TSourceKey value. + /// The type of the TDestinationKey value. + /// The source value. + /// The keySelector value. + /// The resulting observable sequence. /// /// This overload also provides the source key to , /// allowing the destination key to be derived from both the item and its original key. @@ -71,8 +70,8 @@ public static IObservable> ChangeKey diff --git a/src/DynamicData/Cache/ObservableCacheEx.Clear.cs b/src/DynamicData/Cache/ObservableCacheEx.Clear.cs index d29301dc8..4751870ab 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Clear.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Clear.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,7 +28,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The to clear. + /// The ISourceCache<TObject, TKey> to clear. /// /// /// EventBehavior @@ -45,27 +43,37 @@ public static void Clear(this ISourceCache source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Clear()); } - /// + /// + /// Provides an overload of Clear for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. public static void Clear(this IIntermediateCache source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Clear()); } - /// + /// + /// Provides an overload of Clear for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. public static void Clear(this LockFreeObservableCache source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Clear()); } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Clone.cs b/src/DynamicData/Cache/ObservableCacheEx.Clone.cs index 1f635fc58..f775c4bbb 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Clone.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Clone.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,8 +22,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to clone. - /// The target collection to which changes are applied. + /// The source IObservable<IChangeSet<TObject, TKey>> to clone. + /// The ICollection<TObject> target collection to which changes are applied. /// An observable that forwards all changesets from unchanged. /// /// @@ -40,15 +31,15 @@ public static partial class ObservableCacheEx /// AddThe item is added to . Forwarded as Add. /// UpdateThe previous item is removed from and the current item is added. Forwarded as Update. /// RemoveThe item is removed from . Forwarded as Remove. - /// RefreshIgnored ( has no concept of refresh). Forwarded as Refresh. + /// RefreshIgnored (ICollection<T> has no concept of refresh). Forwarded as Refresh. /// /// public static IObservable> Clone(this IObservable> source, ICollection target) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - target.ThrowArgumentNullExceptionIfNull(nameof(target)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(target); return source.Do( changes => diff --git a/src/DynamicData/Cache/ObservableCacheEx.Combine.cs b/src/DynamicData/Cache/ObservableCacheEx.Combine.cs index eb46b86b3..733ad710c 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Combine.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Combine.cs @@ -1,35 +1,41 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { + /// + /// Executes the Combine operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this IObservableList> source, CombineOperator type) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>( observer => @@ -40,11 +46,19 @@ private static IObservable> Combine(thi }); } + /// + /// Executes the Combine operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this IObservableList> source, CombineOperator type) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>( observer => @@ -55,20 +69,36 @@ private static IObservable> Combine(thi }); } + /// + /// Executes the Combine operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this IObservableList>> source, CombineOperator type) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DynamicCombiner(source, type).Run(); } + /// + /// Executes the Combine operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The sources value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this ICollection>> sources, CombineOperator type) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return Observable.Create>( observer => @@ -101,11 +131,20 @@ void UpdateAction(IChangeSet updates) }); } + /// + /// Executes the Combine operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The type value. + /// The combineTarget value. + /// The result of the operation. private static IObservable> Combine(this IObservable> source, CombineOperator type, params IObservable>[] combineTarget) where TObject : notnull where TKey : notnull { - combineTarget.ThrowArgumentNullExceptionIfNull(nameof(combineTarget)); + ArgumentExceptionHelper.ThrowIfNull(combineTarget); return Observable.Create>( observer => diff --git a/src/DynamicData/Cache/ObservableCacheEx.Convert.cs b/src/DynamicData/Cache/ObservableCacheEx.Convert.cs index bf6d26c18..7ddb8e0b4 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Convert.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Convert.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,13 +17,13 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Obsolete: use instead. + /// Obsolete: use Transform<TDestination, TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TDestination>, bool) instead. /// /// The type of the object. /// The type of the key. /// The type of the destination. - /// The source to convert. - /// The conversion factory. + /// The source IObservable<IChangeSet<TObject, TKey>> to convert. + /// The Func<TObject, TDestination> conversion factory. /// An observable which emits change sets. [Obsolete("This was an experiment that did not work. Use Transform instead")] public static IObservable> Convert(this IObservable> source, Func conversionFactory) @@ -40,8 +31,8 @@ public static IObservable> Convert diff --git a/src/DynamicData/Cache/ObservableCacheEx.CreateChangeSetTransformer.cs b/src/DynamicData/Cache/ObservableCacheEx.CreateChangeSetTransformer.cs index 47d11d3ca..5611ef3a1 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.CreateChangeSetTransformer.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.CreateChangeSetTransformer.cs @@ -2,35 +2,54 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { + /// + /// Executes the CreateChangeSetTransformer operation. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The manySelector value. + /// The keySelector value. + /// The result of the operation. private static Func>>> CreateChangeSetTransformer(Func>> manySelector, Func keySelector) where TDestination : notnull where TDestinationKey : notnull where TSource : notnull where TSourceKey : notnull => async (val, key) => (await manySelector(val, key).ConfigureAwait(false)).AsObservableChangeSet(keySelector); + /// + /// Executes the CreateChangeSetTransformer operation. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The type of the TCollection value. + /// The manySelector value. + /// The keySelector value. + /// The result of the operation. private static Func>>> CreateChangeSetTransformer(Func> manySelector, Func keySelector) where TDestination : notnull where TDestinationKey : notnull @@ -38,6 +57,15 @@ private static Func => async (val, key) => (await manySelector(val, key).ConfigureAwait(false)).ToObservableChangeSet().AddKey(keySelector); + /// + /// Executes the CreateChangeSetTransformer operation. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The manySelector value. + /// The result of the operation. private static Func>>> CreateChangeSetTransformer(Func>> manySelector) where TDestination : notnull where TDestinationKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.DeferUntilLoaded.cs b/src/DynamicData/Cache/ObservableCacheEx.DeferUntilLoaded.cs index 89cebf0da..5cff70429 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.DeferUntilLoaded.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.DeferUntilLoaded.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,27 +29,33 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to defer until the first changeset arrives. + /// The source IObservable<IChangeSet<TObject, TKey>> to defer until the first changeset arrives. /// An observable that begins emitting changesets once the first non-empty changeset is received. /// /// Worth noting: Blocks indefinitely if the cache or stream never receives any data. Ensure the source will eventually emit at least one changeset. /// - /// + /// SkipInitial<TObject, TKey> public static IObservable> DeferUntilLoaded(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DeferUntilLoaded(source).Run(); } - /// + /// + /// Provides an overload of DeferUntilLoaded for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The resulting observable sequence. public static IObservable> DeferUntilLoaded(this IObservableCache source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DeferUntilLoaded(source).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.DisposeMany.cs b/src/DynamicData/Cache/ObservableCacheEx.DisposeMany.cs index 52ad51274..7249b5589 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.DisposeMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.DisposeMany.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -37,7 +35,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to track for disposal on removal. + /// The source IObservable<IChangeSet<TObject, TKey>> to track for disposal on removal. /// A stream that forwards all changesets from unchanged. /// /// @@ -53,18 +51,18 @@ public static partial class ObservableCacheEx /// /// On stream completion, error, or subscription disposal, all remaining tracked items are disposed. /// All disposal is synchronous via . - /// For items that implement , use instead. + /// For items that implement , use AsyncDisposeMany<TObject,TKey> instead. /// /// /// is . - /// - /// - /// + /// AsyncDisposeMany<TObject,TKey> + /// SubscribeMany<TObject,TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IDisposable>) + /// ObservableListEx.DisposeMany public static IObservable> DisposeMany(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DisposeMany(source).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.DistinctValues.cs b/src/DynamicData/Cache/ObservableCacheEx.DistinctValues.cs index 6007f055c..4e17cf1b2 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.DistinctValues.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.DistinctValues.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,22 +29,22 @@ public static partial class ObservableCacheEx /// The type object from which the distinct values are selected. /// The type of the key. /// The type of the value. - /// The source to extract distinct values. - /// The value selector. + /// The source IObservable<IChangeSet<TObject, TKey>> to extract distinct values. + /// The Func<TObject, TValue> value selector. /// An observable which will emit distinct change sets. /// /// Due to it's nature only adds or removes can be returned. /// Worth noting: Reference counting assumes value equality is transitive. Mutable value objects with inconsistent Equals implementations can corrupt ref counts. /// /// source. - /// + /// ObservableListEx.DistinctValues public static IObservable> DistinctValues(this IObservable> source, Func valueSelector) where TObject : notnull where TKey : notnull where TValue : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return Observable.Create>(observer => new DistinctCalculator(source, valueSelector).Run().SubscribeSafe(observer)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.EditDiff.cs b/src/DynamicData/Cache/ObservableCacheEx.EditDiff.cs index 86a68c29a..066338838 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.EditDiff.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.EditDiff.cs @@ -1,45 +1,47 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The to diff and update. - /// The representing the complete desired state to diff against the cache. - /// An used to determine whether a new item is the same as an existing cached item. + /// + /// Provides an overload of EditDiff for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The ISourceCache<TObject, TKey> to diff and update. + /// The IEnumerable<TObject> representing the complete desired state to diff against the cache. + /// An IEqualityComparer<TObject> used to determine whether a new item is the same as an existing cached item. /// - /// This overload uses an instead of a delegate + /// This overload uses an IEqualityComparer<T> instead of a Func<T, T, TResult> delegate /// to determine item equality. /// public static void EditDiff(this ISourceCache source, IEnumerable allItems, IEqualityComparer equalityComparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - allItems.ThrowArgumentNullExceptionIfNull(nameof(allItems)); - equalityComparer.ThrowArgumentNullExceptionIfNull(nameof(equalityComparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(allItems); + ArgumentExceptionHelper.ThrowIfNull(equalityComparer); source.EditDiff(allItems, equalityComparer.Equals); } @@ -50,9 +52,9 @@ public static void EditDiff(this ISourceCache sour /// /// The type of the object. /// The type of the key. - /// The to diff and update. - /// The representing the complete desired state. - /// The that returns when the current and previous items are considered equal, e.g. (current, previous) => current.Version == previous.Version. + /// The ISourceCache<TObject, TKey> to diff and update. + /// The IEnumerable<TObject> representing the complete desired state. + /// The Func<TObject, TObject, bool> that returns when the current and previous items are considered equal, e.g. (current, previous) => current.Version == previous.Version. /// /// /// EventBehavior @@ -67,24 +69,24 @@ public static void EditDiff(this ISourceCache sour where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - allItems.ThrowArgumentNullExceptionIfNull(nameof(allItems)); - areItemsEqual.ThrowArgumentNullExceptionIfNull(nameof(areItemsEqual)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(allItems); + ArgumentExceptionHelper.ThrowIfNull(areItemsEqual); var editDiff = new EditDiff(source, areItemsEqual); editDiff.Edit(allItems); } /// - /// Converts an of into a changeset stream by diffing each + /// Converts an IObservable<T> of IEnumerable<T> into a changeset stream by diffing each /// emission against the previous one. Each emission replaces the entire dataset. - /// Counterpart to . + /// Counterpart to ToCollection<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>). /// /// The type of the object. /// The type of the key. - /// The source to convert into a keyed changeset stream. - /// The that extracts the unique key from each item. - /// An optional for comparing items. Uses default equality if . + /// The source IObservable<IEnumerable<TObject>> to convert into a keyed changeset stream. + /// The Func<TObject, TKey> that extracts the unique key from each item. + /// An optional IEqualityComparer<TObject> for comparing items. Uses default equality if . /// An observable changeset representing the incremental differences between successive snapshots. /// /// @@ -96,26 +98,26 @@ public static void EditDiff(this ISourceCache sour /// /// /// or is . - /// + /// ToCollection<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable> EditDiff(this IObservable> source, Func keySelector, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return new EditDiffChangeSet(source, keySelector, equalityComparer).Run(); } /// - /// Converts an of into a changeset stream that tracks + /// Converts an IObservable<T> of Optional<T> into a changeset stream that tracks /// a single item: Some produces an Add or Update, and None produces a Remove. /// /// The type of the object. /// The type of the key. - /// The source to convert into a keyed changeset stream. - /// The that extracts the unique key from each item. - /// An optional for comparing items. Uses default equality if . + /// The source IObservable<Optional<TObject>> to convert into a keyed changeset stream. + /// The Func<TObject, TKey> that extracts the unique key from each item. + /// An optional IEqualityComparer<TObject> for comparing items. Uses default equality if . /// An observable changeset tracking the single optional item. /// /// @@ -127,12 +129,12 @@ public static IObservable> EditDiff(thi /// /// /// or is . - public static IObservable> EditDiff(this IObservable> source, Func keySelector, IEqualityComparer? equalityComparer = null) + public static IObservable> EditDiff(this IObservable> source, Func keySelector, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return new EditDiffChangeSetOptional(source, keySelector, equalityComparer).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.EnsureUniqueKeys.cs b/src/DynamicData/Cache/ObservableCacheEx.EnsureUniqueKeys.cs index f3ec6e103..7e932a483 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.EnsureUniqueKeys.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.EnsureUniqueKeys.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,7 +29,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to validate for unique keys. + /// The source IObservable<IChangeSet<TObject, TKey>> to validate for unique keys. /// A changeset stream guaranteed to contain unique keys per changeset. /// /// @@ -47,7 +45,7 @@ public static IObservable> EnsureUniqueKeys(source).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Except.cs b/src/DynamicData/Cache/ObservableCacheEx.Except.cs index 19699c8d2..06bf43ddf 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Except.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Except.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,20 +29,20 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to combine. - /// The additional streams to combine with. + /// The source IObservable<IChangeSet<TObject, TKey>> to combine. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to combine with. /// An observable which emits change sets. /// /// source /// or /// others. /// - /// + /// ObservableListEx.Except public static IObservable> Except(this IObservable> source, params IObservable>[] others) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (others is null || others.Length == 0) { @@ -60,7 +58,7 @@ public static IObservable> Except(this /// /// The type of the object. /// The type of the key. - /// The of streams to combine. + /// The ICollection<T> of streams to combine. /// An observable which emits change sets. /// /// source @@ -71,7 +69,7 @@ public static IObservable> Except(this where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Except); } @@ -82,13 +80,13 @@ public static IObservable> Except(this /// /// The type of the object. /// The type of the key. - /// The of streams to combine. + /// The IObservableList<T> of streams to combine. /// An observable which emits change sets. public static IObservable> Except(this IObservableList>> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Except); } @@ -99,13 +97,13 @@ public static IObservable> Except(this /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<IObservableCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits change sets. public static IObservable> Except(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Except); } @@ -116,13 +114,13 @@ public static IObservable> Except(this /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<ISourceCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits change sets. public static IObservable> Except(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Except); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ExpireAfter.cs b/src/DynamicData/Cache/ObservableCacheEx.ExpireAfter.cs index 168d8903e..304930368 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ExpireAfter.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ExpireAfter.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,8 +22,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to apply time-based expiration to. - /// An optional that returns the expiration timeout for each item, or for no expiration. + /// The source IObservable<IChangeSet<TObject, TKey>> to apply time-based expiration to. + /// An optional Func<T, TResult> that returns the expiration timeout for each item, or for no expiration. /// An observable changeset that includes timer-driven Remove changes for expired items. /// /// When a timer fires, a Remove is emitted for the expired item. @@ -57,10 +48,15 @@ public static IObservable> ExpireAfter( source: source, timeSelector: timeSelector); - /// - /// The source to apply time-based expiration to. - /// An optional that returns the expiration timeout for each item, or for no expiration. + /// + /// Provides an overload of ExpireAfter for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to apply time-based expiration to. + /// An optional Func<T, TResult> that returns the expiration timeout for each item, or for no expiration. /// The used to schedule expiration timers. + /// The resulting observable sequence. public static IObservable> ExpireAfter( this IObservable> source, Func timeSelector, @@ -72,10 +68,15 @@ public static IObservable> ExpireAfter( timeSelector: timeSelector, scheduler: scheduler); - /// - /// The source to apply time-based expiration to. - /// An optional that returns the expiration timeout for each item, or for no expiration. + /// + /// Provides an overload of ExpireAfter for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to apply time-based expiration to. + /// An optional Func<T, TResult> that returns the expiration timeout for each item, or for no expiration. /// An optional polling interval. If specified, items are expired on a polling interval rather than per-item timers. Less accurate but more efficient when many items share similar expiration times. + /// The resulting observable sequence. /// /// This overload uses periodic polling instead of per-item timers. Expired items are removed on the next /// poll after their timeout elapses, which trades accuracy for reduced timer overhead. @@ -91,11 +92,16 @@ public static IObservable> ExpireAfter( timeSelector: timeSelector, pollingInterval: pollingInterval); - /// - /// The source to apply time-based expiration to. - /// An optional that returns the expiration timeout for each item, or for no expiration. + /// + /// Provides an overload of ExpireAfter for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to apply time-based expiration to. + /// An optional Func<T, TResult> that returns the expiration timeout for each item, or for no expiration. /// An optional if specified, items are expired on a polling interval rather than per-item timers. /// The used to schedule polling and expiration timers. + /// The resulting observable sequence. public static IObservable> ExpireAfter( this IObservable> source, Func timeSelector, @@ -110,19 +116,19 @@ public static IObservable> ExpireAfter( scheduler: scheduler); /// - /// Automatically removes items from the after the timeout returned + /// Automatically removes items from the ISourceCache<TObject, TKey> after the timeout returned /// by . Returns an observable of the removed key-value pairs (not a changeset stream). /// /// The type of the object. /// The type of the key. - /// The to operate on. - /// An optional that returns the expiration timeout for each item, or for no expiration. + /// The ISourceCache<TObject, TKey> to operate on. + /// An optional Func<T, TResult> that returns the expiration timeout for each item, or for no expiration. /// An optional if specified, items are expired on a polling interval rather than per-item timers. /// The scheduler used to schedule expiration timers. Defaults to if . /// An observable that emits the key-value pairs of items removed from the cache by expiration. /// - /// Unlike the stream-based overloads, this operates directly on the - /// and returns the removed items as collections, + /// Unlike the stream-based overloads, this operates directly on the ISourceCache<TObject, TKey> + /// and returns the removed items as KeyValuePair<TKey, TObject> collections, /// not as a changeset stream. /// /// or is . diff --git a/src/DynamicData/Cache/ObservableCacheEx.Filter.cs b/src/DynamicData/Cache/ObservableCacheEx.Filter.cs index 7b43d0173..595b802a4 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Filter.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Filter.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,8 +22,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to filter. - /// The predicate used to determine whether each item is included. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter. + /// The Func<TObject, bool> predicate used to determine whether each item is included. /// When (default), empty changesets are suppressed for performance. Set to to emit empty changesets, which can be useful for monitoring loading status. /// An observable changeset containing only items that satisfy . /// @@ -43,11 +34,11 @@ public static partial class ObservableCacheEx /// RemoveIf the item was included downstream, a Remove is emitted. Otherwise dropped. /// RefreshThe predicate is re-evaluated. If the item now passes but previously did not, an Add is emitted. If it still passes, a Refresh is forwarded. If it no longer passes, a Remove is emitted. If it still fails, the change is dropped. /// - /// Worth noting: Refresh events trigger re-evaluation, which can promote or demote items. Pair with for property-change-driven filtering. + /// Worth noting: Refresh events trigger re-evaluation, which can promote or demote items. Pair with AutoRefresh<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TimeSpan?, TimeSpan?, IScheduler?) for property-change-driven filtering. /// - /// - /// - /// + /// FilterImmutable<TObject, TKey> + /// FilterOnObservable<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<bool>>, TimeSpan?, IScheduler?) + /// ObservableListEx.Filter public static IObservable> Filter( this IObservable> source, Func filter, @@ -59,10 +50,18 @@ public static IObservable> Filter( filter: filter, suppressEmptyChangeSets: suppressEmptyChangeSets); - /// + /// + /// Provides an overload of Filter for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The predicateChanged value. + /// The suppressEmptyChangeSets value. + /// The resulting observable sequence. /// /// This overload does not accept a reapplyFilter signal. It is equivalent to calling the - /// full dynamic overload with as the reapply observable. + /// full dynamic overload with Observable.Empty<TResult>() as the reapply observable. /// public static IObservable> Filter( this IObservable> source, @@ -82,9 +81,9 @@ public static IObservable> Filter( /// The type of the object. /// The type of the key. /// The type of state value required by . - /// The source to filter. - /// The stream of state values to be passed to . - /// The predicate that receives the current state and an item, returning to include or to exclude. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter. + /// The IObservable<TState> stream of state values to be passed to . + /// The Func<TState, TObject, bool> predicate that receives the current state and an item, returning to include or to exclude. /// When (default), empty changesets are suppressed for performance. Set to to emit empty changesets. /// An observable changeset containing only items satisfying for the latest state. /// , , or is . @@ -97,7 +96,7 @@ public static IObservable> Filter( /// /// EventBehavior /// AddEvaluated against the current state. If it passes, an Add is emitted. Otherwise dropped. - /// UpdateRe-evaluated. Four outcomes as with the static overload. + /// UpdateRe-evaluated. Four outcomes as with the static Filter<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, bool>, bool) overload. /// RemoveIf the item was included downstream, a Remove is emitted. Otherwise dropped. /// RefreshRe-evaluated against the current state. May produce Add, Refresh, Remove, or be dropped. /// @@ -117,13 +116,18 @@ public static IObservable> Filter(), suppressEmptyChangeSets: suppressEmptyChangeSets); - /// - /// The source to filter. - /// The that emits new predicates. Each emission replaces the current predicate and triggers a full re-evaluation of all items. - /// The that, when it emits, triggers a full re-evaluation of all items against the current predicate. Useful when filtering on mutable item properties. + /// + /// Provides an overload of Filter for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter. + /// The IObservable<Func<TObject, bool>> that emits new predicates. Each emission replaces the current predicate and triggers a full re-evaluation of all items. + /// The IObservable<Unit> that, when it emits, triggers a full re-evaluation of all items against the current predicate. Useful when filtering on mutable item properties. /// When (default), empty changesets are suppressed for performance. + /// The resulting observable sequence. /// - /// In addition to the per-item behavior described in the static overload, + /// In addition to the per-item behavior described in the static Filter<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, bool>, bool) overload, /// emissions from replace the predicate and trigger full re-filtering, /// while emissions from re-evaluate all items against the current predicate. /// Worth noting: No items are included until the predicate observable emits its first value. diff --git a/src/DynamicData/Cache/ObservableCacheEx.FilterImmutable.cs b/src/DynamicData/Cache/ObservableCacheEx.FilterImmutable.cs index 3c4d432a7..393ce24b8 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.FilterImmutable.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.FilterImmutable.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,14 +28,14 @@ public static partial class ObservableCacheEx /// /// The type of collection items to be filtered. /// The type of the key values of each collection item. - /// The source to filter (items assumed immutable). - /// The filtering predicate to be applied to each item. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter (items assumed immutable). + /// The Func<TObject, bool> filtering predicate to be applied to each item. /// A flag indicating whether the created stream should emit empty changesets. Empty changesets are suppressed by default, for performance. Set to ensure that a downstream changeset occurs for every upstream changeset. /// A stream of collection changesets where upstream collection items are filtered by the given predicate. /// /// The goal of this operator is to optimize a common use-case of reactive programming, where data values flowing through a stream are immutable, and state changes are distributed by publishing new immutable items as replacements, instead of mutating the items directly. /// In addition to assuming that all collection items are immutable, this operator also assumes that the given filter predicate is deterministic, such that the result it returns will always be the same each time a specific input is passed to it. In other words, the predicate itself also contains no mutable state. - /// Under these assumptions, this operator can bypass the need to keep track of every collection item that passes through it, which the normal operator must do, in order to re-evaluate the filtering status of items, during a refresh operation. + /// Under these assumptions, this operator can bypass the need to keep track of every collection item that passes through it, which the normal Filter<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, bool>, bool) operator must do, in order to re-evaluate the filtering status of items, during a refresh operation. /// Consider using this operator when the following are true: /// /// Your collection items are immutable, and changes are published by replacing entire items @@ -60,8 +58,8 @@ public static IObservable> FilterImmutable( predicate: predicate, diff --git a/src/DynamicData/Cache/ObservableCacheEx.FilterOnObservable.cs b/src/DynamicData/Cache/ObservableCacheEx.FilterOnObservable.cs index 82733f25a..3623da521 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.FilterOnObservable.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.FilterOnObservable.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,13 +24,13 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Filters items using a per-item that controls inclusion. + /// Filters items using a per-item IObservable<Boolean> that controls inclusion. /// Each item's observable is created by and toggles the item in or out of the downstream stream. /// /// The type of the object. /// The type of the key. - /// The source to filter using per-item observables. - /// A factory that creates an for each item and its key. When the observable emits , the item is included; when , it is excluded. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter using per-item observables. + /// A factory that creates an IObservable<Boolean> for each item and its key. When the observable emits , the item is included; when , it is excluded. /// A that optional time window to buffer inclusion changes from per-item observables before re-evaluating. /// An that optional scheduler used for buffering. /// An observable changeset containing only items whose per-item observable most recently emitted . @@ -67,19 +65,28 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// + /// Filter<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, bool>, bool) + /// ObservableListEx.FilterOnObservable public static IObservable> FilterOnObservable(this IObservable> source, Func> filterFactory, TimeSpan? buffer = null, IScheduler? scheduler = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - filterFactory.ThrowArgumentNullExceptionIfNull(nameof(filterFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(filterFactory); return new FilterOnObservable(source, filterFactory, buffer, scheduler).Run(); } - /// + /// + /// Provides an overload of FilterOnObservable for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The filterFactory value. + /// The buffer value. + /// The scheduler value. + /// The resulting observable sequence. /// /// This overload does not provide the key to ; only the item is passed. /// @@ -87,8 +94,8 @@ public static IObservable> FilterOnObservable filterFactory(obj), buffer, scheduler); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.FinallySafe.cs b/src/DynamicData/Cache/ObservableCacheEx.FinallySafe.cs index b50111d6b..0652cfd33 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.FinallySafe.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.FinallySafe.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -29,14 +27,14 @@ public static partial class ObservableCacheEx /// Obsolete: do not use. This can cause unhandled exception issues. Use the standard Rx Finally operator instead. /// /// The type contained within the observables. - /// The source to attach a finally action to. + /// The source IObservable<T> to attach a finally action to. /// The to invoke when the subscription terminates. /// An observable which has always a finally action applied. [Obsolete("This can cause unhandled exception issues so do not use")] public static IObservable FinallySafe(this IObservable source, Action finallyAction) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - finallyAction.ThrowArgumentNullExceptionIfNull(nameof(finallyAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(finallyAction); return new FinallySafe(source, finallyAction).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Flatten.cs b/src/DynamicData/Cache/ObservableCacheEx.Flatten.cs index 23052c9e5..949b81a7f 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Flatten.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Flatten.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,20 +17,20 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Unwraps each into individual - /// values via . + /// Unwraps each IChangeSet<TObject, TKey> into individual Change<TObject, TKey> + /// values via Observable.SelectMany<TSource, TResult>(IObservable<TSource>, Func<TSource, IEnumerable<TResult>>). /// /// The type of the object. /// The type of the key. - /// The source to flatten into individual changes. - /// An observable of individual values. + /// The source IObservable<IChangeSet<TObject, TKey>> to flatten into individual changes. + /// An observable of individual Change<TObject, TKey> values. /// is . - /// + /// ForEachChange<TObject, TKey> public static IObservable> Flatten(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.SelectMany(changes => changes); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.FlattenBufferResult.cs b/src/DynamicData/Cache/ObservableCacheEx.FlattenBufferResult.cs index 357b859ac..9741b27a6 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.FlattenBufferResult.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.FlattenBufferResult.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,14 +22,14 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to flatten. + /// The source IObservable<T> to flatten. /// An observable changeset combining all changes from each buffer into a single emission. /// is . public static IObservable> FlattenBufferResult(this IObservable>> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Where(x => x.Count != 0).Select(updates => new ChangeSet(updates.SelectMany(u => u))); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ForEachChange.cs b/src/DynamicData/Cache/ObservableCacheEx.ForEachChange.cs index fb23c04b6..2c3d15ee5 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ForEachChange.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ForEachChange.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,21 +17,21 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Invokes for every individual in each changeset, + /// Invokes for every individual Change<TObject,TKey> in each changeset, /// regardless of change reason. The changeset is forwarded downstream unchanged. /// /// The type of the object. /// The type of the key. - /// The source to observe each individual change in. - /// The action to invoke for each change. Receives the full struct, including , , , and . + /// The source IObservable<IChangeSet<TObject, TKey>> to observe each individual change in. + /// The action to invoke for each change. Receives the full Change<TObject,TKey> struct, including Change<TObject,TKey>.Reason, Change<TObject,TKey>.Key, Change<TObject,TKey>.Current, and Change<TObject,TKey>.Previous. /// A stream that forwards all changesets from unchanged. /// /// /// All change reasons (Add, Update, Remove, Refresh) trigger the callback. - /// Use , - /// , - /// , or - /// + /// Use OnItemAdded<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TKey>), + /// OnItemUpdated<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TObject,TKey>), + /// OnItemRemoved<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TKey>, bool), or + /// OnItemRefreshed<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TKey>) /// to target a specific reason. /// /// @@ -49,13 +40,13 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// + /// ObservableListEx.ForEachChange public static IObservable> ForEachChange(this IObservable> source, Action> action) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(action); return source.Do(changes => changes.ForEach(action)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ForForced.cs b/src/DynamicData/Cache/ObservableCacheEx.ForForced.cs index 02103498f..ee97660f1 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ForForced.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ForForced.cs @@ -2,29 +2,27 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { + /// + /// Executes the ForForced operation. + /// + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The result of the operation. private static IObservable>? ForForced(this IObservable? source) where TKey : notnull => source?.Select( _ => @@ -33,6 +31,13 @@ public static partial class ObservableCacheEx return (Func)Transformer; }); + /// + /// Executes the ForForced operation. + /// + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The result of the operation. private static IObservable>? ForForced(this IObservable>? source) where TKey : notnull => source?.Select( condition => diff --git a/src/DynamicData/Cache/ObservableCacheEx.FullJoin.cs b/src/DynamicData/Cache/ObservableCacheEx.FullJoin.cs index 9328527e2..1904f4641 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.FullJoin.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.FullJoin.cs @@ -1,54 +1,60 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the optional left and right values into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . - public static IObservable> FullJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, Optional, TDestination> resultSelector) + /// + /// Provides an overload of FullJoin for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the optional left and right values into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to FullJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, Optional<TRight>, TDestination>). + public static IObservable> FullJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return left.FullJoin(right, rightKeySelector, (_, leftValue, rightValue) => resultSelector(leftValue, rightValue)); } /// /// Joins two changeset streams, producing a result for every key that appears on either side (or both). - /// Both sides are because a given key may only exist on one side at any point. + /// Both sides are Optional<T> because a given key may only exist on one side at any point. /// Equivalent to SQL FULL OUTER JOIN. /// /// The item type of the left source. @@ -56,19 +62,19 @@ public static IObservable> FullJoinThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the key, optional left, and optional right into a destination object. Example: (key, left, right) => new Result(key, left, right). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the key, optional left, and optional right into a destination object. Example: (key, left, right) => new Result(key, left, right). /// An observable changeset keyed by . /// /// /// Left-side change handling: /// /// EventBehavior - /// AddEmits with the left value and the matching right (or if no right exists). + /// AddEmits with the left value and the matching right (or ReactiveUI.Primitives.Optional.None<T> if no right exists). /// UpdateRe-invokes with the new left value and current right (if any). - /// RemoveIf a right match still exists, re-invokes the selector with left as . If neither side remains, removes the joined result. + /// RemoveIf a right match still exists, re-invokes the selector with left as ReactiveUI.Primitives.Optional.None<T>. If neither side remains, removes the joined result. /// RefreshForwarded as Refresh on the joined result. /// /// @@ -76,30 +82,30 @@ public static IObservable> FullJoinRight-side change handling: /// /// EventBehavior - /// AddEmits with the matching left (or ) and the right value. + /// AddEmits with the matching left (or ReactiveUI.Primitives.Optional.None<T>) and the right value. /// UpdateRe-invokes selector with current left (if any) and the new right value. - /// RemoveIf a left match still exists, re-invokes the selector with right as . If neither side remains, removes the joined result. + /// RemoveIf a left match still exists, re-invokes the selector with right as ReactiveUI.Primitives.Optional.None<T>. If neither side remains, removes the joined result. /// RefreshForwarded as Refresh on the joined result. /// /// /// Both sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// - public static IObservable> FullJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, Optional, TDestination> resultSelector) + /// InnerJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<ValueTuple<TLeftKey, TRightKey>, TLeft, TRight, TDestination>) + /// LeftJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, Optional<TRight>, TDestination>) + /// RightJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TRightKey, Optional<TLeft>, TRight, TDestination>) + /// FullJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + public static IObservable> FullJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, ReactiveUI.Primitives.Optional, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return new FullJoin(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.FullJoinMany.cs b/src/DynamicData/Cache/ObservableCacheEx.FullJoinMany.cs index c2e5894bc..e14eea2b9 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.FullJoinMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.FullJoinMany.cs @@ -1,47 +1,53 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the optional left value and the right group into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . - public static IObservable> FullJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) + /// + /// Provides an overload of FullJoinMany for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the optional left value and the right group into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to FullJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>). + public static IObservable> FullJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return left.FullJoinMany(right, rightKeySelector, (_, leftValue, rightValue) => resultSelector(leftValue, rightValue)); } @@ -49,7 +55,7 @@ public static IObservable> FullJoinMany /// Groups right-side items by their mapped key, then full-joins each group to the left source. /// A result is produced for every key that appears on either side (or both). The left value is - /// because only the right side may have entries for a given key. + /// Optional<T> because only the right side may have entries for a given key. /// Equivalent to SQL FULL OUTER JOIN with the right side grouped. /// /// The item type of the left source. @@ -57,10 +63,10 @@ public static IObservable> FullJoinManyThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the key, optional left value, and the right group into a destination object. Example: (key, left, group) => new Result(key, left, group). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the key, optional left value, and the right group into a destination object. Example: (key, left, group) => new Result(key, left, group). /// An observable changeset keyed by . /// /// @@ -69,7 +75,7 @@ public static IObservable> FullJoinManyEventBehavior /// AddEmits with the left value and the current right group for that key (may be empty). /// UpdateRe-invokes with the new left value and current right group. - /// RemoveIf the right group is non-empty, re-invokes with left as . If both sides are empty, removes the result. + /// RemoveIf the right group is non-empty, re-invokes with left as ReactiveUI.Primitives.Optional.None<T>. If both sides are empty, removes the result. /// RefreshForwarded as Refresh on the joined result. /// /// @@ -86,21 +92,21 @@ public static IObservable> FullJoinManyBoth sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// - public static IObservable> FullJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) + /// FullJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, Optional<TRight>, TDestination>) + /// InnerJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// LeftJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// RightJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + public static IObservable> FullJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return new FullJoinMany(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Group.cs b/src/DynamicData/Cache/ObservableCacheEx.Group.cs index b803146d8..c4c6deafc 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Group.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Group.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,9 +30,9 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the group key. - /// The source to group. - /// The group selector factory. - /// An of used to determine which groups appear in the result. + /// The source IObservable<IChangeSet<TObject, TKey>> to group. + /// The Func<TObject, TGroupKey> group selector factory. + /// An IObservable<IDistinctChangeSet<TGroupKey>> of IDistinctChangeSet<TGroupKey> used to determine which groups appear in the result. /// /// Useful for parent-child collection when the parent and child are soured from different streams. /// @@ -44,9 +42,9 @@ public static IObservable> Group(source, groupSelector, resultGroupSource).Run(); } @@ -58,8 +56,8 @@ public static IObservable> GroupThe type of the object. /// The type of the key. /// The type of the group key. - /// The source to group. - /// A that extracts the group key from each item. + /// The source IObservable<IChangeSet<TObject, TKey>> to group. + /// A Func<T, TResult> that extracts the group key from each item. /// An observable that emits group changesets. Each group exposes a sub-cache of its members. /// /// @@ -79,24 +77,29 @@ public static IObservable> Group /// - /// - /// - /// + /// GroupWithImmutableState<TObject, TKey, TGroupKey> + /// GroupOnObservable<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<TGroupKey>>, TimeSpan?, IScheduler?) + /// GroupOnProperty<TObject, TKey, TGroupKey> public static IObservable> Group(this IObservable> source, Func groupSelectorKey) where TObject : notnull where TKey : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - groupSelectorKey.ThrowArgumentNullExceptionIfNull(nameof(groupSelectorKey)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(groupSelectorKey); return new GroupOn(source, groupSelectorKey, null).Run(); } - /// - /// The source to group. - /// A that extracts the group key from each item. - /// An that, when it emits, all items are re-evaluated against the group selector, potentially moving items between groups. + /// + /// Provides an overload of Group for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TGroupKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to group. + /// A Func<T, TResult> that extracts the group key from each item. + /// An IObservable<Unit> that, when it emits, all items are re-evaluated against the group selector, potentially moving items between groups. /// An observable that emits group changesets. /// This overload adds a signal. When it fires, every item in the cache is re-grouped using the current selector, which is useful when the grouping depends on mutable item state. public static IObservable> Group(this IObservable> source, Func groupSelectorKey, IObservable regrouper) @@ -104,9 +107,9 @@ public static IObservable> Group(source, groupSelectorKey, regrouper).Run(); } @@ -118,9 +121,9 @@ public static IObservable> GroupThe type of the object. /// The type of the key. /// The type of the group key. - /// The source to group. - /// The that emits group selector functions. Each emission triggers a full re-grouping of all items. - /// An that optional signal to force re-evaluation of all items against the current selector. + /// The source IObservable<IChangeSet<TObject, TKey>> to group. + /// The IObservable<Func<TObject, TKey, TGroupKey>> that emits group selector functions. Each emission triggers a full re-grouping of all items. + /// An IObservable<Unit> that optional signal to force re-evaluation of all items against the current selector. /// An observable that emits group changesets. /// /// @@ -136,30 +139,36 @@ public static IObservable> GroupRefreshGroup key re-evaluated. Item may move between groups. /// /// - /// - /// + /// Group<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TGroupKey>) + /// GroupOnObservable<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<TGroupKey>>, TimeSpan?, IScheduler?) public static IObservable> Group(this IObservable> source, IObservable> groupSelectorKeyObservable, IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - groupSelectorKeyObservable.ThrowArgumentNullExceptionIfNull(nameof(groupSelectorKeyObservable)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(groupSelectorKeyObservable); return new GroupOnDynamic(source, groupSelectorKeyObservable, regrouper).Run(); } - /// - /// The source to group. - /// The of selector functions that take only the item (not the key). - /// An optional signal to force re-evaluation. + /// + /// Provides an overload of Group for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TGroupKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to group. + /// The IObservable<Func<TObject, TGroupKey>> of selector functions that take only the item (not the key). + /// An optional IObservable<Unit> signal to force re-evaluation. + /// The resulting observable sequence. /// This overload accepts a selector that does not receive the key. Delegates to the overload accepting Func<TObject, TKey, TGroupKey>. public static IObservable> Group(this IObservable> source, IObservable> groupSelectorKeyObservable, IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { - groupSelectorKeyObservable.ThrowArgumentNullExceptionIfNull(nameof(groupSelectorKeyObservable)); + ArgumentExceptionHelper.ThrowIfNull(groupSelectorKeyObservable); return source.Group(groupSelectorKeyObservable.Select(AdaptSelector), regrouper); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.GroupOnObservable.cs b/src/DynamicData/Cache/ObservableCacheEx.GroupOnObservable.cs index 31115d013..91d231e9c 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.GroupOnObservable.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.GroupOnObservable.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,12 +30,12 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the group key. - /// The source to group using per-item observables. - /// A factory that creates a group key observable for each item and its key. + /// The source IObservable<IChangeSet<TObject, TKey>> to group using per-item observables. + /// A Func<T, TResult> factory that creates a group key observable for each item and its key. /// An observable that emits group changesets. Each group is a live sub-cache of its members. /// /// - /// Unlike which evaluates + /// Unlike Group<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TGroupKey>) which evaluates /// the group key synchronously, this operator defers group assignment until the per-item observable emits. /// /// @@ -68,17 +66,17 @@ public static partial class ObservableCacheEx /// also completed. /// /// - /// - /// - /// - /// + /// Group<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TGroupKey>) + /// GroupOnProperty<TObject, TKey, TGroupKey> + /// FilterOnObservable<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<bool>>, TimeSpan?, IScheduler?) + /// TransformOnObservable<TSource, TKey, TDestination>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, TKey, IObservable<TDestination>>) public static IObservable> GroupOnObservable(this IObservable> source, Func> groupObservableSelector) where TObject : notnull where TKey : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - groupObservableSelector.ThrowArgumentNullExceptionIfNull(nameof(groupObservableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(groupObservableSelector); return new GroupOnObservable(source, groupObservableSelector).Run(); } @@ -89,15 +87,15 @@ public static IObservable> GroupOnObse /// The type of the object. /// The type of the key. /// The type of the group key. - /// The source to group using per-item observables. - /// The group selector key. + /// The source IObservable<IChangeSet<TObject, TKey>> to group using per-item observables. + /// The Func<TObject, IObservable<TGroupKey>> group selector key. /// An observable which will emit group change sets. public static IObservable> GroupOnObservable(this IObservable> source, Func> groupObservableSelector) where TObject : notnull where TKey : notnull where TGroupKey : notnull { - groupObservableSelector.ThrowArgumentNullExceptionIfNull(nameof(groupObservableSelector)); + ArgumentExceptionHelper.ThrowIfNull(groupObservableSelector); return source.GroupOnObservable(AdaptSelector>(groupObservableSelector)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.GroupOnProperty.cs b/src/DynamicData/Cache/ObservableCacheEx.GroupOnProperty.cs index 5165d4091..78ed5c1af 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.GroupOnProperty.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.GroupOnProperty.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,8 +30,8 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the group key. - /// The source to group by a property value. - /// The property selector used to group the items. + /// The source IObservable<IChangeSet<TObject, TKey>> to group by a property value. + /// The Expression<Func<TObject, TGroupKey>> property selector used to group the items. /// An optional a time span that indicates the throttle to wait for property change events. /// An optional for scheduling work. /// An observable which will emit immutable group change sets. @@ -42,8 +40,8 @@ public static IObservable> GroupOnProp where TKey : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertySelector.ThrowArgumentNullExceptionIfNull(nameof(propertySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertySelector); return new GroupOnProperty(source, propertySelector, propertyChangedThrottle, scheduler).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.GroupOnPropertyWithImmutableState.cs b/src/DynamicData/Cache/ObservableCacheEx.GroupOnPropertyWithImmutableState.cs index 2be1f5ca0..9b216305d 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.GroupOnPropertyWithImmutableState.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.GroupOnPropertyWithImmutableState.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,8 +30,8 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the group key. - /// The source to group by a property value with immutable snapshots. - /// The property selector used to group the items. + /// The source IObservable<IChangeSet<TObject, TKey>> to group by a property value with immutable snapshots. + /// The Expression<Func<TObject, TGroupKey>> property selector used to group the items. /// An optional a time span that indicates the throttle to wait for property change events. /// An optional for scheduling work. /// An observable which will emit immutable group change sets. @@ -42,8 +40,8 @@ public static IObservable> Gr where TKey : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertySelector.ThrowArgumentNullExceptionIfNull(nameof(propertySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertySelector); return new GroupOnPropertyWithImmutableState(source, propertySelector, propertyChangedThrottle, scheduler).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.GroupWithImmutableState.cs b/src/DynamicData/Cache/ObservableCacheEx.GroupWithImmutableState.cs index 1284a4b4f..e0a2779d0 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.GroupWithImmutableState.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.GroupWithImmutableState.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,13 +30,13 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the group key. - /// The source to group with immutable snapshots. - /// A that extracts the group key from each item. - /// An that optional signal to force re-evaluation of all items against the group selector. + /// The source IObservable<IChangeSet<TObject, TKey>> to group with immutable snapshots. + /// A Func<T, TResult> that extracts the group key from each item. + /// An IObservable<Unit> that optional signal to force re-evaluation of all items against the group selector. /// An observable that emits immutable group changesets. /// /// - /// Behaves identically to + /// Behaves identically to Group<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TGroupKey>) /// in terms of how items are assigned to groups, but each group emission is an immutable snapshot. /// This makes it safe for parallel processing and eliminates race conditions on group state. /// The tradeoff is higher memory usage, since each change produces a new snapshot of the affected group. @@ -51,15 +49,15 @@ public static partial class ObservableCacheEx /// RefreshGroup key re-evaluated. If changed, item moves; affected group snapshots emitted. /// /// - /// - /// + /// Group<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TGroupKey>) + /// GroupOnPropertyWithImmutableState<TObject, TKey, TGroupKey> public static IObservable> GroupWithImmutableState(this IObservable> source, Func groupSelectorKey, IObservable? regrouper = null) where TObject : notnull where TKey : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - groupSelectorKey.ThrowArgumentNullExceptionIfNull(nameof(groupSelectorKey)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(groupSelectorKey); return new GroupOnImmutable(source, groupSelectorKey, regrouper).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.IgnoreSameReferenceUpdate.cs b/src/DynamicData/Cache/ObservableCacheEx.IgnoreSameReferenceUpdate.cs index f5ff65ace..bf90b05a5 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.IgnoreSameReferenceUpdate.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.IgnoreSameReferenceUpdate.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,7 +21,7 @@ public static partial class ObservableCacheEx /// /// The object of the change set. /// The key of the change set. - /// The source to suppress same-reference updates in. + /// The source IObservable<IChangeSet<TObject, TKey>> to suppress same-reference updates in. /// An observable which emits change sets and ignores equal value changes. public static IObservable> IgnoreSameReferenceUpdate(this IObservable> source) where TObject : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.IgnoreUpdateWhen.cs b/src/DynamicData/Cache/ObservableCacheEx.IgnoreUpdateWhen.cs index 2b8f11a87..33b37e0bd 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.IgnoreUpdateWhen.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.IgnoreUpdateWhen.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,12 +22,16 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to selectively suppress updates in. - /// The ignore function (current,previous)=>{ return true to ignore }. + /// The source IObservable<IChangeSet<TObject, TKey>> to selectively suppress updates in. + /// The Func<TObject, TObject, bool> ignore function (current,previous)=>{ return true to ignore }. /// An observable which emits change sets and ignores updates equal to the lambda. public static IObservable> IgnoreUpdateWhen(this IObservable> source, Func ignoreFunction) where TObject : notnull - where TKey : notnull => source.Select( + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.Select( updates => { var result = updates.Where( @@ -51,4 +46,5 @@ public static IObservable> IgnoreUpdateWhen(result); }).NotEmpty(); + } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.IncludeUpdateWhen.cs b/src/DynamicData/Cache/ObservableCacheEx.IncludeUpdateWhen.cs index 2c1a2e020..17ea8683f 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.IncludeUpdateWhen.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.IncludeUpdateWhen.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,15 +22,15 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to selectively include updates in. - /// The include function (current,previous)=>{ return true to include }. + /// The source IObservable<IChangeSet<TObject, TKey>> to selectively include updates in. + /// The Func<TObject, TObject, bool> include function (current,previous)=>{ return true to include }. /// An observable which emits change sets and ignores updates equal to the lambda. public static IObservable> IncludeUpdateWhen(this IObservable> source, Func includeFunction) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - includeFunction.ThrowArgumentNullExceptionIfNull(nameof(includeFunction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(includeFunction); return source.Select( changes => diff --git a/src/DynamicData/Cache/ObservableCacheEx.InnerJoin.cs b/src/DynamicData/Cache/ObservableCacheEx.InnerJoin.cs index 8a80e640d..7b5e5e612 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.InnerJoin.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.InnerJoin.cs @@ -1,36 +1,42 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the left and right values into a destination object. The composite key is not provided in this overload. - /// Overload that omits the composite key from the result selector. Delegates to . + /// + /// Joins two changeset streams and projects matching left and right values without exposing the composite key to the selector. + /// + /// The item type of the left source. + /// The key type of the left source. + /// The item type of the right source. + /// The key type of the right source. + /// The type produced by . + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the left and right values into a destination object. The composite key is not provided in this overload. + /// An observable changeset keyed by a composite (TLeftKey, TRightKey) tuple. + /// Overload that omits the composite key from the result selector. Delegates to InnerJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<ValueTuple<TLeftKey, TRightKey>, TLeft, TRight, TDestination>). public static IObservable> InnerJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -38,10 +44,10 @@ public static partial class ObservableCacheEx where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return left.InnerJoin(right, rightKeySelector, (_, leftValue, rightValue) => resultSelector(leftValue, rightValue)); } @@ -55,10 +61,10 @@ public static partial class ObservableCacheEx /// The item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the composite key, left value, and right value into a destination object. Example: ((leftKey, rightKey), left, right) => new Result(leftKey, rightKey, left, right). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the composite key, left value, and right value into a destination object. Example: ((leftKey, rightKey), left, right) => new Result(leftKey, rightKey, left, right). /// An observable changeset keyed by a composite (TLeftKey, TRightKey) tuple. /// /// @@ -85,10 +91,10 @@ public static partial class ObservableCacheEx /// Both sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// + /// LeftJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, Optional<TRight>, TDestination>) + /// RightJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TRightKey, Optional<TLeft>, TRight, TDestination>) + /// FullJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, Optional<TRight>, TDestination>) + /// InnerJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) public static IObservable> InnerJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func<(TLeftKey leftKey, TRightKey rightKey), TLeft, TRight, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -96,10 +102,10 @@ public static partial class ObservableCacheEx where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return new InnerJoin(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.InnerJoinMany.cs b/src/DynamicData/Cache/ObservableCacheEx.InnerJoinMany.cs index 60bf2a343..a186f9f74 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.InnerJoinMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.InnerJoinMany.cs @@ -1,36 +1,42 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the left value and the right group into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . + /// + /// Provides an overload of InnerJoinMany for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the left value and the right group into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to InnerJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>). public static IObservable> InnerJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -38,10 +44,10 @@ public static IObservable> InnerJoinMany resultSelector(leftValue, rightValue)); } @@ -56,10 +62,10 @@ public static IObservable> InnerJoinManyThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the key, left value, and right group into a destination object. Example: (key, left, group) => new Result(key, left, group). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the key, left value, and right group into a destination object. Example: (key, left, group) => new Result(key, left, group). /// An observable changeset keyed by . /// /// @@ -85,10 +91,10 @@ public static IObservable> InnerJoinManyBoth sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// + /// InnerJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<ValueTuple<TLeftKey, TRightKey>, TLeft, TRight, TDestination>) + /// LeftJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// RightJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// FullJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) public static IObservable> InnerJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -96,10 +102,10 @@ public static IObservable> InnerJoinMany(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.InvokeEvaluate.cs b/src/DynamicData/Cache/ObservableCacheEx.InvokeEvaluate.cs index f19fde951..e28de5485 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.InvokeEvaluate.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.InvokeEvaluate.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,7 +29,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to trigger re-evaluation on. + /// The source IObservable<IChangeSet<TObject, TKey>> to trigger re-evaluation on. /// An observable that emits the same changesets as , unchanged. /// /// @@ -44,5 +42,9 @@ public static partial class ObservableCacheEx /// public static IObservable> InvokeEvaluate(this IObservable> source) where TObject : IEvaluateAware - where TKey : notnull => source.Do(changes => changes.Where(u => u.Reason == ChangeReason.Refresh).ForEach(u => u.Current.Evaluate())); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.Do(changes => changes.Where(u => u.Reason == ChangeReason.Refresh).ForEach(u => u.Current.Evaluate())); + } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.LeftJoin.cs b/src/DynamicData/Cache/ObservableCacheEx.LeftJoin.cs index 5da9d2abe..fa246e0e3 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.LeftJoin.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.LeftJoin.cs @@ -1,54 +1,60 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the left value and the optional right into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . - public static IObservable> LeftJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) + /// + /// Provides an overload of LeftJoin for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the left value and the optional right into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to LeftJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, Optional<TRight>, TDestination>). + public static IObservable> LeftJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return left.LeftJoin(right, rightKeySelector, (_, leftValue, rightValue) => resultSelector(leftValue, rightValue)); } /// /// Joins two changeset streams, producing a result for every left-side key. The right side is - /// because a matching right item may or may not exist. All left items + /// Optional<T> because a matching right item may or may not exist. All left items /// appear in the output regardless. Equivalent to SQL LEFT OUTER JOIN. /// /// The item type of the left source. @@ -56,17 +62,17 @@ public static IObservable> LeftJoinThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the key, left value, and optional right into a destination object. Example: (key, left, right) => new Result(key, left, right). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the key, left value, and optional right into a destination object. Example: (key, left, right) => new Result(key, left, right). /// An observable changeset keyed by . /// /// /// Left-side change handling: /// /// EventBehavior - /// AddAlways emits. Invokes with the left value and matching right (or ). + /// AddAlways emits. Invokes with the left value and matching right (or ReactiveUI.Primitives.Optional.None<T>). /// UpdateRe-invokes the selector with the new left value and current right (if any). /// RemoveRemoves the joined result. /// RefreshForwarded as Refresh on the joined result. @@ -85,21 +91,21 @@ public static IObservable> LeftJoinBoth sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// - public static IObservable> LeftJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) + /// InnerJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<ValueTuple<TLeftKey, TRightKey>, TLeft, TRight, TDestination>) + /// RightJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TRightKey, Optional<TLeft>, TRight, TDestination>) + /// FullJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, Optional<TRight>, TDestination>) + /// LeftJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + public static IObservable> LeftJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return new LeftJoin(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.LeftJoinMany.cs b/src/DynamicData/Cache/ObservableCacheEx.LeftJoinMany.cs index 726ec5f1f..ed93ff37d 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.LeftJoinMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.LeftJoinMany.cs @@ -1,36 +1,42 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the left value and the right group into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . + /// + /// Provides an overload of LeftJoinMany for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the left value and the right group into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to LeftJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>). public static IObservable> LeftJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -38,10 +44,10 @@ public static IObservable> LeftJoinMany resultSelector(leftValue, rightValue)); } @@ -56,10 +62,10 @@ public static IObservable> LeftJoinManyThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the key, left value, and right group into a destination object. Example: (key, left, group) => new Result(key, left, group). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the key, left value, and right group into a destination object. Example: (key, left, group) => new Result(key, left, group). /// An observable changeset keyed by . /// /// @@ -85,10 +91,10 @@ public static IObservable> LeftJoinManyBoth sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// + /// LeftJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, Optional<TRight>, TDestination>) + /// InnerJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// RightJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// FullJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) public static IObservable> LeftJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull @@ -96,10 +102,10 @@ public static IObservable> LeftJoinMany(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.LimitSizeTo.cs b/src/DynamicData/Cache/ObservableCacheEx.LimitSizeTo.cs index 810f118d0..f863c2e6a 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.LimitSizeTo.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.LimitSizeTo.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,7 +29,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to apply size limits to. + /// The source IObservable<IChangeSet<TObject, TKey>> to apply size limits to. /// The maximum number of items allowed. Must be greater than zero. /// An observable changeset stream with size-limited contents. /// @@ -49,7 +47,7 @@ public static IObservable> LimitSizeTo( where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (size <= 0) { @@ -60,12 +58,12 @@ public static IObservable> LimitSizeTo( } /// - /// Operates directly on a , removing the oldest items when the cache + /// Operates directly on a ISourceCache<TObject, TKey>, removing the oldest items when the cache /// exceeds . Returns an observable of the evicted key-value pairs (not a changeset stream). /// /// The type of the object. /// The type of the key. - /// The to operate on. + /// The ISourceCache<TObject, TKey> to operate on. /// The maximum number of items allowed. Must be greater than zero. /// An optional for observing changes. Defaults to . /// An observable that emits batches of evicted key-value pairs whenever the cache exceeds the size limit. @@ -75,7 +73,7 @@ public static IObservable>> LimitSizeTo< where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (sizeLimit <= 0) { @@ -88,7 +86,7 @@ public static IObservable>> LimitSizeTo< long orderItemWasAdded = -1; var sizeLimiter = new SizeLimiter(sizeLimit); - return source.Connect().Finally(observer.OnCompleted).ObserveOn(scheduler ?? GlobalConfig.DefaultScheduler).Transform((t, v) => new ExpirableItem(t, v, DateTime.Now, Interlocked.Increment(ref orderItemWasAdded))).Select(sizeLimiter.CloneAndReturnExpiredOnly).Where(expired => expired.Length != 0).Subscribe( + return source.Connect().ObserveOn(scheduler ?? GlobalConfig.DefaultScheduler).Transform((t, v) => new ExpirableItem(t, v, DateTime.Now, Interlocked.Increment(ref orderItemWasAdded))).Select(sizeLimiter.CloneAndReturnExpiredOnly).Where(expired => expired.Length != 0).Subscribe( toRemove => { try @@ -100,7 +98,9 @@ public static IObservable>> LimitSizeTo< { observer.OnError(ex); } - }); + }, + observer.OnError, + observer.OnCompleted); }); } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.MergeChangeSets.cs b/src/DynamicData/Cache/ObservableCacheEx.MergeChangeSets.cs index c29bd2a6b..195996299 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.MergeChangeSets.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.MergeChangeSets.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -33,23 +31,23 @@ public static partial class ObservableCacheEx /// /// The type of items in the changesets. /// The type of the key identifying items. - /// An that emits changeset streams. Each inner stream is subscribed as it appears. + /// An IObservable<T> that emits changeset streams. Each inner stream is subscribed as it appears. /// A unified changeset stream containing changes from all active source streams. /// /// /// Each inner changeset stream is independently tracked in its own cache. When multiple sources provide the same key, /// this overload uses first-in-wins semantics: the value from whichever source added the key first is /// the one published downstream. To control which value wins for duplicate keys, use an overload that - /// accepts an , which selects the lowest-ordered value across all sources. - /// An can be provided separately to suppress no-op updates when + /// accepts an IComparer<T>, which selects the lowest-ordered value across all sources. + /// An IEqualityComparer<T> can be provided separately to suppress no-op updates when /// the new value equals the currently published value for a key. /// /// /// Overload families: MergeChangeSets has 16 overloads organized along three axes: /// (1) Source type: dynamic (IObservable<IObservable<IChangeSet>>, sources arrive at runtime), - /// pair (source + other, exactly two streams), or static (, all sources known up front). - /// (2) Conflict resolution: none (first-in-wins), (lowest-ordered wins), - /// (suppresses duplicate updates), or both. + /// pair (source + other, exactly two streams), or static (IEnumerable<T>, all sources known up front). + /// (2) Conflict resolution: none (first-in-wins), IComparer<T> (lowest-ordered wins), + /// IEqualityComparer<T> (suppresses duplicate updates), or both. /// (3) Completion: static overloads accept a completable flag; when , the output never completes /// even after all sources finish (useful for "live" merge scenarios). /// @@ -69,14 +67,14 @@ public static partial class ObservableCacheEx /// /// /// is . - /// - /// - /// + /// MergeMany<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TDestination>>) + /// MergeManyChangeSets<TObject, TKey, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IComparer<TDestination>, IEqualityComparer<TDestination>) + /// ObservableListEx.MergeChangeSets public static IObservable> MergeChangeSets(this IObservable>> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new MergeChangeSets(source, equalityComparer: null, comparer: null).Run(); } @@ -88,16 +86,16 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// An that emits changeset streams. Each inner stream is subscribed as it appears. - /// An that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. + /// An IObservable<T> that emits changeset streams. Each inner stream is subscribed as it appears. + /// An IComparer<TObject> that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. /// A unified changeset stream containing changes from all active source streams. /// or is null. public static IObservable> MergeChangeSets(this IObservable>> source, IComparer comparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparer); return new MergeChangeSets(source, equalityComparer: null, comparer).Run(); } @@ -109,16 +107,16 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// An that emits changeset streams. Each inner stream is subscribed as it appears. - /// An that equality comparer to detect duplicate values for the same key, suppressing no-op updates. + /// An IObservable<T> that emits changeset streams. Each inner stream is subscribed as it appears. + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key, suppressing no-op updates. /// A unified changeset stream containing changes from all active source streams. /// or is null. public static IObservable> MergeChangeSets(this IObservable>> source, IEqualityComparer equalityComparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - equalityComparer.ThrowArgumentNullExceptionIfNull(nameof(equalityComparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(equalityComparer); return new MergeChangeSets(source, equalityComparer, comparer: null).Run(); } @@ -129,18 +127,18 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// An that emits changeset streams. Each inner stream is subscribed as it appears. - /// An that equality comparer to detect duplicate values for the same key, suppressing no-op updates. - /// An that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. + /// An IObservable<T> that emits changeset streams. Each inner stream is subscribed as it appears. + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key, suppressing no-op updates. + /// An IComparer<TObject> that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. /// A unified changeset stream containing changes from all active source streams. /// , , or is null. public static IObservable> MergeChangeSets(this IObservable>> source, IEqualityComparer equalityComparer, IComparer comparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - equalityComparer.ThrowArgumentNullExceptionIfNull(nameof(equalityComparer)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(equalityComparer); + ArgumentExceptionHelper.ThrowIfNull(comparer); return new MergeChangeSets(source, equalityComparer, comparer).Run(); } @@ -151,8 +149,8 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The second to merge with . + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The second IObservable<IChangeSet<TObject, TKey>> to merge with . /// An optional used when subscribing to the source streams. /// If (default), the output completes when both streams complete. If , the output never completes. /// A unified changeset stream containing changes from both sources. @@ -161,8 +159,8 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The second to merge with . - /// An that comparer to determine which value wins when both sources provide the same key. + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The second IObservable<IChangeSet<TObject, TKey>> to merge with . + /// An IComparer<TObject> that comparer to determine which value wins when both sources provide the same key. /// An optional used when subscribing to the source streams. /// If (default), the output completes when both streams complete. If , the output never completes. /// A unified changeset stream containing changes from both sources. @@ -183,9 +181,9 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The second to merge with . - /// An that equality comparer to detect duplicate values for the same key. + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The second IObservable<IChangeSet<TObject, TKey>> to merge with . + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key. /// An optional used when subscribing to the source streams. /// If (default), the output completes when both streams complete. If , the output never completes. /// A unified changeset stream containing changes from both sources. @@ -206,9 +204,9 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The second to merge with . - /// An that equality comparer to detect duplicate values for the same key. - /// An that comparer to determine which value wins when both sources provide the same key. + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The second IObservable<IChangeSet<TObject, TKey>> to merge with . + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key. + /// An IComparer<TObject> that comparer to determine which value wins when both sources provide the same key. /// An optional used when subscribing to the source streams. /// If (default), the output completes when both streams complete. If , the output never completes. /// A unified changeset stream containing changes from both sources. @@ -230,10 +228,10 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The additional streams to merge with . + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to merge with . /// An optional used when subscribing to the source streams. /// If (default), the output completes when all streams complete. If , the output never completes. /// A unified changeset stream containing changes from all sources. @@ -254,8 +252,8 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The additional streams to merge with . - /// An that comparer to determine which value wins when multiple sources provide the same key. + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to merge with . + /// An IComparer<TObject> that comparer to determine which value wins when multiple sources provide the same key. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all streams complete. If , the output never completes. /// A unified changeset stream containing changes from all sources. @@ -276,9 +274,9 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The additional streams to merge with . - /// An that equality comparer to detect duplicate values for the same key. + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to merge with . + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all streams complete. If , the output never completes. /// A unified changeset stream containing changes from all sources. @@ -299,9 +297,9 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// The additional streams to merge with . - /// An that equality comparer to detect duplicate values for the same key. - /// An that comparer to determine which value wins when multiple sources provide the same key. + /// The source IObservable<IChangeSet<TObject, TKey>> to merge. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to merge with . + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key. + /// An IComparer<TObject> that comparer to determine which value wins when multiple sources provide the same key. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all streams complete. If , the output never completes. /// A unified changeset stream containing changes from all sources. @@ -323,10 +321,10 @@ public static IObservable> MergeChangeSets> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. + /// The source IEnumerable<T> to merge. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all source streams have completed. If , the output never completes. /// A unified changeset stream containing changes from all source streams. @@ -346,7 +344,7 @@ public static IObservable> MergeChangeSets. + /// that accepts an IComparer<T>. /// /// /// An error from any source terminates the entire merged output. @@ -357,7 +355,7 @@ public static IObservable> MergeChangeSets(source, equalityComparer: null, comparer: null, completable, scheduler).Run(); } @@ -369,8 +367,8 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// An that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. + /// The source IEnumerable<T> to merge. + /// An IComparer<TObject> that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all source streams have completed. If , the output never completes. /// A unified changeset stream containing changes from all source streams. @@ -379,8 +377,8 @@ public static IObservable> MergeChangeSets(source, equalityComparer: null, comparer, completable, scheduler).Run(); } @@ -392,8 +390,8 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// An that equality comparer to detect duplicate values for the same key, suppressing no-op updates. + /// The source IEnumerable<T> to merge. + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key, suppressing no-op updates. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all source streams have completed. If , the output never completes. /// A unified changeset stream containing changes from all source streams. @@ -402,8 +400,8 @@ public static IObservable> MergeChangeSets(source, equalityComparer, comparer: null, completable, scheduler).Run(); } @@ -414,9 +412,9 @@ public static IObservable> MergeChangeSets /// The type of items in the changesets. /// The type of the key identifying items. - /// The source to merge. - /// An that equality comparer to detect duplicate values for the same key, suppressing no-op updates. - /// An that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. + /// The source IEnumerable<T> to merge. + /// An IEqualityComparer<TObject> that equality comparer to detect duplicate values for the same key, suppressing no-op updates. + /// An IComparer<TObject> that comparer to determine which value wins when multiple sources provide the same key. The lowest-ordered value is published. /// An optional used when subscribing to the source streams. /// If (default), the output completes when all source streams have completed. If , the output never completes. /// A unified changeset stream containing changes from all source streams. @@ -425,9 +423,9 @@ public static IObservable> MergeChangeSets(source, equalityComparer, comparer, completable, scheduler).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.MergeMany.cs b/src/DynamicData/Cache/ObservableCacheEx.MergeMany.cs index b3c290d34..9dbde938b 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.MergeMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.MergeMany.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,15 +25,15 @@ public static partial class ObservableCacheEx { /// /// Subscribes to a child observable for each item in the source cache changeset stream and merges all child - /// emissions into a single . When an item is added, + /// emissions into a single IObservable<T>. When an item is added, /// creates its child subscription. When updated, the previous child subscription is disposed and a new one is created. /// When removed, its child subscription is disposed. Refresh changes have no effect on subscriptions. /// /// The type of items in the source cache. /// The type of the key identifying source cache items. /// The type of values emitted by child observables. - /// The source whose items each produce an observable. - /// A factory function that produces a child observable for each source item. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce an observable. + /// A Func<T, TResult> factory function that produces a child observable for each source item. /// An observable that emits values from all active child observables, interleaved by arrival order. /// /// @@ -51,32 +49,38 @@ public static partial class ObservableCacheEx /// RefreshNo effect on subscriptions. The child observable continues unchanged. /// OnErrorErrors from child observables are silently swallowed (the child is unsubscribed). Errors from the source changeset stream terminate the merged output. /// - /// Worth noting: The output is a plain , not a changeset stream. If you need merged changesets, use instead. + /// Worth noting: The output is a plain IObservable<TDestination>, not a changeset stream. If you need merged changesets, use MergeManyChangeSets<TObject, TKey, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IComparer<TDestination>, IEqualityComparer<TDestination>) instead. /// /// or is null. - /// - /// - /// - /// + /// MergeManyChangeSets<TObject, TKey, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IComparer<TDestination>, IEqualityComparer<TDestination>) + /// MergeChangeSets<TObject, TKey>(IObservable<IObservable<IChangeSet<TObject, TKey>>>) + /// SubscribeMany<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IDisposable>) + /// ObservableListEx.MergeMany public static IObservable MergeMany(this IObservable> source, Func> observableSelector) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeMany(source, observableSelector).Run(); } - /// - /// The source whose items each produce an observable. - /// A factory function that receives both the item and its key, and returns a child observable. + /// + /// Provides an overload of MergeMany for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TDestination value. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce an observable. + /// A Func<T, TResult> factory function that receives both the item and its key, and returns a child observable. + /// The resulting observable sequence. public static IObservable MergeMany(this IObservable> source, Func> observableSelector) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeMany(source, observableSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.MergeManyChangeSets.cs b/src/DynamicData/Cache/ObservableCacheEx.MergeManyChangeSets.cs index 5fcbb9ed0..df5f51d1f 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.MergeManyChangeSets.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.MergeManyChangeSets.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -34,19 +32,19 @@ public static partial class ObservableCacheEx /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child cache changeset stream. - /// An that comparer to resolve key conflicts when multiple child streams provide items with the same destination key. The lowest-ordered item wins. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child cache changeset stream. + /// An IComparer<TDestination> that comparer to resolve key conflicts when multiple child streams provide items with the same destination key. The lowest-ordered item wins. /// A merged changeset stream containing items from all active child streams. /// or is null. - /// + /// ObservableListEx.MergeManyChangeSets public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer comparer) where TObject : notnull where TKey : notnull where TDestination : notnull where TDestinationKey : notnull { - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((t, _) => observableSelector(t), comparer); } @@ -59,9 +57,9 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and its key, and returns a child cache changeset stream. - /// An that comparer to resolve key conflicts when multiple child streams provide items with the same destination key. The lowest-ordered item wins. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and its key, and returns a child cache changeset stream. + /// An IComparer<TDestination> that comparer to resolve key conflicts when multiple child streams provide items with the same destination key. The lowest-ordered item wins. /// A merged changeset stream containing items from all active child streams. /// , , or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer comparer) @@ -70,9 +68,9 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); + ArgumentExceptionHelper.ThrowIfNull(comparer); return source.MergeManyChangeSets(observableSelector, equalityComparer: null, comparer: comparer); } @@ -85,10 +83,10 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child cache changeset stream. - /// An that optional equality comparer to suppress updates when the incoming child value equals the current value for a destination key. - /// An that optional comparer to resolve key conflicts when multiple child streams provide items with the same destination key. The lowest-ordered item wins. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child cache changeset stream. + /// An IEqualityComparer<TDestination> that optional equality comparer to suppress updates when the incoming child value equals the current value for a destination key. + /// An IComparer<TDestination> that optional comparer to resolve key conflicts when multiple child streams provide items with the same destination key. The lowest-ordered item wins. /// A merged changeset stream containing items from all active child streams. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) @@ -97,8 +95,8 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((t, _) => observableSelector(t), equalityComparer, comparer); } @@ -112,14 +110,14 @@ public static IObservable> MergeManyCh /// The type of the key identifying parent items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a parent item and its key, and returns a child cache changeset stream. Called once per parent Add/Update. - /// An that optional equality comparer to suppress no-op child updates. When a child key's new value equals the current value per this comparer, the update is not emitted. - /// An that optional comparer to resolve child key conflicts when multiple parents contribute children with the same destination key. The lowest-ordered child value wins. Without a comparer, the first parent to provide a key retains priority. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a parent item and its key, and returns a child cache changeset stream. Called once per parent Add/Update. + /// An IEqualityComparer<TDestination> that optional equality comparer to suppress no-op child updates. When a child key's new value equals the current value per this comparer, the update is not emitted. + /// An IComparer<TDestination> that optional comparer to resolve child key conflicts when multiple parents contribute children with the same destination key. The lowest-ordered child value wins. Without a comparer, the first parent to provide a key retains priority. /// A merged changeset stream containing all child items from all active parent subscriptions. /// /// - /// This is the changeset-aware counterpart to . + /// This is the changeset-aware counterpart to MergeMany<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TDestination>>). /// Where MergeMany produces a flat IObservable<T>, MergeManyChangeSets produces an IObservable<IChangeSet> /// that tracks the full lifecycle of child items, including key conflict resolution across parents. /// @@ -148,7 +146,7 @@ public static IObservable> MergeManyCh /// /// /// EventBehavior - /// OnErrorAn error from the source (parent) stream or from any child changeset stream terminates the entire output. Unlike , child errors are NOT swallowed. + /// OnErrorAn error from the source (parent) stream or from any child changeset stream terminates the entire output. Unlike MergeMany<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TDestination>>), child errors are NOT swallowed. /// OnCompletedThe output completes when the source (parent) stream completes and all active child changeset streams have also completed. /// /// @@ -160,17 +158,17 @@ public static IObservable> MergeManyCh /// /// /// or is . - /// - /// - /// + /// MergeMany<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TDestination>>) + /// MergeChangeSets<TObject, TKey>(IObservable<IObservable<IChangeSet<TObject, TKey>>>) + /// TransformMany<TDestination, TDestinationKey, TSource, TSourceKey>(IObservable<IChangeSet<TSource, TSourceKey>>, Func<TSource, IObservable<IChangeSet<TDestination, TDestinationKey>>>, Func<TDestination, TDestinationKey>) public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TObject : notnull where TKey : notnull where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeManyCacheChangeSets(source, observableSelector, equalityComparer, comparer).Run(); } @@ -185,10 +183,10 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. Lower-ordered source wins. - /// An that fallback comparer to resolve destination key conflicts when source items compare equal. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. Lower-ordered source wins. + /// An IComparer<TDestination> that fallback comparer to resolve destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, IComparer childComparer) @@ -197,8 +195,8 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((t, _) => observableSelector(t), sourceComparer, DefaultResortOnSourceRefresh, equalityComparer: null, childComparer); } @@ -212,10 +210,10 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and its key, and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. Lower-ordered source wins. - /// An that fallback comparer to resolve destination key conflicts when source items compare equal. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and its key, and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. Lower-ordered source wins. + /// An IComparer<TDestination> that fallback comparer to resolve destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, IComparer childComparer) @@ -232,11 +230,11 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. /// If , a Refresh in the source stream re-evaluates source priorities. If , Refresh events are ignored for priority recalculation. - /// An that fallback comparer to resolve destination key conflicts when source items compare equal. + /// An IComparer<TDestination> that fallback comparer to resolve destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, bool resortOnSourceRefresh, IComparer childComparer) @@ -245,8 +243,8 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((t, _) => observableSelector(t), sourceComparer, resortOnSourceRefresh, equalityComparer: null, childComparer); } @@ -259,11 +257,11 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and its key, and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and its key, and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. /// If , a Refresh in the source stream re-evaluates source priorities. If , Refresh events are ignored for priority recalculation. - /// An that fallback comparer to resolve destination key conflicts when source items compare equal. + /// An IComparer<TDestination> that fallback comparer to resolve destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, bool resortOnSourceRefresh, IComparer childComparer) @@ -281,11 +279,11 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. - /// An that optional equality comparer to suppress updates when the incoming child value equals the current value. - /// An that optional fallback comparer for destination key conflicts when source items compare equal. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. + /// An IEqualityComparer<TDestination> that optional equality comparer to suppress updates when the incoming child value equals the current value. + /// An IComparer<TDestination> that optional fallback comparer for destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, IEqualityComparer? equalityComparer = null, IComparer? childComparer = null) @@ -294,8 +292,8 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((t, _) => observableSelector(t), sourceComparer, DefaultResortOnSourceRefresh, equalityComparer, childComparer); } @@ -308,11 +306,11 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and its key, and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. - /// An that optional equality comparer to suppress updates when the incoming child value equals the current value. - /// An that optional fallback comparer for destination key conflicts when source items compare equal. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and its key, and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. + /// An IEqualityComparer<TDestination> that optional equality comparer to suppress updates when the incoming child value equals the current value. + /// An IComparer<TDestination> that optional fallback comparer for destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, IEqualityComparer? equalityComparer = null, IComparer? childComparer = null) @@ -329,12 +327,12 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. /// If , a Refresh in the source stream re-evaluates source priorities. If , Refresh events are ignored for priority recalculation. - /// An that optional equality comparer to suppress updates when the incoming child value equals the current value. - /// An that optional fallback comparer for destination key conflicts when source items compare equal. + /// An IEqualityComparer<TDestination> that optional equality comparer to suppress updates when the incoming child value equals the current value. + /// An IComparer<TDestination> that optional fallback comparer for destination key conflicts when source items compare equal. /// A merged changeset stream with conflicts resolved by source priority. /// or is null. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer sourceComparer, bool resortOnSourceRefresh, IEqualityComparer? equalityComparer = null, IComparer? childComparer = null) @@ -343,8 +341,8 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((t, _) => observableSelector(t), sourceComparer, resortOnSourceRefresh, equalityComparer, childComparer); } @@ -359,12 +357,12 @@ public static IObservable> MergeManyCh /// The type of the key identifying source cache items. /// The type of items in the child changeset streams. /// The type of the key identifying child items. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and its key, and returns a child cache changeset stream. - /// An that comparer to prioritize between source items when their children produce the same destination key. Lower-ordered source wins. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and its key, and returns a child cache changeset stream. + /// An IComparer<TObject> that comparer to prioritize between source items when their children produce the same destination key. Lower-ordered source wins. /// If (default), a Refresh in the source stream re-evaluates source priorities. If , Refresh events are ignored for priority recalculation. - /// An that optional equality comparer to suppress updates when the incoming child value equals the current value for a destination key. - /// An that optional fallback comparer to resolve destination key conflicts when source items compare equal. + /// An IEqualityComparer<TDestination> that optional equality comparer to suppress updates when the incoming child value equals the current value for a destination key. + /// An IComparer<TDestination> that optional fallback comparer to resolve destination key conflicts when source items compare equal. /// A merged changeset stream containing items from all active child streams, with conflicts resolved by source priority. /// /// @@ -383,9 +381,9 @@ public static IObservable> MergeManyCh where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); - sourceComparer.ThrowArgumentNullExceptionIfNull(nameof(sourceComparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); + ArgumentExceptionHelper.ThrowIfNull(sourceComparer); return new MergeManyCacheChangeSetsSourceCompare(source, observableSelector, sourceComparer, equalityComparer, childComparer, resortOnSourceRefresh).Run(); } @@ -398,17 +396,17 @@ public static IObservable> MergeManyCh /// The type of items in the source cache. /// The type of the key identifying source cache items. /// The type of items in the child list changeset streams. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and its key, and returns a child list changeset stream. - /// An that optional equality comparer to detect duplicate items in the merged list output. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and its key, and returns a child list changeset stream. + /// An IEqualityComparer<TDestination> that optional equality comparer to detect duplicate items in the merged list output. /// A merged list changeset stream containing items from all active child streams. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeManyListChangeSets(source, observableSelector, equalityComparer).Run(); } @@ -420,18 +418,21 @@ public static IObservable> MergeManyChangeSetsThe type of items in the source cache. /// The type of the key identifying source cache items. /// The type of items in the child list changeset streams. - /// The source whose items each produce a child changeset stream. - /// A factory function that receives a source item and returns a child list changeset stream. - /// An that optional equality comparer to detect duplicate items in the merged list output. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce a child changeset stream. + /// A Func<T, TResult> factory function that receives a source item and returns a child list changeset stream. + /// An IEqualityComparer<TDestination> that optional equality comparer to detect duplicate items in the merged list output. /// A merged list changeset stream containing items from all active child streams. public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull where TDestination : notnull { - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return source.MergeManyChangeSets((obj, _) => observableSelector(obj), equalityComparer); } + /// + /// The DefaultResortOnSourceRefresh field. + /// private const bool DefaultResortOnSourceRefresh = true; } diff --git a/src/DynamicData/Cache/ObservableCacheEx.MergeManyItems.cs b/src/DynamicData/Cache/ObservableCacheEx.MergeManyItems.cs index b2581c6c8..333bab75e 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.MergeManyItems.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.MergeManyItems.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,36 +24,42 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Like , - /// but wraps each emitted value as an , pairing the source item + /// Like MergeMany<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TDestination>>), + /// but wraps each emitted value as an ItemWithValue<TObject, TValue>, pairing the source item /// with the value it produced. This lets you identify which source item is responsible for each emission. /// /// The type of items in the source cache. /// The type of the key identifying source cache items. /// The type of values emitted by child observables. - /// The source whose items each produce an observable. - /// A factory function that produces a child observable for each source item. - /// An observable of pairing each emission with its source item. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce an observable. + /// A Func<T, TResult> factory function that produces a child observable for each source item. + /// An observable of ItemWithValue<TObject, TValue> pairing each emission with its source item. /// or is null. public static IObservable> MergeManyItems(this IObservable> source, Func> observableSelector) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeManyItems(source, observableSelector).Run(); } - /// - /// The source whose items each produce an observable. - /// A factory function that receives both the item and its key, and returns a child observable. + /// + /// Provides an overload of MergeManyItems for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TDestination value. + /// The source IObservable<IChangeSet<TObject, TKey>> whose items each produce an observable. + /// A Func<T, TResult> factory function that receives both the item and its key, and returns a child observable. + /// The resulting observable sequence. public static IObservable> MergeManyItems(this IObservable> source, Func> observableSelector) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeManyItems(source, observableSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.MonitorStatus.cs b/src/DynamicData/Cache/ObservableCacheEx.MonitorStatus.cs index 93abf0f92..330da7bff 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.MonitorStatus.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.MonitorStatus.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,9 +29,9 @@ public static partial class ObservableCacheEx /// This is not a changeset operator. /// /// The type of the source observable. - /// The source to monitor for connection status. + /// The source IObservable<T> to monitor for connection status. /// An observable that emits values reflecting the source's lifecycle. /// is . - /// + /// DeferUntilLoaded<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable MonitorStatus(this IObservable source) => new StatusMonitor(source).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.NotEmpty.cs b/src/DynamicData/Cache/ObservableCacheEx.NotEmpty.cs index a267d1511..6efbfbad7 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.NotEmpty.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.NotEmpty.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,15 +21,15 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to suppress empty changesets. + /// The source IObservable<IChangeSet<TObject, TKey>> to suppress empty changesets. /// An observable that emits only non-empty changesets. /// is . - /// + /// StartWithEmpty<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>) public static IObservable> NotEmpty(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Where(changes => changes.Count != 0); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.OfType.cs b/src/DynamicData/Cache/ObservableCacheEx.OfType.cs index dd12ae230..51a5cd785 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.OfType.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.OfType.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,7 +30,7 @@ public static partial class ObservableCacheEx /// The type of the objects in the source changeset. /// The type of the key. /// The destination type to filter and cast to. - /// The source to filter by type. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter by type. /// If , changesets that become empty after filtering are suppressed. /// An observable changeset of items. /// @@ -50,7 +48,7 @@ public static IObservable> OfType(source, suppressEmptyChangeSets).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.OnChangeAction.cs b/src/DynamicData/Cache/ObservableCacheEx.OnChangeAction.cs index 00b222a68..97bb8ad5f 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.OnChangeAction.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.OnChangeAction.cs @@ -2,29 +2,29 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { + /// + /// Executes the OnChangeAction operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The predicate value. + /// The changeAction value. + /// The result of the operation. private static IObservable> OnChangeAction(this IObservable> source, Predicate> predicate, Action> changeAction) where TObject : notnull where TKey : notnull @@ -43,6 +43,15 @@ private static IObservable> OnChangeAction + /// Executes the OnChangeAction operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The reason value. + /// The action value. + /// The result of the operation. private static IObservable> OnChangeAction(this IObservable> source, ChangeReason reason, Action action) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.OnItemAdded.cs b/src/DynamicData/Cache/ObservableCacheEx.OnItemAdded.cs index 40e47a95b..ef19609f0 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.OnItemAdded.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.OnItemAdded.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,8 +21,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to observe item additions in. - /// The callback invoked for each added item. Receives the new item and its key. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item additions in. + /// The Action<TObject, TKey> callback invoked for each added item. Receives the new item and its key. /// A stream that forwards all changesets from unchanged. /// /// @@ -49,24 +40,29 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// - /// - /// + /// OnItemUpdated<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TObject,TKey>) + /// OnItemRemoved<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TKey>, bool) + /// ForEachChange<TObject,TKey> + /// ObservableListEx.OnItemAdded public static IObservable> OnItemAdded(this IObservable> source, Action addAction) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - addAction.ThrowArgumentNullExceptionIfNull(nameof(addAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(addAction); return source.OnChangeAction(ChangeReason.Add, addAction); } - /// - /// The source to observe item additions in. - /// The callback invoked for each added item. Receives only the item (no key). - /// Overload that omits the key from the callback. Delegates to . + /// + /// Provides an overload of addAction for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item additions in. + /// The Action<TObject> callback invoked for each added item. Receives only the item (no key). + /// The resulting observable sequence. + /// Overload that omits the key from the callback. Delegates to OnItemAdded<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject, TKey>). public static IObservable> OnItemAdded(this IObservable> source, Action addAction) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.OnItemRefreshed.cs b/src/DynamicData/Cache/ObservableCacheEx.OnItemRefreshed.cs index 13441fd02..2de302775 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.OnItemRefreshed.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.OnItemRefreshed.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,8 +21,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to observe item refresh events in. - /// The callback invoked for each refreshed item. Receives the item and its key. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item refresh events in. + /// The Action<TObject, TKey> callback invoked for each refreshed item. Receives the item and its key. /// A stream that forwards all changesets from unchanged. /// /// @@ -49,22 +40,27 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// + /// AutoRefresh<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableListEx.OnItemRefreshed public static IObservable> OnItemRefreshed(this IObservable> source, Action refreshAction) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - refreshAction.ThrowArgumentNullExceptionIfNull(nameof(refreshAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(refreshAction); return source.OnChangeAction(ChangeReason.Refresh, refreshAction); } - /// - /// The source to observe item refresh events in. - /// The callback invoked for each refreshed item. Receives only the item (no key). - /// Overload that omits the key from the callback. Delegates to . + /// + /// Provides an overload of refreshAction for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item refresh events in. + /// The Action<TObject> callback invoked for each refreshed item. Receives only the item (no key). + /// The resulting observable sequence. + /// Overload that omits the key from the callback. Delegates to OnItemRefreshed<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject, TKey>). public static IObservable> OnItemRefreshed(this IObservable> source, Action refreshAction) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.OnItemRemoved.cs b/src/DynamicData/Cache/ObservableCacheEx.OnItemRemoved.cs index 6935103fe..306876816 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.OnItemRemoved.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.OnItemRemoved.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,8 +29,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to observe item removals in. - /// The callback invoked for each removed item. Receives the removed item and its key. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item removals in. + /// The Action<TObject, TKey> callback invoked for each removed item. Receives the removed item and its key. /// /// When (the default), the callback is also invoked for every item still in the cache /// when the subscription is disposed. When , only inline Remove changes trigger the callback. @@ -62,15 +60,15 @@ public static partial class ObservableCacheEx /// Worth noting: The action also fires for ALL remaining items when the subscription is disposed (unless invokeOnUnsubscribe is ). The action runs under a lock; avoid calling into other caches from within it. /// /// or is . - /// - /// - /// + /// DisposeMany<TObject,TKey> + /// SubscribeMany<TObject,TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IDisposable>) + /// ObservableListEx.OnItemRemoved public static IObservable> OnItemRemoved(this IObservable> source, Action removeAction, bool invokeOnUnsubscribe = true) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - removeAction.ThrowArgumentNullExceptionIfNull(nameof(removeAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(removeAction); if (invokeOnUnsubscribe) { @@ -80,11 +78,16 @@ public static IObservable> OnItemRemoved - /// The source to observe item removals in. - /// The callback invoked for each removed item. Receives only the item (no key). + /// + /// Provides an overload of removeAction for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item removals in. + /// The Action<TObject> callback invoked for each removed item. Receives only the item (no key). /// When (the default), also invoked for all remaining items on disposal. - /// Overload that omits the key from the callback. Delegates to . + /// The resulting observable sequence. + /// Overload that omits the key from the callback. Delegates to OnItemRemoved<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject, TKey>, bool). public static IObservable> OnItemRemoved(this IObservable> source, Action removeAction, bool invokeOnUnsubscribe = true) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.OnItemUpdated.cs b/src/DynamicData/Cache/ObservableCacheEx.OnItemUpdated.cs index 464bbf29b..fd77095f5 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.OnItemUpdated.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.OnItemUpdated.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,8 +22,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to observe item updates in. - /// The callback invoked for each updated item. Receives the current value, previous value, and key. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item updates in. + /// The Action<TObject, TObject, TKey> callback invoked for each updated item. Receives the current value, previous value, and key. /// A stream that forwards all changesets from unchanged. /// /// @@ -50,22 +41,27 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// + /// OnItemAdded<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TKey>) + /// ForEachChange<TObject,TKey> public static IObservable> OnItemUpdated(this IObservable> source, Action updateAction) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(updateAction); return source.OnChangeAction(static change => change.Reason == ChangeReason.Update, change => updateAction(change.Current, change.Previous.Value, change.Key)); } - /// - /// The source to observe item updates in. - /// The callback invoked for each updated item. Receives only the current and previous values (no key). - /// Overload that omits the key from the callback. Delegates to . + /// + /// Provides an overload of updateAction for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe item updates in. + /// The Action<TObject, TObject> callback invoked for each updated item. Receives only the current and previous values (no key). + /// The resulting observable sequence. + /// Overload that omits the key from the callback. Delegates to OnItemUpdated<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject, TObject, TKey>). public static IObservable> OnItemUpdated(this IObservable> source, Action updateAction) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.Or.cs b/src/DynamicData/Cache/ObservableCacheEx.Or.cs index a0de6f338..e8633b51a 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Or.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Or.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,8 +28,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to combine. - /// The additional streams to combine with. + /// The source IObservable<IChangeSet<TObject, TKey>> to combine. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to combine with. /// A changeset stream containing items present in any of the sources. /// /// @@ -47,16 +45,16 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// - /// - /// - /// + /// And<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) + /// Except<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) + /// Xor<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) + /// MergeChangeSets<TObject, TKey>(IObservable<IObservable<IChangeSet<TObject, TKey>>>) + /// ObservableListEx.Or public static IObservable> Or(this IObservable> source, params IObservable>[] others) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (others is null || others.Length == 0) { @@ -66,14 +64,19 @@ public static IObservable> Or(this IObs return source.Combine(CombineOperator.Or, others); } - /// - /// The of streams to combine. + /// + /// Provides an overload of Or for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The ICollection<T> of streams to combine. + /// The resulting observable sequence. /// This overload accepts a pre-built collection of sources instead of a params array. public static IObservable> Or(this ICollection>> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Or); } @@ -84,13 +87,13 @@ public static IObservable> Or(this ICol /// /// The type of the object. /// The type of the key. - /// The of streams to combine. + /// The IObservableList<T> of streams to combine. /// An observable which emits change sets. public static IObservable> Or(this IObservableList>> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Or); } @@ -101,13 +104,13 @@ public static IObservable> Or(this IObs /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<IObservableCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits change sets. public static IObservable> Or(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Or); } @@ -118,13 +121,13 @@ public static IObservable> Or(this IObs /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<ISourceCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits change sets. public static IObservable> Or(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Or); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.PopulateFrom.cs b/src/DynamicData/Cache/ObservableCacheEx.PopulateFrom.cs index 24d4d407e..ad571e2c4 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.PopulateFrom.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.PopulateFrom.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,20 +21,21 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The to operate on. - /// The that emits batches of items. + /// The ISourceCache<TObject, TKey> to operate on. + /// The IObservable<IEnumerable<TObject>> that emits batches of items. /// An that, when disposed, unsubscribes from . /// - /// Each emission from is passed to , producing one changeset per emission containing Add or Update events for each item. Errors from propagate and terminate the subscription. Completion ends the subscription; the cache retains all items. + /// Each emission from is passed to AddOrUpdate<TObject, TKey>(ISourceCache<TObject, TKey>, IEnumerable<TObject>), producing one changeset per emission containing Add or Update events for each item. Errors from propagate and terminate the subscription. Completion ends the subscription; the cache retains all items. /// /// or is . - /// - /// + /// PopulateInto<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, ISourceCache<TObject, TKey>) + /// ToObservableChangeSet<TObject, TKey>(IObservable<IEnumerable<TObject>>, Func<TObject, TKey>, Func<TObject, TimeSpan?>, int, IScheduler?) public static IDisposable PopulateFrom(this ISourceCache source, IObservable> observable) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observable); return observable.Subscribe(source.AddOrUpdate); } @@ -53,15 +45,16 @@ public static IDisposable PopulateFrom(this ISourceCache /// The type of the object. /// The type of the key. - /// The to operate on. - /// The that emits individual items. + /// The ISourceCache<TObject, TKey> to operate on. + /// The IObservable<TObject> that emits individual items. /// An that, when disposed, unsubscribes from . /// or is . public static IDisposable PopulateFrom(this ISourceCache source, IObservable observable) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observable); return observable.Subscribe(source.AddOrUpdate); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.PopulateInto.cs b/src/DynamicData/Cache/ObservableCacheEx.PopulateInto.cs index d5ce99d73..eea3046b4 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.PopulateInto.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.PopulateInto.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,8 +28,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to pipe into a target cache. - /// The that will receive the changes. + /// The source IObservable<IChangeSet<TObject, TKey>> to pipe into a target cache. + /// The ISourceCache<TObject, TKey> that will receive the changes. /// An that, when disposed, unsubscribes from the source. /// /// @@ -48,43 +46,53 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// - /// + /// PopulateFrom<TObject, TKey>(ISourceCache<TObject, TKey>, IObservable<IEnumerable<TObject>>) + /// AsObservableCache<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, bool) + /// ObservableListEx.PopulateInto<T>(IObservable<IChangeSet<T>>, ISourceList<T>) public static IDisposable PopulateInto(this IObservable> source, ISourceCache destination) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); return source.Subscribe(changes => destination.Edit(updater => updater.Clone(changes))); } - /// - /// The source to pipe into a target cache. - /// The that will receive the changes. - /// Overload that targets an . + /// + /// Provides an overload of PopulateInto for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to pipe into a target cache. + /// The IIntermediateCache<TObject, TKey> that will receive the changes. + /// The resulting observable sequence. + /// Overload that targets an IIntermediateCache<TObject, TKey>. public static IDisposable PopulateInto(this IObservable> source, IIntermediateCache destination) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); return source.Subscribe(changes => destination.Edit(updater => updater.Clone(changes))); } - /// - /// The source to pipe into a target cache. - /// The that will receive the changes. - /// Overload that targets a . + /// + /// Provides an overload of PopulateInto for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to pipe into a target cache. + /// The LockFreeObservableCache<TObject, TKey> that will receive the changes. + /// The resulting observable sequence. + /// Overload that targets a LockFreeObservableCache<TObject, TKey>. public static IDisposable PopulateInto(this IObservable> source, LockFreeObservableCache destination) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); return source.Subscribe(changes => destination.Edit(updater => updater.Clone(changes))); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.QueryWhenChanged.cs b/src/DynamicData/Cache/ObservableCacheEx.QueryWhenChanged.cs index f294f119c..ce3e853d0 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.QueryWhenChanged.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.QueryWhenChanged.cs @@ -1,24 +1,27 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,22 +35,22 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the destination. - /// The source to project on each change. - /// A function that projects the current snapshot to a result value. + /// The source IObservable<IChangeSet<TObject, TKey>> to project on each change. + /// A function that projects the current IQuery<TObject, TKey> snapshot to a result value. /// An observable that emits a projected value after each changeset. /// - /// Worth noting: The selector is called on every changeset, which can be chatty. The exposes the full cache state for LINQ-style queries. + /// Worth noting: The selector is called on every changeset, which can be chatty. The IQuery<TObject, TKey> exposes the full cache state for LINQ-style queries. /// /// or is . - /// - /// - /// + /// ToCollection<TObject, TKey> + /// ToSortedCollection<TObject, TKey, TSortKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TSortKey>, SortDirection) + /// ObservableListEx.QueryWhenChanged public static IObservable QueryWhenChanged(this IObservable> source, Func, TDestination> resultSelector) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.QueryWhenChanged().Select(resultSelector); } @@ -57,14 +60,14 @@ public static IObservable QueryWhenChanged /// The type of the object. /// The type of the key. - /// The source to project on each change. + /// The source IObservable<IChangeSet<TObject, TKey>> to project on each change. /// An observable which emits the query. /// source. public static IObservable> QueryWhenChanged(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new QueryWhenChanged(source).Run(); } @@ -75,16 +78,16 @@ public static IObservable> QueryWhenChanged /// The type of the object. /// The type of the key. /// The type of the value. - /// The source to project on each change. - /// A that should the query be triggered for observables on individual items. + /// The source IObservable<IChangeSet<TObject, TKey>> to project on each change. + /// A Func<T, TResult> that should the query be triggered for observables on individual items. /// An observable that emits the query. /// source. public static IObservable> QueryWhenChanged(this IObservable> source, Func> itemChangedTrigger) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - itemChangedTrigger.ThrowArgumentNullExceptionIfNull(nameof(itemChangedTrigger)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(itemChangedTrigger); return new QueryWhenChanged(source, itemChangedTrigger).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.RefCount.cs b/src/DynamicData/Cache/ObservableCacheEx.RefCount.cs index 66c8315b5..f0aa881e9 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.RefCount.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.RefCount.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,14 +29,14 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to share via reference counting. + /// The source IObservable<IChangeSet<TObject, TKey>> to share via reference counting. /// A ref-counted observable changeset stream. - /// + /// AsObservableCache<TObject,TKey>(IObservable<IChangeSet<TObject, TKey>>, bool) public static IObservable> RefCount(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new RefCount(source).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Refresh.cs b/src/DynamicData/Cache/ObservableCacheEx.Refresh.cs index 4e9947f28..428eb4ea6 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Refresh.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Refresh.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,19 +21,19 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The to signal re-evaluation on. + /// The ISourceCache<TObject, TKey> to signal re-evaluation on. /// The item to refresh. /// - /// Convenience method that wraps a Refresh inside . A Refresh does not change data in the cache; it signals downstream operators (such as or ) to re-evaluate the item. + /// Convenience method that wraps a Refresh inside ISourceCache<TObject,TKey>.Edit. A Refresh does not change data in the cache; it signals downstream operators (such as Filter<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, bool>, bool) or Sort<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, SortOptimisations, int)) to re-evaluate the item. /// /// is . - /// - /// + /// AutoRefresh<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TimeSpan?, TimeSpan?, IScheduler?) + /// SuppressRefresh<TObject, TKey> public static void Refresh(this ISourceCache source, TObject item) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Refresh(item)); } @@ -52,14 +43,14 @@ public static void Refresh(this ISourceCache sourc /// /// The type of the object. /// The type of the key. - /// The to signal re-evaluation on. - /// The of items to refresh. + /// The ISourceCache<TObject, TKey> to signal re-evaluation on. + /// The IEnumerable<TObject> of items to refresh. /// is . public static void Refresh(this ISourceCache source, IEnumerable items) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Refresh(items)); } @@ -69,13 +60,13 @@ public static void Refresh(this ISourceCache sourc /// /// The type of the object. /// The type of the key. - /// The to signal re-evaluation on. + /// The ISourceCache<TObject, TKey> to signal re-evaluation on. /// is . public static void Refresh(this ISourceCache source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Refresh()); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Remove.cs b/src/DynamicData/Cache/ObservableCacheEx.Remove.cs index d835ff00b..f82c2e02f 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Remove.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Remove.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,20 +21,20 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The from which to remove items. + /// The ISourceCache<TObject, TKey> from which to remove items. /// The item to remove. /// - /// Convenience method that wraps a single-item removal inside . The key is extracted from the item using the cache's key selector. + /// Convenience method that wraps a single-item removal inside ISourceCache<TObject,TKey>.Edit. The key is extracted from the item using the cache's key selector. /// /// is . - /// - /// - /// + /// AddOrUpdate<TObject, TKey>(ISourceCache<TObject, TKey>, TObject) + /// Clear<TObject, TKey>(ISourceCache<TObject, TKey>) + /// RemoveKeys<TObject, TKey>(ISourceCache<TObject, TKey>, IEnumerable<TKey>) public static void Remove(this ISourceCache source, TObject item) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Remove(item)); } @@ -53,14 +44,14 @@ public static void Remove(this ISourceCache source /// /// The type of the object. /// The type of the key. - /// The from which to remove items. + /// The ISourceCache<TObject, TKey> from which to remove items. /// The key of the item to remove. /// is . public static void Remove(this ISourceCache source, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Remove(key)); } @@ -71,14 +62,14 @@ public static void Remove(this ISourceCache source /// /// The type of the object. /// The type of the key. - /// The from which to remove items. - /// The of items to remove. + /// The ISourceCache<TObject, TKey> from which to remove items. + /// The IEnumerable<TObject> of items to remove. /// is . public static void Remove(this ISourceCache source, IEnumerable items) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Remove(items)); } @@ -89,40 +80,48 @@ public static void Remove(this ISourceCache source /// /// The type of the object. /// The type of the key. - /// The from which to remove items. - /// The keys to remove. + /// The ISourceCache<TObject, TKey> from which to remove items. + /// The IEnumerable<TKey> keys to remove. /// is . public static void Remove(this ISourceCache source, IEnumerable keys) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Remove(keys)); } - /// - /// The from which to remove items. + /// + /// Provides an overload of Remove for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The IIntermediateCache<TObject, TKey> from which to remove items. /// The key of the item to remove. - /// Overload that targets an . + /// Overload that targets an IIntermediateCache<TObject, TKey>. public static void Remove(this IIntermediateCache source, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Remove(key)); } - /// - /// The from which to remove items. - /// The keys to remove. - /// Overload that targets an . + /// + /// Provides an overload of Remove for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The IIntermediateCache<TObject, TKey> from which to remove items. + /// The IEnumerable<TKey> keys to remove. + /// Overload that targets an IIntermediateCache<TObject, TKey>. public static void Remove(this IIntermediateCache source, IEnumerable keys) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.Remove(keys)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.RemoveKey.cs b/src/DynamicData/Cache/ObservableCacheEx.RemoveKey.cs index 6e9f3ecd6..b6c243e66 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.RemoveKey.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.RemoveKey.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,20 +24,20 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Strips the key from a cache changeset, converting to - /// (list changeset). All indexed changes are dropped (sorting is not supported). + /// Strips the key from a cache changeset, converting IChangeSet<TObject, TKey> to + /// IChangeSet<TObject> (list changeset). All indexed changes are dropped (sorting is not supported). /// /// The type of the object. /// The type of the key. - /// The source to strip keys from, producing an unkeyed list changeset. + /// The source IObservable<IChangeSet<TObject, TKey>> to strip keys from, producing an unkeyed list changeset. /// A list changeset stream without key information. - /// - /// + /// ObservableListEx.AddKey<TObject, TKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TKey>) + /// ChangeKey<TObject, TSourceKey, TDestinationKey>(IObservable<IChangeSet<TObject, TSourceKey>>, Func<TObject, TDestinationKey>) public static IObservable> RemoveKey(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Select( changes => @@ -54,14 +52,14 @@ public static IObservable> RemoveKey(this IOb /// /// The type of the object. /// The type of the key. - /// The from which to remove a key. + /// The ISourceCache<TObject, TKey> from which to remove a key. /// The key to remove. /// is . public static void RemoveKey(this ISourceCache source, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.RemoveKey(key)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.RemoveKeys.cs b/src/DynamicData/Cache/ObservableCacheEx.RemoveKeys.cs index 837bf45f3..a516f6290 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.RemoveKeys.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.RemoveKeys.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,14 +21,14 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The from which to remove keys. - /// The keys to remove. + /// The ISourceCache<TObject, TKey> from which to remove keys. + /// The IEnumerable<TKey> keys to remove. /// is . public static void RemoveKeys(this ISourceCache source, IEnumerable keys) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(updater => updater.RemoveKeys(keys)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.RightJoin.cs b/src/DynamicData/Cache/ObservableCacheEx.RightJoin.cs index 7bd66b375..188981ae0 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.RightJoin.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.RightJoin.cs @@ -1,54 +1,60 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the optional left and right values into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . - public static IObservable> RightJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TRight, TDestination> resultSelector) + /// + /// Provides an overload of RightJoin for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the optional left and right values into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to RightJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TRightKey, Optional<TLeft>, TRight, TDestination>). + public static IObservable> RightJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TRight, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return left.RightJoin(right, rightKeySelector, (_, leftValue, rightValue) => resultSelector(leftValue, rightValue)); } /// /// Joins two changeset streams, producing a result for every right-side key. The left side is - /// because a matching left item may or may not exist. All right items + /// Optional<T> because a matching left item may or may not exist. All right items /// appear in the output regardless. Equivalent to SQL RIGHT OUTER JOIN. /// /// The item type of the left source. @@ -56,17 +62,17 @@ public static IObservable> RightJoinThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the right key, optional left, and right value into a destination object. Example: (rightKey, left, right) => new Result(rightKey, left, right). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the right key, optional left, and right value into a destination object. Example: (rightKey, left, right) => new Result(rightKey, left, right). /// An observable changeset keyed by . /// /// /// Right-side change handling: /// /// EventBehavior - /// AddAlways emits. Invokes with the matching left (or ) and the right value. + /// AddAlways emits. Invokes with the matching left (or ReactiveUI.Primitives.Optional.None<T>) and the right value. /// UpdateRe-invokes the selector with current left (if any) and the new right value. /// RemoveRemoves the joined result. /// RefreshForwarded as Refresh on the joined result. @@ -85,21 +91,21 @@ public static IObservable> RightJoinBoth sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// - public static IObservable> RightJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TRight, TDestination> resultSelector) + /// InnerJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<ValueTuple<TLeftKey, TRightKey>, TLeft, TRight, TDestination>) + /// LeftJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, Optional<TRight>, TDestination>) + /// FullJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, Optional<TRight>, TDestination>) + /// RightJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + public static IObservable> RightJoin(this IObservable> left, IObservable> right, Func rightKeySelector, Func, TRight, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return new RightJoin(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.RightJoinMany.cs b/src/DynamicData/Cache/ObservableCacheEx.RightJoinMany.cs index cb6a5a924..0ac0a2ad1 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.RightJoinMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.RightJoinMany.cs @@ -1,47 +1,53 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the optional left value and the right group into a destination object. The key is not provided in this overload. - /// Overload that omits the key from the result selector. Delegates to . - public static IObservable> RightJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) + /// + /// Provides an overload of RightJoinMany for the supplied arguments. + /// + /// The type of the TLeft value. + /// The type of the TLeftKey value. + /// The type of the TRight value. + /// The type of the TRightKey value. + /// The type of the TDestination value. + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the optional left value and the right group into a destination object. The key is not provided in this overload. + /// The resulting observable sequence. + /// Overload that omits the key from the result selector. Delegates to RightJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>). + public static IObservable> RightJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return left.RightJoinMany(right, rightKeySelector, (_, leftValue, rightValue) => resultSelector(leftValue, rightValue)); } @@ -49,7 +55,7 @@ public static IObservable> RightJoinMany /// Groups right-side items by their mapped key, then right-joins each group to the left source. /// A result is produced for every key that has at least one right item. The left value is - /// because a matching left item may or may not exist. + /// Optional<T> because a matching left item may or may not exist. /// Equivalent to SQL RIGHT OUTER JOIN with the right side grouped. /// /// The item type of the left source. @@ -57,10 +63,10 @@ public static IObservable> RightJoinManyThe item type of the right source. /// The key type of the right source. /// The type produced by . - /// The left to join. - /// The right to join. - /// A that maps each right item to the left key it should join on. - /// A that combines the key, optional left value, and right group into a destination object. Example: (key, left, group) => new Result(key, left, group). + /// The left IObservable<IChangeSet<TLeft, TLeftKey>> to join. + /// The right IObservable<IChangeSet<TRight, TRightKey>> to join. + /// A Func<T, TResult> that maps each right item to the left key it should join on. + /// A Func<T, TResult> that combines the key, optional left value, and right group into a destination object. Example: (key, left, group) => new Result(key, left, group). /// An observable changeset keyed by . /// /// @@ -86,21 +92,21 @@ public static IObservable> RightJoinManyBoth sources are serialized through a shared lock held during downstream delivery. Avoid blocking operations in subscribers. /// /// Any argument is . - /// - /// - /// - /// - public static IObservable> RightJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) + /// RightJoin<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TRightKey, Optional<TLeft>, TRight, TDestination>) + /// InnerJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// LeftJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, TLeft, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + /// FullJoinMany<TLeft, TLeftKey, TRight, TRightKey, TDestination>(IObservable<IChangeSet<TLeft, TLeftKey>>, IObservable<IChangeSet<TRight, TRightKey>>, Func<TRight, TLeftKey>, Func<TLeftKey, Optional<TLeft>, IGrouping<TRight, TRightKey, TLeftKey>, TDestination>) + public static IObservable> RightJoinMany(this IObservable> left, IObservable> right, Func rightKeySelector, Func, IGrouping, TDestination> resultSelector) where TLeft : notnull where TLeftKey : notnull where TRight : notnull where TRightKey : notnull where TDestination : notnull { - left.ThrowArgumentNullExceptionIfNull(nameof(left)); - right.ThrowArgumentNullExceptionIfNull(nameof(right)); - rightKeySelector.ThrowArgumentNullExceptionIfNull(nameof(rightKeySelector)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(left); + ArgumentExceptionHelper.ThrowIfNull(right); + ArgumentExceptionHelper.ThrowIfNull(rightKeySelector); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return new RightJoinMany(left, right, rightKeySelector, resultSelector).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.SkipInitial.cs b/src/DynamicData/Cache/ObservableCacheEx.SkipInitial.cs index 6a2ed2db4..4f75bf341 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.SkipInitial.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.SkipInitial.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,16 +22,16 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to skip the initial changeset. + /// The source IObservable<IChangeSet<TObject, TKey>> to skip the initial changeset. /// An observable that skips the first changeset and forwards all others. /// is . - /// - /// + /// DeferUntilLoaded<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>) + /// StartWithEmpty<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>) public static IObservable> SkipInitial(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.DeferUntilLoaded().Skip(1); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Sort.cs b/src/DynamicData/Cache/ObservableCacheEx.Sort.cs index 87bccebe5..491d7f9c1 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Sort.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Sort.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,8 +28,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort. - /// The used to determine sort order. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort. + /// The IComparer<TObject> used to determine sort order. /// A that sort optimisation flags. Specify one or more sort optimisations. /// The number of updates before the entire list is resorted (rather than inline sort). /// An observable which emits change sets. @@ -40,14 +38,14 @@ public static partial class ObservableCacheEx /// or /// comparer. /// - /// + /// ObservableListEx.Sort [Obsolete(Constants.SortIsObsolete)] public static IObservable> Sort(this IObservable> source, IComparer comparer, SortOptimisations sortOptimisations = SortOptimisations.None, int resetThreshold = DefaultSortResetThreshold) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparer); return new Sort(source, comparer, sortOptimisations, resetThreshold: resetThreshold).Run(); } @@ -57,8 +55,8 @@ public static IObservable> Sort(t /// /// The type of the object. /// The type of the key. - /// The source to sort. - /// The comparer observable. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort. + /// The IObservable<IComparer<TObject>> comparer observable. /// The sort optimisations. /// The reset threshold. /// An observable which emits change sets. @@ -67,8 +65,8 @@ public static IObservable> Sort(t where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparerObservable.ThrowArgumentNullExceptionIfNull(nameof(comparerObservable)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparerObservable); return new Sort(source, null, sortOptimisations, comparerObservable, resetThreshold: resetThreshold).Run(); } @@ -78,9 +76,9 @@ public static IObservable> Sort(t /// /// The type of the object. /// The type of the key. - /// The source to sort. - /// The comparer observable. - /// An that signals the algorithm to re-sort the entire data set. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort. + /// The IObservable<IComparer<TObject>> comparer observable. + /// An IObservable<Unit> that signals the algorithm to re-sort the entire data set. /// The sort optimisations. /// The reset threshold. /// An observable which emits change sets. @@ -89,8 +87,8 @@ public static IObservable> Sort(t where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparerObservable.ThrowArgumentNullExceptionIfNull(nameof(comparerObservable)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparerObservable); return new Sort(source, null, sortOptimisations, comparerObservable, resorter, resetThreshold).Run(); } @@ -100,9 +98,9 @@ public static IObservable> Sort(t /// /// The type of the object. /// The type of the key. - /// The source to sort. - /// The used to determine sort order. - /// An that signals the algorithm to re-sort the entire data set. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort. + /// The IComparer<TObject> used to determine sort order. + /// An IObservable<Unit> that signals the algorithm to re-sort the entire data set. /// The sort optimisations. /// The reset threshold. /// An observable which emits change sets. @@ -111,8 +109,8 @@ public static IObservable> Sort(t where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - resorter.ThrowArgumentNullExceptionIfNull(nameof(resorter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(resorter); return new Sort(source, comparer, sortOptimisations, null, resorter, resetThreshold).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.SortAndBind.cs b/src/DynamicData/Cache/ObservableCacheEx.SortAndBind.cs index 9f5e1444c..d10c90647 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.SortAndBind.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.SortAndBind.cs @@ -1,12 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Diagnostics.CodeAnalysis; using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -18,10 +26,10 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The output that will be populated with the sorted results. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the sorted results. /// An observable which will emit change sets. - /// Creates a and delegates to . + /// Creates a ReadOnlyObservableCollection<T> and delegates to Bind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey, PageContext<TObject>>>, IList<TObject>). public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable>> source, out ReadOnlyObservableCollection readOnlyObservableCollection) @@ -39,11 +47,11 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The output that will be populated with the sorted results. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the sorted results. /// The with default settings. /// An observable which will emit change sets. - /// Creates a and delegates to . + /// Creates a ReadOnlyObservableCollection<T> and delegates to Bind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey, PageContext<TObject>>>, IList<TObject>, SortAndBindOptions). public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable>> source, out ReadOnlyObservableCollection readOnlyObservableCollection, @@ -62,8 +70,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The to bind sorted results to. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The IList<TObject> to bind sorted results to. /// An observable which will emit change sets. /// This is the primary Bind overload for paged data. It applies paged changeset mutations directly to the target list. public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( @@ -78,8 +86,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The to bind sorted results to. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The IList<TObject> to bind sorted results to. /// The with default settings. /// An observable which will emit change sets. /// This overload accepts to control reset threshold behavior. @@ -96,10 +104,10 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The output that will be populated with the sorted results. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the sorted results. /// An observable which will emit change sets. - /// Creates a and delegates to . + /// Creates a ReadOnlyObservableCollection<T> and delegates to Bind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey, VirtualContext<TObject>>>, IList<TObject>). public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable>> source, out ReadOnlyObservableCollection readOnlyObservableCollection) @@ -117,11 +125,11 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The output that will be populated with the sorted results. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the sorted results. /// The with default settings. /// An observable which will emit change sets. - /// Creates a and delegates to . + /// Creates a ReadOnlyObservableCollection<T> and delegates to Bind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey, VirtualContext<TObject>>>, IList<TObject>, SortAndBindOptions). public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable>> source, out ReadOnlyObservableCollection readOnlyObservableCollection, @@ -140,8 +148,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The to bind sorted results to. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The IList<TObject> to bind sorted results to. /// An observable which will emit change sets. /// This is the primary Bind overload for virtualized data. It applies virtualized changeset mutations directly to the target list. public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( @@ -156,8 +164,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The to bind sorted results to. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The IList<TObject> to bind sorted results to. /// The with default settings. /// An observable which will emit change sets. /// This overload accepts to control reset threshold behavior. @@ -169,8 +177,15 @@ public static partial class ObservableCacheEx where TKey : notnull => new BindVirtualized(source, targetList, options).Run(); - /// - /// This overload uses for types implementing . + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The targetList value. + /// The resulting observable sequence. + /// This overload uses Comparer<T>.Default for types implementing IComparable<T>. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, IList targetList) @@ -178,8 +193,16 @@ public static partial class ObservableCacheEx where TKey : notnull => source.SortAndBind(targetList, DynamicDataOptions.SortAndBind); - /// - /// This overload uses for types implementing . + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The targetList value. + /// The options value. + /// The resulting observable sequence. + /// This overload uses Comparer<T>.Default for types implementing IComparable<T>. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, IList targetList, @@ -188,7 +211,15 @@ public static partial class ObservableCacheEx where TKey : notnull => source.SortAndBind(targetList, Comparer.Default, options); - /// + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The targetList value. + /// The comparer value. + /// The resulting observable sequence. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, IList targetList, @@ -204,9 +235,9 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The to bind sorted results to. Items are inserted, removed, and moved in-place to maintain sort order. - /// The that determines sort order. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The IList<TObject> to bind sorted results to. Items are inserted, removed, and moved in-place to maintain sort order. + /// The IComparer<TObject> that determines sort order. /// The controlling reset threshold and initial capacity. /// An observable which will emit change sets. /// @@ -225,17 +256,29 @@ public static partial class ObservableCacheEx /// /// Worth noting: Large batches may trigger a full list reset (clear + re-add) instead of incremental moves, controlled by . This fires CollectionChanged with Reset action, which can be more efficient for UI virtualization but causes a visual flicker. /// - /// + /// SortAndBind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IList<TObject>, IObservable<IComparer<TObject>>, SortAndBindOptions) public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, IList targetList, IComparer comparer, SortAndBindOptions options) where TObject : notnull - where TKey : notnull => - new SortAndBind(source, comparer, options, targetList).Run(); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); - /// + return new SortAndBind(source, comparer, options, targetList).Run(); + } + + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The targetList value. + /// The comparerChanged value. + /// The resulting observable sequence. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, IList targetList, @@ -250,9 +293,9 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to sort and bind. - /// The to bind sorted results to. Items are inserted, removed, and moved in-place to maintain sort order. - /// An that emits new comparers to re-sort with. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The IList<TObject> to bind sorted results to. Items are inserted, removed, and moved in-place to maintain sort order. + /// An IObservable<IComparer<TObject>> that emits new comparers to re-sort with. /// The controlling reset threshold and initial capacity. /// An observable which will emit change sets. /// @@ -271,7 +314,7 @@ public static partial class ObservableCacheEx /// /// Worth noting: No data is emitted until the comparer observable produces its first value. Large batches or comparer changes may trigger a full list reset depending on . /// - /// + /// SortAndBind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IList<TObject>, IComparer<TObject>, SortAndBindOptions) public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, IList targetList, @@ -281,8 +324,15 @@ public static partial class ObservableCacheEx where TKey : notnull => new SortAndBind(source, comparerChanged, options, targetList).Run(); - /// - /// This overload uses for types implementing . + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The readOnlyObservableCollection value. + /// The resulting observable sequence. + /// This overload uses Comparer<T>.Default for types implementing IComparable<T>. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection) @@ -290,8 +340,16 @@ public static partial class ObservableCacheEx where TKey : notnull => source.SortAndBind(out readOnlyObservableCollection, Comparer.Default, DynamicDataOptions.SortAndBind); - /// - /// This overload uses for types implementing . + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The readOnlyObservableCollection value. + /// The options value. + /// The resulting observable sequence. + /// This overload uses Comparer<T>.Default for types implementing IComparable<T>. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, @@ -300,7 +358,15 @@ public static partial class ObservableCacheEx where TKey : notnull => source.SortAndBind(out readOnlyObservableCollection, Comparer.Default, options); - /// + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The readOnlyObservableCollection value. + /// The comparer value. + /// The resulting observable sequence. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, @@ -309,11 +375,16 @@ public static partial class ObservableCacheEx where TKey : notnull => source.SortAndBind(out readOnlyObservableCollection, comparer, DynamicDataOptions.SortAndBind); - /// - /// The source to sort and bind. - /// The output that will be populated with the sorted results. - /// The that determines sort order. + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the sorted results. + /// The IComparer<TObject> that determines sort order. /// The controlling reset threshold and initial capacity. + /// The resulting observable sequence. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, @@ -322,6 +393,8 @@ public static partial class ObservableCacheEx where TObject : notnull where TKey : notnull { + ArgumentExceptionHelper.ThrowIfNull(source); + // allow options to set initial capacity for efficiency var observableCollection = options.InitialCapacity > 0 ? new ObservableCollectionExtended(new List(options.InitialCapacity)) @@ -332,7 +405,15 @@ public static partial class ObservableCacheEx return new SortAndBind(source, comparer, options, observableCollection).Run(); } - /// + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The readOnlyObservableCollection value. + /// The comparerChanged value. + /// The resulting observable sequence. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, @@ -341,11 +422,16 @@ public static partial class ObservableCacheEx where TKey : notnull => source.SortAndBind(out readOnlyObservableCollection, comparerChanged, DynamicDataOptions.SortAndBind); - /// - /// The source to sort and bind. - /// The output that will be populated with the sorted results. - /// An that emits new comparers to re-sort with. + /// + /// Provides an overload of SortAndBind for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort and bind. + /// The output ReadOnlyObservableCollection<TObject> that will be populated with the sorted results. + /// An IObservable<IComparer<TObject>> that emits new comparers to re-sort with. /// The controlling reset threshold and initial capacity. + /// The resulting observable sequence. public static IObservable> SortAndBind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TObject, TKey>( this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, diff --git a/src/DynamicData/Cache/ObservableCacheEx.SortBy.cs b/src/DynamicData/Cache/ObservableCacheEx.SortBy.cs index 2834f6084..0c87d051d 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.SortBy.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.SortBy.cs @@ -1,24 +1,24 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,13 +27,13 @@ public static partial class ObservableCacheEx { /// /// Sorts the changeset stream by the value returned from . Creates a comparer internally - /// and delegates to . + /// and delegates to Sort<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, SortOptimisations, int). /// Since Sort is obsolete, prefer SortAndBind for new code. /// /// The type of the object. /// The type of the key. - /// The source to sort. - /// A that expression that selects a comparable value from each item. + /// The source IObservable<IChangeSet<TObject, TKey>> to sort. + /// A Func<T, TResult> that expression that selects a comparable value from each item. /// The sort direction. Defaults to ascending. /// A that sort optimization flags. /// The number of updates before the entire list is re-sorted (rather than inline sort). @@ -50,13 +50,14 @@ public static IObservable> SortBy source = source ?? throw new ArgumentNullException(nameof(source)); expression = expression ?? throw new ArgumentNullException(nameof(expression)); - return source.Sort( + return new Sort( + source, sortOrder switch { SortDirection.Descending => SortExpressionComparer.Descending(expression), _ => SortExpressionComparer.Ascending(expression), }, sortOptimisations, - resetThreshold); + resetThreshold: resetThreshold).Run(); } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.StartWithEmpty.cs b/src/DynamicData/Cache/ObservableCacheEx.StartWithEmpty.cs index 8960f03aa..e93578868 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.StartWithEmpty.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.StartWithEmpty.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,65 +29,118 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to prepend an empty changeset to. + /// The source IObservable<IChangeSet<TObject, TKey>> to prepend an empty changeset to. /// An observable that emits an empty changeset first, then all source changesets. - /// + /// ObservableListEx.StartWithEmpty<T>(IObservable<IChangeSet<T>>) public static IObservable> StartWithEmpty(this IObservable> source) where TObject : notnull - where TKey : notnull => source.StartWith(ChangeSet.Empty); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(ChangeSet.Empty); + } - /// - /// The source to prepend an empty changeset to. + /// + /// Provides an overload of StartWithEmpty for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to prepend an empty changeset to. /// An observable that emits an empty sorted changeset first, then all source changesets. - /// Overload for . + /// Overload for ISortedChangeSet<TObject, TKey>. public static IObservable> StartWithEmpty(this IObservable> source) where TObject : notnull - where TKey : notnull => source.StartWith(SortedChangeSet.Empty); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); - /// - /// The source to prepend an empty changeset to. + return source.StartWith(SortedChangeSet.Empty); + } + + /// + /// Provides an overload of StartWithEmpty for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IVirtualChangeSet<TObject, TKey>> to prepend an empty changeset to. /// An observable that emits an empty virtual changeset first, then all source changesets. - /// Overload for . + /// Overload for IVirtualChangeSet<TObject, TKey>. public static IObservable> StartWithEmpty(this IObservable> source) where TObject : notnull - where TKey : notnull => source.StartWith(VirtualChangeSet.Empty); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(VirtualChangeSet.Empty); + } - /// - /// The source to prepend an empty changeset to. + /// + /// Provides an overload of StartWithEmpty for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IPagedChangeSet<TObject, TKey>> to prepend an empty changeset to. /// An observable that emits an empty paged changeset first, then all source changesets. - /// Overload for . + /// Overload for IPagedChangeSet<TObject, TKey>. public static IObservable> StartWithEmpty(this IObservable> source) where TObject : notnull - where TKey : notnull => source.StartWith(PagedChangeSet.Empty); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(PagedChangeSet.Empty); + } - /// + /// + /// Provides an overload of StartWithEmpty for the supplied arguments. + /// /// The type of the object. /// The type of the key. /// The grouping key type. - /// The source to prepend an empty changeset to. + /// The source IObservable<IGroupChangeSet<TObject, TKey, TGroupKey>> to prepend an empty changeset to. /// An observable that emits an empty group changeset first, then all source changesets. - /// Overload for . + /// Overload for IGroupChangeSet<TObject, TKey, TGroupKey>. public static IObservable> StartWithEmpty(this IObservable> source) where TObject : notnull where TKey : notnull - where TGroupKey : notnull => source.StartWith(GroupChangeSet.Empty); + where TGroupKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(GroupChangeSet.Empty); + } - /// + /// + /// Provides an overload of StartWithEmpty for the supplied arguments. + /// /// The type of the object. /// The type of the key. /// The grouping key type. - /// The source to prepend an empty changeset to. + /// The source IObservable<IImmutableGroupChangeSet<TObject, TKey, TGroupKey>> to prepend an empty changeset to. /// An observable that emits an empty immutable group changeset first, then all source changesets. - /// Overload for . + /// Overload for IImmutableGroupChangeSet<TObject, TKey, TGroupKey>. public static IObservable> StartWithEmpty(this IObservable> source) where TObject : notnull where TKey : notnull - where TGroupKey : notnull => source.StartWith(ImmutableGroupChangeSet.Empty); + where TGroupKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(ImmutableGroupChangeSet.Empty); + } - /// + /// + /// Provides an overload of StartWithEmpty for the supplied arguments. + /// /// The type of the item. - /// The source of to prepend an empty changeset to. + /// The source IObservable<T> of IReadOnlyCollection<T> to prepend an empty changeset to. /// An observable that emits an empty collection first, then all source collections. - /// Overload for . - public static IObservable> StartWithEmpty(this IObservable> source) => source.StartWith(ReadOnlyCollectionLight.Empty); + /// Overload for IReadOnlyCollection<T>. + public static IObservable> StartWithEmpty(this IObservable> source) + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(ReadOnlyCollectionLight.Empty); + } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.StartWithItem.cs b/src/DynamicData/Cache/ObservableCacheEx.StartWithItem.cs index 560f53723..b38ee99e5 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.StartWithItem.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.StartWithItem.cs @@ -1,39 +1,35 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// The source to prepend an initial item to. - /// The item to prepend. The key is extracted from . - /// Overload for items that implement . Delegates to the explicit key overload. + /// + /// Provides an overload of StartWithItem for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to prepend an initial item to. + /// The item to prepend. The key is extracted from IKey<TKey>.Key. + /// The resulting observable sequence. + /// Overload for items that implement IKey<TKey>. Delegates to the explicit key overload. public static IObservable> StartWithItem(this IObservable> source, TObject item) where TObject : IKey where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.StartWithItem(item, item.Key); } @@ -44,7 +40,7 @@ public static IObservable> StartWithItem /// The type of the object. /// The type of the key. - /// The source to prepend an initial item to. + /// The source IObservable<IChangeSet<TObject, TKey>> to prepend an initial item to. /// The item to prepend. /// The key for the item. /// An observable that emits a single-item Add changeset first, then all source changesets. @@ -52,7 +48,7 @@ public static IObservable> StartWithItem(ChangeReason.Add, key, item); return source.StartWith(new ChangeSet { change }); diff --git a/src/DynamicData/Cache/ObservableCacheEx.SubscribeMany.cs b/src/DynamicData/Cache/ObservableCacheEx.SubscribeMany.cs index 4149907ba..ae6524d96 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.SubscribeMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.SubscribeMany.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,7 +30,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to create a subscription for each item in. + /// The source IObservable<IChangeSet<TObject, TKey>> to create a subscription for each item in. /// A factory that creates an for each item. Called on Add and Update (for the new value). /// A stream that forwards all changesets from unchanged. /// @@ -47,8 +45,8 @@ public static partial class ObservableCacheEx /// /// /// - /// Internally implemented using - /// and , so disposal semantics match . + /// Internally implemented using Transform<TDestination,TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Func<TObject,TKey,TDestination>, bool) + /// and DisposeMany<TObject,TKey>, so disposal semantics match DisposeMany<TObject,TKey>. /// /// /// Use this to tie per-item side effects (event subscriptions, polling timers, child observable subscriptions) @@ -56,29 +54,34 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// - /// + /// DisposeMany<TObject,TKey> + /// OnItemRemoved<TObject,TKey>(IObservable<IChangeSet<TObject,TKey>>, Action<TObject,TKey>, bool) + /// ObservableListEx.SubscribeMany public static IObservable> SubscribeMany(this IObservable> source, Func subscriptionFactory) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - subscriptionFactory.ThrowArgumentNullExceptionIfNull(nameof(subscriptionFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(subscriptionFactory); return new SubscribeMany(source, subscriptionFactory).Run(); } - /// - /// The source to create a subscription for each item in. + /// + /// Provides an overload of SubscribeMany for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to create a subscription for each item in. /// A factory that creates an for each item. Receives the item and its key. - /// Overload whose factory receives both the item and the key. See for full details. + /// The resulting observable sequence. + /// Overload whose factory receives both the item and the key. See SubscribeMany<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IDisposable>) for full details. public static IObservable> SubscribeMany(this IObservable> source, Func subscriptionFactory) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - subscriptionFactory.ThrowArgumentNullExceptionIfNull(nameof(subscriptionFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(subscriptionFactory); return new SubscribeMany(source, subscriptionFactory).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.SuppressRefresh.cs b/src/DynamicData/Cache/ObservableCacheEx.SuppressRefresh.cs index 452c4ea0d..b34449f3b 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.SuppressRefresh.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.SuppressRefresh.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,7 +21,7 @@ public static partial class ObservableCacheEx /// /// The object of the change set. /// The key of the change set. - /// The source to strip refresh events. + /// The source IObservable<IChangeSet<TObject, TKey>> to strip refresh events. /// An observable which emits change sets. public static IObservable> SuppressRefresh(this IObservable> source) where TObject : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.Switch.cs b/src/DynamicData/Cache/ObservableCacheEx.Switch.cs index 9c5d06c9e..a27364d79 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Switch.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Switch.cs @@ -1,38 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// - /// An observable that emits instances. + /// + /// Provides an overload of Switch for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// An observable that emits IObservableCache<TObject, TKey> instances. + /// The resulting observable sequence. /// Overload that accepts observable caches. Internally calls Connect() on each cache and delegates to the changeset overload. public static IObservable> Switch(this IObservable> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Select(cache => cache.Connect()).Switch(); } @@ -43,7 +46,7 @@ public static IObservable> Switch(this /// /// The type of the object. /// The type of the key. - /// An of changeset streams. The operator subscribes to the latest inner stream. + /// An IObservable<T> of IObservable<T> changeset streams. The operator subscribes to the latest inner stream. /// A changeset stream reflecting the items from the most recently emitted inner source. /// /// On switch: Remove is emitted for all items from the previous source, then Add for all items from the new source. @@ -54,7 +57,7 @@ public static IObservable> Switch(this where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return new Switch(sources).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ToCollection.cs b/src/DynamicData/Cache/ObservableCacheEx.ToCollection.cs index 1871e4337..9894d06ce 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ToCollection.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ToCollection.cs @@ -1,24 +1,21 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,10 +27,27 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to materialize into a collection on each change. + /// The source IObservable<IChangeSet<TObject, TKey>> to materialize into a collection on each change. /// An observable which emits the read only collection. - /// + /// ObservableListEx.ToCollection<TObject>(IObservable<IChangeSet<TObject>>) public static IObservable> ToCollection(this IObservable> source) where TObject : notnull - where TKey : notnull => source.QueryWhenChanged(query => new ReadOnlyCollectionLight(query.Items)); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return Observable.Defer(() => + { + Cache? cache = null; + + return source.Select(changes => + { + cache ??= new Cache(changes.Count); + cache.Clone(changes); + + // Snapshot directly, without allocating a query wrapper for every change set. + return (IReadOnlyCollection)new ReadOnlyCollectionLight(cache.Items); + }); + }); + } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ToObservableChangeSet.cs b/src/DynamicData/Cache/ObservableCacheEx.ToObservableChangeSet.cs index f04d2c998..545805b7d 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ToObservableChangeSet.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ToObservableChangeSet.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,9 +23,9 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to convert into a keyed changeset stream. - /// A that selects the unique key for each item. - /// An optional that specifies per-item expiration time. Return for no expiration. + /// The source IObservable<TObject> to convert into a keyed changeset stream. + /// A Func<T, TResult> that selects the unique key for each item. + /// An optional Func<T, TResult> that specifies per-item expiration time. Return for no expiration. /// The maximum cache size. Oldest items are removed when exceeded. Use -1 for no limit. /// An optional for expiration timing. /// An observable changeset stream. @@ -48,8 +39,8 @@ public static IObservable> ToObservableChangeSet.Create( source: source, @@ -66,9 +57,9 @@ public static IObservable> ToObservableChangeSet /// The type of the object. /// The type of the key. - /// The source to convert into a keyed changeset stream. - /// A that selects the unique key for each item. - /// An optional that specifies per-item expiration time. Return for no expiration. + /// The source IObservable<IEnumerable<TObject>> to convert into a keyed changeset stream. + /// A Func<T, TResult> that selects the unique key for each item. + /// An optional Func<T, TResult> that specifies per-item expiration time. Return for no expiration. /// The maximum cache size. Oldest items are removed when exceeded. Use -1 for no limit. /// An optional for expiration timing. /// An observable changeset stream. @@ -82,8 +73,8 @@ public static IObservable> ToObservableChangeSet.Create( source: source, diff --git a/src/DynamicData/Cache/ObservableCacheEx.ToObservableOptional.cs b/src/DynamicData/Cache/ObservableCacheEx.ToObservableOptional.cs index 43d2c39eb..71190d3dd 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ToObservableOptional.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ToObservableOptional.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,37 +24,37 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Watches a single key in the source changeset stream, emitting Optional.Some(value) when the key - /// is present and when it is removed. Duplicate values are suppressed via . + /// Watches a single key in the source changeset stream, emitting ReactiveUI.Primitives.Optional.Some(value) when the key + /// is present and ReactiveUI.Primitives.Optional.None<T> when it is removed. Duplicate values are suppressed via . /// /// The type of the object. /// The type of the key. - /// The source to watch a single key in. + /// The source IObservable<IChangeSet<TObject, TKey>> to watch a single key in. /// The key to watch. - /// An that optional comparer to suppress duplicate emissions. Uses default equality if . - /// An observable of that reflects the presence or absence of the specified key. + /// An IEqualityComparer<TObject> that optional comparer to suppress duplicate emissions. Uses default equality if . + /// An observable of Optional<TObject> that reflects the presence or absence of the specified key. /// /// - /// Unlike , this emits None on removal + /// Unlike WatchValue<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey), this emits None on removal /// (rather than the removed value), making it possible to distinguish "key is absent" from "key has a value". /// /// /// EventBehavior - /// AddEmits Optional.Some(value) if the key was not previously tracked. - /// UpdateEmits Optional.Some(newValue) if the new value differs from the previous per . Otherwise suppressed. - /// RemoveEmits . - /// RefreshEmits Optional.Some(value) if the value differs from the last emission per . Otherwise suppressed. + /// AddEmits ReactiveUI.Primitives.Optional.Some(value) if the key was not previously tracked. + /// UpdateEmits ReactiveUI.Primitives.Optional.Some(newValue) if the new value differs from the previous per . Otherwise suppressed. + /// RemoveEmits ReactiveUI.Primitives.Optional.None<T>. + /// RefreshEmits ReactiveUI.Primitives.Optional.Some(value) if the value differs from the last emission per . Otherwise suppressed. /// /// Worth noting: No emission occurs if the key is not present at subscription time. To get an initial None when the key is absent, use the overload with initialOptionalWhenMissing: true. /// /// is . - /// - /// - public static IObservable> ToObservableOptional(this IObservable> source, TKey key, IEqualityComparer? equalityComparer = null) + /// Watch<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey) + /// WatchValue<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey) + public static IObservable> ToObservableOptional(this IObservable> source, TKey key, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new ToObservableOptional(source, key, equalityComparer).Run(); } @@ -66,29 +64,65 @@ public static IObservable> ToObservableOptional /// /// The type of the object. /// The type of the key. - /// The source to watch a single key in. + /// The source IObservable<IChangeSet<TObject, TKey>> to watch a single key in. /// The key value. - /// When , emits an initial with no value if the key is not present in the cache. - /// An optional instance used to determine if an object value has changed. + /// When , emits an initial Optional<TObject> with no value if the key is not present in the cache. + /// An optional IEqualityComparer<TObject> instance used to determine if an object value has changed. /// An observable optional. /// source is null. /// - /// Worth noting: Uses lock-based coordination. If the key exists synchronously on Connect(), the initial None may or may not be emitted depending on timing. + /// Worth noting: The initial None is emitted only if the source subscription has not already synchronously produced a value for the key. /// - public static IObservable> ToObservableOptional(this IObservable> source, TKey key, bool initialOptionalWhenMissing, IEqualityComparer? equalityComparer = null) + public static IObservable> ToObservableOptional(this IObservable> source, TKey key, bool initialOptionalWhenMissing, IEqualityComparer? equalityComparer = null) where TObject : notnull where TKey : notnull { + ArgumentExceptionHelper.ThrowIfNull(source); + if (initialOptionalWhenMissing) { - return Observable.Defer(() => + return Observable.Create>(observer => { - var seenValue = false; - return source.ToObservableOptional(key, equalityComparer) - .Do(_ => seenValue = true) - .Merge(Observable.Defer(() => seenValue - ? Observable.Empty>() - : Observable.Return(Optional.None()))); + var queue = new DeliveryQueue>(observer); + var hasEmitted = false; + var subscription = source.ToObservableOptional(key, equalityComparer).Subscribe( + value => + { + using var scope = queue.AcquireLock(); + hasEmitted = true; + scope.EnqueueNext(value); + }, + error => + { + using var scope = queue.AcquireLock(); + scope.EnqueueError(error); + }, + () => + { + using var scope = queue.AcquireLock(); + if (!hasEmitted) + { + hasEmitted = true; + scope.EnqueueNext(ReactiveUI.Primitives.Optional.None); + } + + scope.EnqueueCompleted(); + }); + + using (var scope = queue.AcquireLock()) + { + if (!hasEmitted) + { + hasEmitted = true; + scope.EnqueueNext(ReactiveUI.Primitives.Optional.None); + } + } + + return Disposable.Create(() => + { + queue.Dispose(); + subscription.Dispose(); + }); }); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.ToSortedCollection.cs b/src/DynamicData/Cache/ObservableCacheEx.ToSortedCollection.cs index 81770d625..3bc8779d1 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.ToSortedCollection.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.ToSortedCollection.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,11 +29,11 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The sort key. - /// The source to materialize into a sorted collection on each change. - /// The sort function. + /// The source IObservable<IChangeSet<TObject, TKey>> to materialize into a sorted collection on each change. + /// The Func<TObject, TSortKey> sort function. /// The sort order. Defaults to ascending. /// An observable which emits the read only collection. - /// + /// ObservableListEx.ToSortedCollection<TObject, TSortKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TSortKey>, SortDirection) public static IObservable> ToSortedCollection(this IObservable> source, Func sort, SortDirection sortOrder = SortDirection.Ascending) where TObject : notnull where TKey : notnull @@ -46,8 +44,8 @@ public static IObservable> ToSortedCollection /// The type of the object. /// The type of the key. - /// The source to materialize into a sorted collection on each change. - /// The sort comparer. + /// The source IObservable<IChangeSet<TObject, TKey>> to materialize into a sorted collection on each change. + /// The IComparer<TObject> sort comparer. /// An observable which emits the read only collection. public static IObservable> ToSortedCollection(this IObservable> source, IComparer comparer) where TObject : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.Transform.cs b/src/DynamicData/Cache/ObservableCacheEx.Transform.cs index 8319591d0..87666bc4d 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Transform.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Transform.cs @@ -1,92 +1,135 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. /// This overload accepts a bool transformOnRefresh flag. When , Refresh changes cause re-transformation (emitted as Update). The factory receives only the current item. - /// + /// ObservableListEx.Transform public static IObservable> Transform(this IObservable> source, Func transformFactory, bool transformOnRefresh) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((current, _, _) => transformFactory(current), transformOnRefresh); } - /// + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. /// This overload accepts a bool transformOnRefresh flag. When , Refresh changes cause re-transformation (emitted as Update). The factory receives the current item and key. public static IObservable> Transform(this IObservable> source, Func transformFactory, bool transformOnRefresh) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((current, _, key) => transformFactory(current, key), transformOnRefresh); } - /// + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. /// This overload accepts a bool transformOnRefresh flag. When , Refresh changes cause re-transformation (emitted as Update). - public static IObservable> Transform(this IObservable> source, Func, TKey, TDestination> transformFactory, bool transformOnRefresh) + public static IObservable> Transform(this IObservable> source, Func, TKey, TDestination> transformFactory, bool transformOnRefresh) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new Transform(source, transformFactory, transformOnRefresh: transformOnRefresh).Run(); } - /// + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload accepts an optional forceTransform predicate filtering by source item only (without the key). The factory receives only the current item. public static IObservable> Transform(this IObservable> source, Func transformFactory, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((current, _, _) => transformFactory(current), forceTransform?.ForForced()); } - /// + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload accepts an optional forceTransform predicate filtering by source item and key. The factory receives the current item and key. public static IObservable> Transform(this IObservable> source, Func transformFactory, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((current, _, key) => transformFactory(current, key), forceTransform); } @@ -97,8 +140,8 @@ public static IObservable> TransformThe type of the transformed items. /// The type of the source items. /// The type of the key. - /// The source to transform. - /// The that produces a from the current source item, the previous source item (if any), and the key. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform. + /// The Func<TSource, Optional<TSource>, TKey, TDestination> that produces a from the current source item, the previous source item (if any), and the key. /// An observable that, when it emits a predicate, re-transforms all items for which the predicate returns . Re-transformed items are emitted as changes. If , no forced re-transforms occur. /// An observable changeset of transformed items. /// @@ -120,22 +163,22 @@ public static IObservable> Transform /// - /// Factory exceptions propagate as , terminating the stream. - /// Use + /// Factory exceptions propagate as IObserver<T>.OnError, terminating the stream. + /// Use TransformSafe<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, Action<Error<TSource, TKey>>, IObservable<Func<TSource, TKey, bool>>?) /// to catch factory errors without killing the stream. /// /// - /// - /// - /// + /// TransformSafe<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, Action<Error<TSource, TKey>>, IObservable<Func<TSource, TKey, bool>>?) + /// TransformAsync<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, Task<TDestination>>, IObservable<Func<TSource, TKey, bool>>?) + /// TransformImmutable<TDestination, TSource, TKey> /// or is . - public static IObservable> Transform(this IObservable> source, Func, TKey, TDestination> transformFactory, IObservable>? forceTransform = null) + public static IObservable> Transform(this IObservable> source, Func, TKey, TDestination> transformFactory, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); if (forceTransform is not null) { return new TransformWithForcedTransform(source, transformFactory, forceTransform).Run(); @@ -144,37 +187,64 @@ public static IObservable> Transform(source, transformFactory).Run(); } - /// - /// This overload accepts of to force re-transformation of ALL items when the observable emits. The factory receives only the current item. + /// + /// Provides an overload of ForForced for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. + /// This overload accepts IObservable<T> of to force re-transformation of ALL items when the observable emits. The factory receives only the current item. public static IObservable> Transform(this IObservable> source, Func transformFactory, IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull => source.Transform((cur, _, _) => transformFactory(cur), forceTransform.ForForced()); - /// - /// This overload accepts of to force re-transformation of ALL items when the observable emits. The factory receives the current item and key. + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. + /// This overload accepts IObservable<T> of to force re-transformation of ALL items when the observable emits. The factory receives the current item and key. public static IObservable> Transform(this IObservable> source, Func transformFactory, IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - forceTransform.ThrowArgumentNullExceptionIfNull(nameof(forceTransform)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(forceTransform); return source.Transform((cur, _, key) => transformFactory(cur, key), forceTransform.ForForced()); } - /// - /// This overload accepts of to force re-transformation of ALL items when the observable emits. - public static IObservable> Transform(this IObservable> source, Func, TKey, TDestination> transformFactory, IObservable forceTransform) + /// + /// Provides an overload of Transform for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. + /// This overload accepts IObservable<T> of to force re-transformation of ALL items when the observable emits. + public static IObservable> Transform(this IObservable> source, Func, TKey, TDestination> transformFactory, IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - forceTransform.ThrowArgumentNullExceptionIfNull(nameof(forceTransform)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(forceTransform); return source.Transform(transformFactory, forceTransform.ForForced()); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformAsync.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformAsync.cs index 5e76e6cb8..5a02c3aba 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformAsync.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformAsync.cs @@ -1,46 +1,62 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// + /// + /// Provides an overload of TransformAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload takes a simpler factory that receives only the current item. - /// + /// ObservableListEx.TransformAsync [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync(this IObservable> source, Func> transformFactory, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.TransformAsync((current, _, _) => transformFactory(current), forceTransform); } - /// + /// + /// Provides an overload of TransformAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload takes a factory that receives the current item and key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync(this IObservable> source, Func> transformFactory, IObservable>? forceTransform = null) @@ -48,35 +64,35 @@ public static IObservable> TransformAsync transformFactory(current, key), forceTransform); } - /// + /// /// This overload takes a factory that receives the current item the previous item and key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformAsync(this IObservable> source, Func, TKey, Task> transformFactory, IObservable>? forceTransform = null) + public static IObservable> TransformAsync(this IObservable> source, Func, TKey, Task> transformFactory, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.TransformAsync((current, previous, key, _) => transformFactory(current, previous, key), forceTransform); } /// - /// Async version of . - /// Projects each item using an async factory that returns . + /// Async version of Transform<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, IObservable<Func<TSource, TKey, bool>>?). + /// Projects each item using an async factory that returns Task<TResult>. /// /// The type of the transformed items. /// The type of the source items. /// The type of the key. - /// The source to transform asynchronously. - /// The async function that produces a from the current source item, the previous source item (if any), and the key. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform asynchronously. + /// The Func<TSource, Optional<TSource>, TKey, Task<TDestination>> async function that produces a from the current source item, the previous source item (if any), and the key. /// An observable that, when it emits a predicate, re-transforms all items for which the predicate returns . Re-transformed items are emitted as changes. If , no forced re-transforms occur. /// An observable changeset of transformed items. /// @@ -95,25 +111,34 @@ public static IObservable> TransformAsync /// Worth noting: Transforms are batched per changeset (all tasks must complete before the next changeset is processed). Completion waits for in-flight transforms. Remove does NOT cancel in-flight transforms for the removed key. /// - /// Factory exceptions propagate as . Use - /// + /// Factory exceptions propagate as IObserver<T>.OnError. Use + /// TransformSafeAsync<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, Task<TDestination>>, Action<Error<TSource, TKey>>, IObservable<Func<TSource, TKey, bool>>?) /// to catch factory errors without terminating the stream. /// /// /// or is . [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, IObservable>? forceTransform = null) + public static IObservable> TransformAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new TransformAsync(source, transformFactory, null, forceTransform).Run(); } - /// + /// + /// Provides an overload of TransformAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The options value. + /// The resulting observable sequence. /// This overload accepts to control concurrency and Refresh handling. The factory receives only the current item. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync(this IObservable> source, Func> transformFactory, TransformAsyncOptions options) @@ -121,13 +146,22 @@ public static IObservable> TransformAsync transformFactory(current), options); } - /// + /// + /// Provides an overload of TransformAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The options value. + /// The resulting observable sequence. /// This overload accepts to control concurrency and Refresh handling. The factory receives the current item and key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync(this IObservable> source, Func> transformFactory, TransformAsyncOptions options) @@ -135,36 +169,45 @@ public static IObservable> TransformAsync transformFactory(current, key), options); } - /// + /// + /// Provides an overload of TransformAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The options value. + /// The resulting observable sequence. /// This overload accepts to control concurrency and Refresh handling. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformAsync(this IObservable> source, Func, TKey, Task> transformFactory, TransformAsyncOptions options) + public static IObservable> TransformAsync(this IObservable> source, Func, TKey, Task> transformFactory, TransformAsyncOptions options) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return TransformAsync(source, (current, previous, key, _) => transformFactory(current, previous, key), options); } - /// + /// /// This overload accepts to control concurrency and Refresh handling. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, TransformAsyncOptions options) + public static IObservable> TransformAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, TransformAsyncOptions options) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new TransformAsync(source, transformFactory, null, null, options.MaximumConcurrency, options.TransformOnRefresh).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformImmutable.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformImmutable.cs index 940746e7a..f5e42ce9a 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformImmutable.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformImmutable.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,13 +30,13 @@ public static partial class ObservableCacheEx /// The type of the transformed items. /// The type of the source items. /// The type of the key. - /// The source to transform (items assumed immutable). - /// The pure function that maps a source item to a destination item. Must be deterministic: same input always produces equivalent output. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform (items assumed immutable). + /// The Func<TSource, TDestination> pure function that maps a source item to a destination item. Must be deterministic: same input always produces equivalent output. /// An observable changeset of transformed items. /// /// /// Because the transform is assumed to be stateless and deterministic, this operator does not track - /// previously transformed items. This reduces memory overhead compared to . + /// previously transformed items. This reduces memory overhead compared to Transform<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, IObservable<Func<TSource, TKey, bool>>?). /// /// Change reason handling: /// @@ -48,7 +46,7 @@ public static partial class ObservableCacheEx /// RemoveEmits Remove. Factory is NOT called. /// RefreshDROPPED. Immutable items do not change, so Refresh is meaningless. /// - /// Use this when items are immutable, the factory is pure, and the factory is cheap. If any of these conditions are false, use instead. + /// Use this when items are immutable, the factory is pure, and the factory is cheap. If any of these conditions are false, use Transform<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, IObservable<Func<TSource, TKey, bool>>?) instead. /// /// or is . public static IObservable> TransformImmutable( @@ -58,8 +56,8 @@ public static IObservable> TransformImmutable( source: source, diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformMany.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformMany.cs index 682f5592d..073d594d7 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformMany.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformMany.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -33,9 +31,9 @@ public static partial class ObservableCacheEx /// The type of the child item keys. /// The type of the source (parent) items. /// The type of the source (parent) keys. - /// The source to expand each item into multiple children. - /// A function that expands a parent item into its children. For or overloads, subsequent changes to the child collection are automatically tracked. - /// A that extracts a unique key from each child item. Keys must be unique across ALL parents, not just within one parent. + /// The source IObservable<IChangeSet<TSource, TSourceKey>> to expand each item into multiple children. + /// A function that expands a parent item into its children. For ObservableCollection<T> or IObservableCache<TObject, TKey> overloads, subsequent changes to the child collection are automatically tracked. + /// A Func<T, TResult> that extracts a unique key from each child item. Keys must be unique across ALL parents, not just within one parent. /// An observable changeset of flattened child items. /// /// Change reason handling: @@ -47,35 +45,65 @@ public static partial class ObservableCacheEx /// RefreshPropagated as Refresh to all children (no re-expansion). /// /// Worth noting: If two source items produce children with the same key, last-in-wins. Refresh does NOT re-expand children (only Update does). - /// If two parents produce children with the same key, last-in-wins. Use the async variant with a to control conflict resolution. + /// If two parents produce children with the same key, last-in-wins. Use the async variant with a IComparer<T> to control conflict resolution. /// /// , , or is . - /// - /// + /// TransformManyAsync<TDestination, TDestinationKey, TSource, TSourceKey>(IObservable<IChangeSet<TSource, TSourceKey>>, Func<TSource, TSourceKey, Task<IEnumerable<TDestination>>>, Func<TDestination, TDestinationKey>, IEqualityComparer<TDestination>?, IComparer<TDestination>?) + /// ObservableListEx.TransformMany public static IObservable> TransformMany(this IObservable> source, Func> manySelector, Func keySelector) where TDestination : notnull where TDestinationKey : notnull where TSource : notnull where TSourceKey : notnull => new TransformMany(source, manySelector, keySelector).Run(); - /// - /// This overload accepts an selector. Changes to the child collection (adds, removes, replacements) are automatically observed and reflected downstream. + /// + /// Provides an overload of Run for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The resulting observable sequence. + /// This overload accepts an ObservableCollection<T> selector. Changes to the child collection (adds, removes, replacements) are automatically observed and reflected downstream. public static IObservable> TransformMany(this IObservable> source, Func> manySelector, Func keySelector) where TDestination : notnull where TDestinationKey : notnull where TSource : notnull where TSourceKey : notnull => new TransformMany(source, manySelector, keySelector).Run(); - /// - /// This overload accepts a selector. Changes to the child collection are automatically observed and reflected downstream. + /// + /// Provides an overload of Run for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The resulting observable sequence. + /// This overload accepts a ReadOnlyObservableCollection<T> selector. Changes to the child collection are automatically observed and reflected downstream. public static IObservable> TransformMany(this IObservable> source, Func> manySelector, Func keySelector) where TDestination : notnull where TDestinationKey : notnull where TSource : notnull where TSourceKey : notnull => new TransformMany(source, manySelector, keySelector).Run(); - /// - /// This overload accepts an selector. The child cache is live: subsequent changes to it are automatically propagated downstream. + /// + /// Provides an overload of Run for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The resulting observable sequence. + /// This overload accepts an IObservableCache<TObject, TKey> selector. The child cache is live: subsequent changes to it are automatically propagated downstream. public static IObservable> TransformMany(this IObservable> source, Func> manySelector, Func keySelector) where TDestination : notnull where TDestinationKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformManyAsync.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformManyAsync.cs index 4a6ac6005..32fd5489e 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformManyAsync.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformManyAsync.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,18 +24,18 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Async version of . + /// Async version of TransformMany<TDestination, TDestinationKey, TSource, TSourceKey>(IObservable<IChangeSet<TSource, TSourceKey>>, Func<TSource, IEnumerable<TDestination>>, Func<TDestination, TDestinationKey>). /// Flattens each source item into zero or more destination items using an async factory. /// /// The type of the child items. /// The type of the child item keys. /// The type of the source (parent) items. /// The type of the source (parent) keys. - /// The source to expand each item into multiple children asynchronously. - /// An async function that expands a parent item (and its key) into an of children. - /// A that extracts a unique key from each child item. - /// An that optional comparer to determine if two child items with the same key are equal. Used to suppress no-op updates. - /// An that optional comparer to resolve key collisions when the same destination key is produced by multiple parents. The winning item is determined by this comparer. + /// The source IObservable<IChangeSet<TSource, TSourceKey>> to expand each item into multiple children asynchronously. + /// An async function that expands a parent item (and its key) into an IEnumerable<T> of children. + /// A Func<T, TResult> that extracts a unique key from each child item. + /// An IEqualityComparer<TDestination> that optional comparer to determine if two child items with the same key are equal. Used to suppress no-op updates. + /// An IComparer<TDestination> that optional comparer to resolve key collisions when the same destination key is produced by multiple parents. The winning item is determined by this comparer. /// An observable changeset of flattened child items. /// /// @@ -45,8 +43,8 @@ public static partial class ObservableCacheEx /// (unlike the synchronous TransformMany which batches all children into one changeset). /// /// - /// Factory exceptions propagate as . Use - /// + /// Factory exceptions propagate as IObserver<T>.OnError. Use + /// TransformManySafeAsync<TDestination, TDestinationKey, TSource, TSourceKey>(IObservable<IChangeSet<TSource, TSourceKey>>, Func<TSource, TSourceKey, Task<IEnumerable<TDestination>>>, Func<TDestination, TDestinationKey>, Action<Error<TSource, TSourceKey>>, IEqualityComparer<TDestination>?, IComparer<TDestination>?) /// to catch errors without killing the stream. /// /// @@ -58,13 +56,25 @@ public static IObservable> TransformMa where TSource : notnull where TSourceKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); return new TransformManyAsync(source, CreateChangeSetTransformer(manySelector, keySelector), equalityComparer, comparer).Run(); } - /// + /// + /// Provides an overload of manySelector for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. /// This overload takes a factory that receives only the source item (without the key). [MethodImpl(MethodImplOptions.AggressiveInlining)] [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] @@ -74,8 +84,21 @@ public static IObservable> TransformMa where TSource : notnull where TSourceKey : notnull => source.TransformManyAsync((val, _) => manySelector(val), keySelector, equalityComparer, comparer); - /// - /// This overload returns an observable collection (of type implementing both and ) whose changes are tracked live. The factory receives the source item and its key. + /// + /// Provides an overload of TransformManyAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The type of the TCollection value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an observable collection (of type implementing both and IEnumerable<T>) whose changes are tracked live. The factory receives the source item and its key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManyAsync(this IObservable> source, Func> manySelector, Func keySelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TDestination : notnull @@ -84,14 +107,27 @@ public static IObservable> TransformMa where TSourceKey : notnull where TCollection : INotifyCollectionChanged, IEnumerable { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); return new TransformManyAsync(source, CreateChangeSetTransformer(manySelector, keySelector), equalityComparer, comparer).Run(); } - /// - /// This overload returns an observable collection (of type implementing both and ) whose changes are tracked live. The factory receives only the source item. + /// + /// Provides an overload of manySelector for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The type of the TCollection value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an observable collection (of type implementing both and IEnumerable<T>) whose changes are tracked live. The factory receives only the source item. [MethodImpl(MethodImplOptions.AggressiveInlining)] [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManyAsync(this IObservable> source, Func> manySelector, Func keySelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) @@ -101,8 +137,19 @@ public static IObservable> TransformMa where TSourceKey : notnull where TCollection : INotifyCollectionChanged, IEnumerable => source.TransformManyAsync((val, _) => manySelector(val), keySelector, equalityComparer, comparer); - /// - /// This overload returns an per parent. The child cache is live: its changes propagate downstream. No keySelector is needed since the cache already has keys. The factory receives the source item and its key. + /// + /// Provides an overload of TransformManyAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an IObservableCache<TObject, TKey> per parent. The child cache is live: its changes propagate downstream. No keySelector is needed since the cache already has keys. The factory receives the source item and its key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManyAsync(this IObservable> source, Func>> manySelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TDestination : notnull @@ -110,14 +157,25 @@ public static IObservable> TransformMa where TSource : notnull where TSourceKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); return new TransformManyAsync(source, CreateChangeSetTransformer(manySelector), equalityComparer, comparer).Run(); } - /// - /// This overload returns an per parent. The child cache is live. The factory receives only the source item. + /// + /// Provides an overload of manySelector for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an IObservableCache<TObject, TKey> per parent. The child cache is live. The factory receives only the source item. [MethodImpl(MethodImplOptions.AggressiveInlining)] [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManyAsync(this IObservable> source, Func>> manySelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformManySafeAsync.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformManySafeAsync.cs index 5e9d2c062..bb8f65084 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformManySafeAsync.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformManySafeAsync.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; +#if REACTIVE_SHIM +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,7 +24,7 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Async version of + /// Async version of TransformMany<TDestination, TDestinationKey, TSource, TSourceKey>(IObservable<IChangeSet<TSource, TSourceKey>>, Func<TSource, IEnumerable<TDestination>>, Func<TDestination, TDestinationKey>) /// with error handling. Factory exceptions are caught and routed to instead of /// terminating the stream. /// @@ -34,12 +32,12 @@ public static partial class ObservableCacheEx /// The type of the child item keys. /// The type of the source (parent) items. /// The type of the source (parent) keys. - /// The source to expand each item into multiple children asynchronously with error handling. - /// An async function that expands a parent item (and its key) into an of children. - /// A that extracts a unique key from each child item. - /// A that called when throws. The faulting item is skipped and the stream continues. - /// An that optional comparer to determine if two child items with the same key are equal. - /// An that optional comparer to resolve key collisions when the same destination key is produced by multiple parents. + /// The source IObservable<IChangeSet<TSource, TSourceKey>> to expand each item into multiple children asynchronously with error handling. + /// An async function that expands a parent item (and its key) into an IEnumerable<T> of children. + /// A Func<T, TResult> that extracts a unique key from each child item. + /// A Action<T> that called when throws. The faulting item is skipped and the stream continues. + /// An IEqualityComparer<TDestination> that optional comparer to determine if two child items with the same key are equal. + /// An IComparer<TDestination> that optional comparer to resolve key collisions when the same destination key is produced by multiple parents. /// An observable changeset of flattened child items. /// Because the transformations are asynchronous, each sub-collection may be emitted via a separate changeset. /// , , or is . @@ -50,14 +48,27 @@ public static IObservable> TransformMa where TSource : notnull where TSourceKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return new TransformManyAsync(source, CreateChangeSetTransformer(manySelector, keySelector), equalityComparer, comparer, errorHandler).Run(); } - /// + /// + /// Provides an overload of manySelector for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The errorHandler value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. /// This overload takes a factory that receives only the source item (without the key). [MethodImpl(MethodImplOptions.AggressiveInlining)] [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] @@ -67,8 +78,22 @@ public static IObservable> TransformMa where TSource : notnull where TSourceKey : notnull => source.TransformManySafeAsync((val, _) => manySelector(val), keySelector, errorHandler, equalityComparer, comparer); - /// - /// This overload returns an observable collection (of type implementing both and ) whose changes are tracked live. The factory receives the source item and its key. + /// + /// Provides an overload of TransformManySafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The type of the TCollection value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The errorHandler value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an observable collection (of type implementing both and IEnumerable<T>) whose changes are tracked live. The factory receives the source item and its key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManySafeAsync(this IObservable> source, Func> manySelector, Func keySelector, Action> errorHandler, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TDestination : notnull @@ -77,15 +102,29 @@ public static IObservable> TransformMa where TSourceKey : notnull where TCollection : INotifyCollectionChanged, IEnumerable { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return new TransformManyAsync(source, CreateChangeSetTransformer(manySelector, keySelector), equalityComparer, comparer, errorHandler).Run(); } - /// - /// This overload returns an observable collection (of type implementing both and ) whose changes are tracked live. The factory receives only the source item. + /// + /// Provides an overload of manySelector for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The type of the TCollection value. + /// The source value. + /// The manySelector value. + /// The keySelector value. + /// The errorHandler value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an observable collection (of type implementing both and IEnumerable<T>) whose changes are tracked live. The factory receives only the source item. [MethodImpl(MethodImplOptions.AggressiveInlining)] [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManySafeAsync(this IObservable> source, Func> manySelector, Func keySelector, Action> errorHandler, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) @@ -95,8 +134,20 @@ public static IObservable> TransformMa where TSourceKey : notnull where TCollection : INotifyCollectionChanged, IEnumerable => source.TransformManySafeAsync((val, _) => manySelector(val), keySelector, errorHandler, equalityComparer, comparer); - /// - /// This overload returns an per parent. The child cache is live. The factory receives the source item and its key. + /// + /// Provides an overload of TransformManySafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The errorHandler value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an IObservableCache<TObject, TKey> per parent. The child cache is live. The factory receives the source item and its key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManySafeAsync(this IObservable> source, Func>> manySelector, Action> errorHandler, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TDestination : notnull @@ -104,15 +155,27 @@ public static IObservable> TransformMa where TSource : notnull where TSourceKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return new TransformManyAsync(source, CreateChangeSetTransformer(manySelector), equalityComparer, comparer, errorHandler).Run(); } - /// - /// This overload returns an per parent. The child cache is live. The factory receives only the source item. + /// + /// Provides an overload of manySelector for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TDestinationKey value. + /// The type of the TSource value. + /// The type of the TSourceKey value. + /// The source value. + /// The manySelector value. + /// The errorHandler value. + /// The equalityComparer value. + /// The comparer value. + /// The resulting observable sequence. + /// This overload returns an IObservableCache<TObject, TKey> per parent. The child cache is live. The factory receives only the source item. [MethodImpl(MethodImplOptions.AggressiveInlining)] [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformManySafeAsync(this IObservable> source, Func>> manySelector, Action> errorHandler, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformOnObservable.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformOnObservable.cs index 24d9e5e04..47ccba2c9 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformOnObservable.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformOnObservable.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,8 +30,8 @@ public static partial class ObservableCacheEx /// The type of the source items. /// The type of the key. /// The type of the transformed items. - /// The source to transform using per-item observables. - /// A function that, given a source item and its key, returns an whose emissions become the transformed values. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform using per-item observables. + /// A function that, given a source item and its key, returns an IObservable<TDestination> whose emissions become the transformed values. /// An observable changeset where each key's value is the latest emission from its per-item observable. /// /// @@ -65,28 +63,36 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// - /// + /// Transform<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, TKey, TDestination>, bool) + /// FilterOnObservable<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<bool>>, TimeSpan?, IScheduler?) + /// GroupOnObservable<TObject, TKey, TGroupKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TKey, IObservable<TGroupKey>>) public static IObservable> TransformOnObservable(this IObservable> source, Func> transformFactory) where TSource : notnull where TKey : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new TransformOnObservable(source, transformFactory).Run(); } - /// + /// + /// Provides an overload of TransformOnObservable for the supplied arguments. + /// + /// The type of the TSource value. + /// The type of the TKey value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The resulting observable sequence. /// This overload takes a factory that receives only the source item (without the key). public static IObservable> TransformOnObservable(this IObservable> source, Func> transformFactory) where TSource : notnull where TKey : notnull where TDestination : notnull { - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.TransformOnObservable((obj, _) => transformFactory(obj)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformSafe.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformSafe.cs index f8e68385d..1b438f647 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformSafe.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformSafe.cs @@ -1,54 +1,72 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// + /// + /// Provides an overload of TransformSafe for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload accepts a simpler factory that receives only the current item, and a forceTransform predicate filtering by source item only. public static IObservable> TransformSafe(this IObservable> source, Func transformFactory, Action> errorHandler, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return source.TransformSafe((current, _, _) => transformFactory(current), errorHandler, forceTransform.ForForced()); } - /// + /// + /// Provides an overload of TransformSafe for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload accepts a factory that receives the current item and key. public static IObservable> TransformSafe(this IObservable> source, Func transformFactory, Action> errorHandler, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return source.TransformSafe((current, _, key) => transformFactory(current, key), errorHandler, forceTransform); } @@ -60,28 +78,28 @@ public static IObservable> TransformSafeThe type of the transformed items. /// The type of the source items. /// The type of the key. - /// The source to transform with error handling. - /// The that produces a from the current source item, the previous source item (if any), and the key. - /// A callback invoked when throws. Receives an containing the exception and the faulting item. The item is skipped and the stream continues. - /// An optional that, when it emits a predicate, re-transforms all items for which the predicate returns . If , no forced re-transforms occur. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform with error handling. + /// The Func<TSource, Optional<TSource>, TKey, TDestination> that produces a from the current source item, the previous source item (if any), and the key. + /// A callback invoked when throws. Receives an Error<TSource, TKey> containing the exception and the faulting item. The item is skipped and the stream continues. + /// An optional IObservable<T> that, when it emits a predicate, re-transforms all items for which the predicate returns . If , no forced re-transforms occur. /// An observable changeset of transformed items. /// /// - /// Behaves identically to - /// except that factory exceptions are routed to instead of propagating as . + /// Behaves identically to Transform<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, IObservable<Func<TSource, TKey, bool>>?) + /// except that factory exceptions are routed to instead of propagating as IObserver<T>.OnError. /// Source-level errors (i.e. the source observable itself erroring) still propagate normally. /// /// Worth noting: Factory exceptions are caught per-item; the faulting item is skipped and reported to the error handler while the stream continues. Source-level errors still terminate the stream. /// /// , , or is . - public static IObservable> TransformSafe(this IObservable> source, Func, TKey, TDestination> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) + public static IObservable> TransformSafe(this IObservable> source, Func, TKey, TDestination> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); if (forceTransform is not null) { return new TransformWithForcedTransform(source, transformFactory, forceTransform, errorHandler).Run(); @@ -90,37 +108,67 @@ public static IObservable> TransformSafe(source, transformFactory, errorHandler).Run(); } - /// - /// This overload accepts of to force re-transformation of ALL items. The factory receives only the current item. + /// + /// Provides an overload of ForForced for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. + /// This overload accepts IObservable<T> of to force re-transformation of ALL items. The factory receives only the current item. public static IObservable> TransformSafe(this IObservable> source, Func transformFactory, Action> errorHandler, IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull => source.TransformSafe((cur, _, _) => transformFactory(cur), errorHandler, forceTransform.ForForced()); - /// - /// This overload accepts of to force re-transformation of ALL items. The factory receives the current item and key. + /// + /// Provides an overload of TransformSafe for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. + /// This overload accepts IObservable<T> of to force re-transformation of ALL items. The factory receives the current item and key. public static IObservable> TransformSafe(this IObservable> source, Func transformFactory, Action> errorHandler, IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - forceTransform.ThrowArgumentNullExceptionIfNull(nameof(forceTransform)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(forceTransform); return source.TransformSafe((cur, _, key) => transformFactory(cur, key), errorHandler, forceTransform.ForForced()); } - /// - /// This overload accepts of to force re-transformation of ALL items. - public static IObservable> TransformSafe(this IObservable> source, Func, TKey, TDestination> transformFactory, Action> errorHandler, IObservable forceTransform) + /// + /// Provides an overload of TransformSafe for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. + /// This overload accepts IObservable<T> of to force re-transformation of ALL items. + public static IObservable> TransformSafe(this IObservable> source, Func, TKey, TDestination> transformFactory, Action> errorHandler, IObservable forceTransform) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - forceTransform.ThrowArgumentNullExceptionIfNull(nameof(forceTransform)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(forceTransform); return source.TransformSafe(transformFactory, errorHandler, forceTransform.ForForced()); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformSafeAsync.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformSafeAsync.cs index 70477e563..18d6bb6d3 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformSafeAsync.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformSafeAsync.cs @@ -1,31 +1,39 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// + /// + /// Provides an overload of TransformSafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload takes a factory that receives only the current item. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformSafeAsync(this IObservable> source, Func> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) @@ -33,14 +41,24 @@ public static IObservable> TransformSafeAsync transformFactory(current), errorHandler, forceTransform); } - /// + /// + /// Provides an overload of TransformSafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The forceTransform value. + /// The resulting observable sequence. /// This overload takes a factory that receives the current item and key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformSafeAsync(this IObservable> source, Func> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) @@ -48,55 +66,65 @@ public static IObservable> TransformSafeAsync transformFactory(current, key), errorHandler, forceTransform); } - /// + /// [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, Task> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) + public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, Task> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return source.TransformSafeAsync((s, p, k, t) => transformFactory(s, p, k), errorHandler, forceTransform); } /// - /// Async version of . + /// Async version of TransformSafe<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, Action<Error<TSource, TKey>>, IObservable<Func<TSource, TKey, bool>>?). /// Projects each item using an async factory, catching factory exceptions via a mandatory error handler. /// /// The type of the transformed items. /// The type of the source items. /// The type of the key. - /// The source to transform asynchronously with error handling. - /// The async function that produces a . - /// A that called when throws or faults. The item is skipped and the stream continues. - /// An optional that forces re-transformation of matching items. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform asynchronously with error handling. + /// The Func<TSource, Optional<TSource>, TKey, Task<TDestination>> async function that produces a . + /// A Action<T> that called when throws or faults. The item is skipped and the stream continues. + /// An optional IObservable<T> that forces re-transformation of matching items. /// An observable changeset of transformed items. - /// Combines the async execution model of with the error-safe behavior of . + /// Combines the async execution model of TransformAsync<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, Task<TDestination>>, IObservable<Func<TSource, TKey, bool>>?) with the error-safe behavior of TransformSafe<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Optional<TSource>, TKey, TDestination>, Action<Error<TSource, TKey>>, IObservable<Func<TSource, TKey, bool>>?). /// , , or is . [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) + public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, Action> errorHandler, IObservable>? forceTransform = null) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return new TransformAsync(source, transformFactory, errorHandler, forceTransform).Run(); } - /// + /// + /// Provides an overload of TransformSafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The options value. + /// The resulting observable sequence. /// This overload accepts to control concurrency and Refresh handling. The factory receives only the current item. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformSafeAsync(this IObservable> source, Func> transformFactory, Action> errorHandler, TransformAsyncOptions options) @@ -104,14 +132,24 @@ public static IObservable> TransformSafeAsync transformFactory(current), errorHandler, options); } - /// + /// + /// Provides an overload of TransformSafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The options value. + /// The resulting observable sequence. /// This overload accepts to control concurrency and Refresh handling. The factory receives the current item and key. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformSafeAsync(this IObservable> source, Func> transformFactory, Action> errorHandler, TransformAsyncOptions options) @@ -119,35 +157,49 @@ public static IObservable> TransformSafeAsync transformFactory(current, key), errorHandler, options); } - /// + /// + /// Provides an overload of TransformSafeAsync for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The errorHandler value. + /// The options value. + /// The resulting observable sequence. /// This overload accepts to control concurrency and Refresh handling. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, Task> transformFactory, Action> errorHandler, TransformAsyncOptions options) + public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, Task> transformFactory, Action> errorHandler, TransformAsyncOptions options) where TDestination : notnull where TSource : notnull where TKey : notnull { - return source.TransformSafeAsync((current, previous, key, cancel) => transformFactory(current, previous, key), errorHandler, options); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); + + return source.TransformSafeAsync((current, previous, key, _) => transformFactory(current, previous, key), errorHandler, options); } - /// + /// /// This overload accepts to control concurrency and Refresh handling. [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] - public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, Action> errorHandler, TransformAsyncOptions options) + public static IObservable> TransformSafeAsync(this IObservable> source, Func, TKey, CancellationToken, Task> transformFactory, Action> errorHandler, TransformAsyncOptions options) where TDestination : notnull where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return new TransformAsync(source, transformFactory, errorHandler, null, options.MaximumConcurrency, options.TransformOnRefresh).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformToTree.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformToTree.cs index e0020280d..3322b971f 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformToTree.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformToTree.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,14 +25,14 @@ public static partial class ObservableCacheEx { /// /// Builds a hierarchical tree from a flat changeset using a parent key selector. - /// Each item becomes a with Parent, Children, Depth, and IsRoot properties. + /// Each item becomes a Node<TObject, TKey> with Parent, Children, Depth, and IsRoot properties. /// /// The type of the source items. Must be a reference type. /// The type of the key. - /// The source to transform into a hierarchical tree. - /// The that returns the key of an item's parent. Return the item's own key (or a non-existent key) for root items. - /// An optional that emits a filter predicate for nodes. When the predicate changes, nodes are re-evaluated and filtered. - /// An observable changeset of items representing the tree. + /// The source IObservable<IChangeSet<TObject, TKey>> to transform into a hierarchical tree. + /// The Func<TObject, TKey> that returns the key of an item's parent. Return the item's own key (or a non-existent key) for root items. + /// An optional IObservable<T> that emits a filter predicate for nodes. When the predicate changes, nodes are re-evaluated and filtered. + /// An observable changeset of Node<TObject, TKey> items representing the tree. /// /// Change reason handling: /// @@ -51,8 +49,8 @@ public static IObservable, TKey>> TransformToTree where TObject : class where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pivotOn.ThrowArgumentNullExceptionIfNull(nameof(pivotOn)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pivotOn); return new TreeBuilder(source, pivotOn, predicateChanged).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TransformWithInlineUpdate.cs b/src/DynamicData/Cache/ObservableCacheEx.TransformWithInlineUpdate.cs index 99004fa73..7ef67e50b 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TransformWithInlineUpdate.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TransformWithInlineUpdate.cs @@ -1,69 +1,96 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// + /// + /// Provides an overload of TransformWithInlineUpdate for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The updateAction value. + /// The resulting observable sequence. /// This overload defaults to transformOnRefresh: false and does not provide an error handler (factory exceptions propagate as OnError). public static IObservable> TransformWithInlineUpdate(this IObservable> source, Func transformFactory, Action updateAction) where TDestination : class where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(updateAction); return source.TransformWithInlineUpdate(transformFactory, updateAction, false); } - /// + /// + /// Provides an overload of TransformWithInlineUpdate for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The updateAction value. + /// The transformOnRefresh value. + /// The resulting observable sequence. /// This overload does not provide an error handler (factory exceptions propagate as OnError). The transformOnRefresh parameter controls Refresh behavior. public static IObservable> TransformWithInlineUpdate(this IObservable> source, Func transformFactory, Action updateAction, bool transformOnRefresh) where TDestination : class where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(updateAction); return new TransformWithInlineUpdate(source, transformFactory, updateAction, transformOnRefresh: transformOnRefresh).Run(); } - /// + /// + /// Provides an overload of TransformWithInlineUpdate for the supplied arguments. + /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The type of the TKey value. + /// The source value. + /// The transformFactory value. + /// The updateAction value. + /// The errorHandler value. + /// The resulting observable sequence. /// This overload defaults to transformOnRefresh: false but includes an error handler for factory/update action exceptions. public static IObservable> TransformWithInlineUpdate(this IObservable> source, Func transformFactory, Action updateAction, Action> errorHandler) where TDestination : class where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(updateAction); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return source.TransformWithInlineUpdate(transformFactory, updateAction, errorHandler, false); } @@ -75,10 +102,10 @@ public static IObservable> TransformWithInlineUpd /// The type of the transformed items. Must be a reference type since items are mutated in place. /// The type of the source items. /// The type of the key. - /// The source to transform with in-place mutation on updates. - /// A that called on Add (and optionally Refresh) to create a new . - /// A that called on Update. Receives (existingTransformed, newSource). Mutate the existing transformed item to reflect the new source value. Example: (vm, model) => vm.Value = model.Value. - /// A that called when or throws. The faulting item is skipped. + /// The source IObservable<IChangeSet<TSource, TKey>> to transform with in-place mutation on updates. + /// A Func<T, TResult> that called on Add (and optionally Refresh) to create a new . + /// A Action<T> that called on Update. Receives (existingTransformed, newSource). Mutate the existing transformed item to reflect the new source value. Example: (vm, model) => vm.Value = model.Value. + /// A Action<T> that called when or throws. The faulting item is skipped. /// When , Refresh changes call on the existing item. /// An observable changeset of transformed items. /// @@ -101,10 +128,10 @@ public static IObservable> TransformWithInlineUpd where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); - errorHandler.ThrowArgumentNullExceptionIfNull(nameof(errorHandler)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); + ArgumentExceptionHelper.ThrowIfNull(updateAction); + ArgumentExceptionHelper.ThrowIfNull(errorHandler); return new TransformWithInlineUpdate(source, transformFactory, updateAction, errorHandler, transformOnRefresh).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.TreatMovesAsRemoveAdd.cs b/src/DynamicData/Cache/ObservableCacheEx.TreatMovesAsRemoveAdd.cs index 965001488..e7f1721e9 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TreatMovesAsRemoveAdd.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TreatMovesAsRemoveAdd.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,13 +21,13 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to convert move events into remove/add pairs. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to convert move events into remove/add pairs. /// the same SortedChangeSets, except all moves are replaced with remove + add. public static IObservable> TreatMovesAsRemoveAdd(this IObservable> source) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); static IEnumerable> ReplaceMoves(IChangeSet items) { diff --git a/src/DynamicData/Cache/ObservableCacheEx.TrueFor.cs b/src/DynamicData/Cache/ObservableCacheEx.TrueFor.cs index a49b33f24..bbc99fd6c 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TrueFor.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TrueFor.cs @@ -1,30 +1,38 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { + /// + /// Executes the TrueFor operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TValue value. + /// The source value. + /// The observableSelector value. + /// The collectionMatcher value. + /// The result of the operation. private static IObservable TrueFor(this IObservable> source, Func> observableSelector, Func>, bool> collectionMatcher) where TObject : notnull where TKey : notnull diff --git a/src/DynamicData/Cache/ObservableCacheEx.TrueForAll.cs b/src/DynamicData/Cache/ObservableCacheEx.TrueForAll.cs index e09acbedb..74a740205 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TrueForAll.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TrueForAll.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,9 +23,9 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the value emitted by each per-item observable. - /// The source to evaluate a condition across all items in. - /// A factory that produces a condition observable for each item. - /// A that predicate applied to each per-item observable's latest value. + /// The source IObservable<IChangeSet<TObject, TKey>> to evaluate a condition across all items in. + /// A Func<T, TResult> factory that produces a condition observable for each item. + /// A Func<T, TResult> that predicate applied to each per-item observable's latest value. /// An observable of bool that emits whenever the all-items condition changes. /// , , or is . /// @@ -47,7 +38,7 @@ public static partial class ObservableCacheEx /// /// Worth noting: Items whose per-item observable has not yet emitted are treated as not satisfying the condition. An empty cache is vacuously . The result uses DistinctUntilChanged, so duplicate bool values are suppressed. /// - /// + /// TrueForAny<TObject, TKey, TValue>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TValue>>, Func<TValue, bool>) public static IObservable TrueForAll(this IObservable> source, Func> observableSelector, Func equalityCondition) where TObject : notnull where TKey : notnull @@ -66,9 +57,9 @@ public static IObservable TrueForAll(this IObservab /// The type of the object. /// The type of the key. /// The type of the value. - /// The source to evaluate a condition across all items in. - /// A that selector which returns the target observable. - /// The equality condition. + /// The source IObservable<IChangeSet<TObject, TKey>> to evaluate a condition across all items in. + /// A Func<T, TResult> that selector which returns the target observable. + /// The Func<TObject, TValue, bool> equality condition. /// An observable which boolean values indicating if true. /// source. public static IObservable TrueForAll(this IObservable> source, Func> observableSelector, Func equalityCondition) diff --git a/src/DynamicData/Cache/ObservableCacheEx.TrueForAny.cs b/src/DynamicData/Cache/ObservableCacheEx.TrueForAny.cs index f98e5270a..fa548b69e 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.TrueForAny.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.TrueForAny.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -32,9 +23,9 @@ public static partial class ObservableCacheEx /// The type of the object. /// The type of the key. /// The type of the value emitted by each per-item observable. - /// The source to evaluate a condition across any item in. - /// A factory that produces a condition observable for each item. - /// A that predicate applied to each item and its per-item observable's latest value. + /// The source IObservable<IChangeSet<TObject, TKey>> to evaluate a condition across any item in. + /// A Func<T, TResult> factory that produces a condition observable for each item. + /// A Func<T, TResult> that predicate applied to each item and its per-item observable's latest value. /// An observable of bool that emits whenever the any-item condition changes. /// , , or is . /// @@ -47,25 +38,31 @@ public static partial class ObservableCacheEx /// /// Worth noting: Items whose per-item observable has not yet emitted are treated as not satisfying the condition. An empty cache yields . The result uses DistinctUntilChanged, so duplicate bool values are suppressed. /// - /// + /// TrueForAll<TObject, TKey, TValue>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TValue>>, Func<TValue, bool>) public static IObservable TrueForAny(this IObservable> source, Func> observableSelector, Func equalityCondition) where TObject : notnull where TKey : notnull where TValue : notnull => source.TrueFor(observableSelector, items => items.Any(o => o.LatestValue.HasValue && equalityCondition(o.Item, o.LatestValue.Value))); - /// - /// The source to evaluate a condition across any item in. - /// A factory that produces a condition observable for each item. - /// A that predicate applied to each per-item observable's latest value (without the item). + /// + /// Provides an overload of TrueForAny for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The type of the TValue value. + /// The source IObservable<IChangeSet<TObject, TKey>> to evaluate a condition across any item in. + /// A Func<T, TResult> factory that produces a condition observable for each item. + /// A Func<T, TResult> that predicate applied to each per-item observable's latest value (without the item). + /// The resulting observable sequence. /// This overload accepts a predicate that takes only the value, not the item. Useful when the condition depends only on the observed value. public static IObservable TrueForAny(this IObservable> source, Func> observableSelector, Func equalityCondition) where TObject : notnull where TKey : notnull where TValue : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); - equalityCondition.ThrowArgumentNullExceptionIfNull(nameof(equalityCondition)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); + ArgumentExceptionHelper.ThrowIfNull(equalityCondition); return source.TrueFor(observableSelector, items => items.Any(o => o.LatestValue.HasValue && equalityCondition(o.LatestValue.Value))); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.UpdateIndex.cs b/src/DynamicData/Cache/ObservableCacheEx.UpdateIndex.cs index 933529ea0..48c71c51a 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.UpdateIndex.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.UpdateIndex.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,13 +25,18 @@ public static partial class ObservableCacheEx { /// /// Sets the Index property on each item (which must implement ) - /// to reflect its position in the sorted output. Operates on . + /// to reflect its position in the sorted output. Operates on ISortedChangeSet<TObject, TKey>. /// /// The type of the object. /// The type of the key. - /// The source to update index positions in. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to update index positions in. /// An observable that emits the sorted changesets after updating item indices. public static IObservable> UpdateIndex(this IObservable> source) where TObject : IIndexAware - where TKey : notnull => source.Do(changes => changes.SortedItems.Select((update, index) => new { update, index }).ForEach(u => u.update.Value.Index = u.index)); + where TKey : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.Do(changes => changes.SortedItems.Select((update, index) => new { update, index }).ForEach(u => u.update.Value.Index = u.index)); + } } diff --git a/src/DynamicData/Cache/ObservableCacheEx.VirtualiseAndPage.cs b/src/DynamicData/Cache/ObservableCacheEx.VirtualiseAndPage.cs index 2dbeaf1e6..238e53fcd 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.VirtualiseAndPage.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.VirtualiseAndPage.cs @@ -1,18 +1,35 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Reactive.Linq; using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { - /// + /// + /// Provides an overload of SortAndVirtualize for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The comparer value. + /// The virtualRequests value. + /// The resulting observable sequence. /// This overload uses default . public static IObservable>> SortAndVirtualize(this IObservable> source, IComparer comparer, @@ -21,7 +38,15 @@ public static IObservable>> So where TKey : notnull => source.SortAndVirtualize(comparer, virtualRequests, new SortAndVirtualizeOptions()); - /// + /// + /// Provides an overload of SortAndVirtualize for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The comparerChanged value. + /// The virtualRequests value. + /// The resulting observable sequence. /// This overload uses default . public static IObservable>> SortAndVirtualize( this IObservable> source, @@ -30,8 +55,8 @@ public static IObservable>> So where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - virtualRequests.ThrowArgumentNullExceptionIfNull(nameof(virtualRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(virtualRequests); return source.SortAndVirtualize(comparerChanged, virtualRequests, new SortAndVirtualizeOptions()); } @@ -42,9 +67,9 @@ public static IObservable>> So /// /// The type of the object. /// The type of the key. - /// The source to paginate. - /// The that determines sort order. - /// The that controls which window of sorted items to include. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. + /// The IComparer<TObject> that determines sort order. + /// The IObservable<IVirtualRequest> that controls which window of sorted items to include. /// The for controlling virtualization behavior. /// An observable which will emit virtual change sets. /// source. @@ -64,8 +89,8 @@ public static IObservable>> So /// /// Worth noting: No data is emitted until produces its first value. Changing the window can cause a full recalculation of visible items. /// - /// - /// + /// SortAndVirtualize<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IComparer<TObject>>, IObservable<IVirtualRequest>, SortAndVirtualizeOptions) + /// Top<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, int) public static IObservable>> SortAndVirtualize( this IObservable> source, IComparer comparer, @@ -74,8 +99,8 @@ public static IObservable>> So where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - virtualRequests.ThrowArgumentNullExceptionIfNull(nameof(virtualRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(virtualRequests); return new SortAndVirtualize(source, comparer, virtualRequests, options).Run(); } @@ -86,9 +111,9 @@ public static IObservable>> So /// /// The type of the object. /// The type of the key. - /// The source to paginate. - /// An that emits new comparers to re-sort with. - /// The that controls which window of sorted items to include. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. + /// An IObservable<IComparer<TObject>> that emits new comparers to re-sort with. + /// The IObservable<IVirtualRequest> that controls which window of sorted items to include. /// The for controlling virtualization behavior. /// An observable which will emit virtual change sets. /// source. @@ -108,8 +133,8 @@ public static IObservable>> So /// /// Worth noting: No data is emitted until both the comparer observable and virtualRequests have produced their first values. Changing the window or comparer can cause a full recalculation of visible items. /// - /// - /// + /// SortAndPage<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IComparer<TObject>>, IObservable<IPageRequest>, SortAndPageOptions) + /// Top<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, int) public static IObservable>> SortAndVirtualize( this IObservable> source, IObservable> comparerChanged, @@ -118,8 +143,8 @@ public static IObservable>> So where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - virtualRequests.ThrowArgumentNullExceptionIfNull(nameof(virtualRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(virtualRequests); return new SortAndVirtualize(source, comparerChanged, virtualRequests, options).Run(); } @@ -129,8 +154,8 @@ public static IObservable>> So /// /// The type of the object. /// The type of the key. - /// The source to paginate. - /// The that controls which window of sorted items to include. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. + /// The IObservable<IVirtualRequest> that controls which window of sorted items to include. /// An observable which will emit virtual change sets. /// source. [Obsolete(Constants.VirtualizeIsObsolete)] @@ -138,8 +163,8 @@ public static IObservable> Virtualise(source, virtualRequests).Run(); } @@ -150,26 +175,26 @@ public static IObservable> Virtualise /// The type of the object. /// The type of the key. - /// The source to limit. - /// The that determines sort order. + /// The source IObservable<IChangeSet<TObject, TKey>> to limit. + /// The IComparer<TObject> that determines sort order. /// The maximum number of items to return. /// An observable which will emit virtual change sets. /// source. /// size;Size should be greater than zero. /// /// - /// Internally delegates to + /// Internally delegates to SortAndVirtualize<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, IObservable<IVirtualRequest>, SortAndVirtualizeOptions) /// with a fixed of (0, size). /// /// Worth noting: When the Nth item is displaced by a new item with higher sort priority, the displaced item is emitted as a Remove and the new item as an Add. /// - /// + /// SortAndVirtualize<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, IObservable<IVirtualRequest>, SortAndVirtualizeOptions) public static IObservable>> Top(this IObservable> source, IComparer comparer, int size) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparer); if (size <= 0) { @@ -184,7 +209,7 @@ public static IObservable>> To /// /// The type of the object. /// The type of the key. - /// The source to paginate. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. /// The maximum number of items to include. /// An observable which will emit virtual change sets. /// source. @@ -194,7 +219,7 @@ public static IObservable> Top(t where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (size <= 0) { @@ -204,7 +229,15 @@ public static IObservable> Top(t return new Virtualise(source, Observable.Return(new VirtualRequest(0, size))).Run(); } - /// + /// + /// Provides an overload of SortAndPage for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The comparer value. + /// The pageRequests value. + /// The resulting observable sequence. /// This overload uses default . public static IObservable>> SortAndPage(this IObservable> source, IComparer comparer, @@ -213,7 +246,15 @@ public static IObservable>> SortA where TKey : notnull => source.SortAndPage(comparer, pageRequests, new SortAndPageOptions()); - /// + /// + /// Provides an overload of SortAndPage for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The comparerChanged value. + /// The pageRequests value. + /// The resulting observable sequence. /// This overload uses default . public static IObservable>> SortAndPage( this IObservable> source, @@ -222,8 +263,8 @@ public static IObservable>> SortA where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pageRequests.ThrowArgumentNullExceptionIfNull(nameof(pageRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pageRequests); return source.SortAndPage(comparerChanged, pageRequests, new SortAndPageOptions()); } @@ -234,9 +275,9 @@ public static IObservable>> SortA /// /// The type of the object. /// The type of the key. - /// The source to paginate. - /// The that determines sort order. - /// The that controls which page of sorted items to include. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. + /// The IComparer<TObject> that determines sort order. + /// The IObservable<IPageRequest> that controls which page of sorted items to include. /// The for controlling paging behavior. /// An observable which will emit paged change sets. /// source. @@ -256,7 +297,7 @@ public static IObservable>> SortA /// /// Worth noting: No data is emitted until produces its first value. Page numbers are 1-based. Requesting a page beyond the data range results in an empty page. /// - /// + /// SortAndPage<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IComparer<TObject>>, IObservable<IPageRequest>, SortAndPageOptions) public static IObservable>> SortAndPage( this IObservable> source, IComparer comparer, @@ -265,8 +306,8 @@ public static IObservable>> SortA where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pageRequests.ThrowArgumentNullExceptionIfNull(nameof(pageRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pageRequests); return new SortAndPage(source, comparer, pageRequests, options).Run(); } @@ -277,9 +318,9 @@ public static IObservable>> SortA /// /// The type of the object. /// The type of the key. - /// The source to paginate. - /// An that emits new comparers to re-sort with. - /// The that controls which page of sorted items to include. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. + /// An IObservable<IComparer<TObject>> that emits new comparers to re-sort with. + /// The IObservable<IPageRequest> that controls which page of sorted items to include. /// The for controlling paging behavior. /// An observable which will emit paged change sets. /// source. @@ -299,7 +340,7 @@ public static IObservable>> SortA /// /// Worth noting: No data is emitted until both the comparer observable and pageRequests have produced their first values. Page numbers are 1-based. Requesting a page beyond the data range results in an empty page. /// - /// + /// SortAndVirtualize<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IComparer<TObject>>, IObservable<IVirtualRequest>, SortAndVirtualizeOptions) public static IObservable>> SortAndPage( this IObservable> source, IObservable> comparerChanged, @@ -308,8 +349,8 @@ public static IObservable>> SortA where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pageRequests.ThrowArgumentNullExceptionIfNull(nameof(pageRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pageRequests); return new SortAndPage(source, comparerChanged, pageRequests, options).Run(); } @@ -319,16 +360,16 @@ public static IObservable>> SortA /// /// The type of the object. /// The type of the key. - /// The source to paginate. - /// The that controls which page of sorted items to include. + /// The source IObservable<ISortedChangeSet<TObject, TKey>> to paginate. + /// The IObservable<IPageRequest> that controls which page of sorted items to include. /// An observable which emits change sets. [Obsolete(Constants.PageIsObsolete)] public static IObservable> Page(this IObservable> source, IObservable pageRequests) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pageRequests.ThrowArgumentNullExceptionIfNull(nameof(pageRequests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pageRequests); return new Page(source, pageRequests).Run(); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.Watch.cs b/src/DynamicData/Cache/ObservableCacheEx.Watch.cs index 8cccf6088..37fc60d27 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.Watch.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.Watch.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,29 +17,29 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Filters the source changeset stream to a single key, emitting each for that key. + /// Filters the source changeset stream to a single key, emitting each Change<TObject, TKey> for that key. /// Changes for all other keys are ignored. /// /// The type of the object. /// The type of the key. - /// The source to watch a single key in. + /// The source IObservable<IChangeSet<TObject, TKey>> to watch a single key in. /// The key to observe. - /// An observable of for the specified key only. + /// An observable of Change<TObject, TKey> for the specified key only. /// /// /// Emits Add, Update, Remove, and Refresh changes as they occur for the target key. /// No initial emission occurs if the key is not yet present in the cache. This operator does not /// produce changesets; it produces individual change notifications. For Optional-based watching, - /// use . + /// use ToObservableOptional<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey, IEqualityComparer<TObject>?). /// /// - /// - /// + /// WatchValue<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey) + /// ToObservableOptional<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey, IEqualityComparer<TObject>?) public static IObservable> Watch(this IObservable> source, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.SelectMany(updates => updates).Where(update => update.Key.Equals(key)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.WatchValue.cs b/src/DynamicData/Cache/ObservableCacheEx.WatchValue.cs index 50929fb3a..70d2dac08 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.WatchValue.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.WatchValue.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,44 +22,49 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to watch a single key in. + /// The source IObservableCache<TObject, TKey> to watch a single key in. /// The key to observe. /// An observable of the item's value whenever it changes for the specified key. /// /// - /// Unlike , - /// this does not emit on removal. It emits the removed item's value instead. + /// Unlike ToObservableOptional<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey, IEqualityComparer<TObject>?), + /// this does not emit ReactiveUI.Primitives.Optional.None<T> on removal. It emits the removed item's value instead. /// If you need to distinguish presence from absence, use ToObservableOptional. /// /// /// EventBehavior /// AddEmits the added item's value. /// UpdateEmits the new value. - /// RemoveEmits the removed item's value (not None; use if you need removal detection). + /// RemoveEmits the removed item's value (not None; use ToObservableOptional<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey, IEqualityComparer<TObject>?) if you need removal detection). /// RefreshEmits the current value. /// /// Worth noting: No emission occurs if the key is not present at subscription time. Changes to other keys are ignored entirely. /// - /// - /// + /// Watch<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey) + /// ToObservableOptional<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TKey, IEqualityComparer<TObject>?) public static IObservable WatchValue(this IObservableCache source, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Watch(key).Select(u => u.Current); } - /// - /// The source to watch a single key in. + /// + /// Provides an overload of WatchValue for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<IChangeSet<TObject, TKey>> to watch a single key in. /// The key to observe. - /// This overload extends IObservable<> instead of . + /// The resulting observable sequence. + /// This overload extends IObservable<IChangeSet<TObject, TKey>> instead of IObservableCache<TObject, TKey>. public static IObservable WatchValue(this IObservable> source, TKey key) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Watch(key).Select(u => u.Current); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.WhenAnyPropertyChanged.cs b/src/DynamicData/Cache/ObservableCacheEx.WhenAnyPropertyChanged.cs index 15c3196dc..5a57c6d56 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.WhenAnyPropertyChanged.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.WhenAnyPropertyChanged.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -31,7 +29,7 @@ public static partial class ObservableCacheEx /// /// The type of the object (must implement ). /// The type of the key. - /// The source to observe property changes on items in. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe property changes on items in. /// The specific property names to monitor. If empty, all property changes trigger emissions. /// An observable that emits the item itself each time a monitored property changes. /// @@ -50,15 +48,15 @@ public static partial class ObservableCacheEx /// OnErrorErrors from individual property subscriptions are silently ignored. Source errors terminate the stream. /// /// - /// - /// - /// - /// + /// WhenPropertyChanged<TObject, TKey, TValue> + /// WhenValueChanged<TObject, TKey, TValue> + /// AutoRefresh<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableListEx.WhenAnyPropertyChanged public static IObservable WhenAnyPropertyChanged(this IObservable> source, params string[] propertiesToMonitor) where TObject : INotifyPropertyChanged where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.MergeMany(t => t.WhenAnyPropertyChanged(propertiesToMonitor)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.WhenPropertyChanged.cs b/src/DynamicData/Cache/ObservableCacheEx.WhenPropertyChanged.cs index 9efbb2791..8608dd73e 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.WhenPropertyChanged.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.WhenPropertyChanged.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -26,21 +24,21 @@ namespace DynamicData; public static partial class ObservableCacheEx { /// - /// Emits a (item + property value) whenever the specified property + /// Emits a PropertyValue<TObject, TValue> (item + property value) whenever the specified property /// changes on any item in the cache. Subscribes via using MergeMany. /// /// The type of the object (must implement ). /// The type of the key. /// The type of the monitored property. - /// The source to observe a specific property on items in. - /// A that expression selecting the property to monitor. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe a specific property on items in. + /// A Expression<TDelegate> that expression selecting the property to monitor. /// When (the default), the current property value is emitted immediately for each item upon subscription. - /// An observable of containing both the item and its property value. + /// An observable of PropertyValue<TObject, TValue> containing both the item and its property value. /// /// /// Per-item subscriptions are created on Add, replaced on Update, disposed on Remove. Errors from individual /// property subscriptions are silently ignored. The output is not a changeset stream. If you only need - /// the value (not the owning item), use instead. + /// the value (not the owning item), use WhenValueChanged<TObject, TKey, TValue> instead. /// /// /// EventBehavior @@ -51,13 +49,13 @@ public static partial class ObservableCacheEx /// OnErrorPer-item property subscription errors are silently ignored. Source errors terminate the stream. /// /// - /// + /// ObservableListEx.WhenPropertyChanged public static IObservable> WhenPropertyChanged(this IObservable> source, Expression> propertyAccessor, bool notifyOnInitialValue = true) where TObject : INotifyPropertyChanged where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); return source.MergeMany(t => t.WhenPropertyChanged(propertyAccessor, notifyOnInitialValue)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.WhenValueChanged.cs b/src/DynamicData/Cache/ObservableCacheEx.WhenValueChanged.cs index b27e31c4f..6f1a5ff49 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.WhenValueChanged.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.WhenValueChanged.cs @@ -1,24 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -27,20 +25,20 @@ public static partial class ObservableCacheEx { /// /// Emits the property value whenever the specified property changes on any item in the cache. - /// Like but emits only the value, discarding the owning item. + /// Like WhenPropertyChanged<TObject, TKey, TValue> but emits only the value, discarding the owning item. /// /// The type of the object (must implement ). /// The type of the key. /// The type of the monitored property. - /// The source to observe a specific property value on items in. - /// A that expression selecting the property to monitor. + /// The source IObservable<IChangeSet<TObject, TKey>> to observe a specific property value on items in. + /// A Expression<TDelegate> that expression selecting the property to monitor. /// When (the default), the current property value is emitted immediately for each item upon subscription. - /// An observable of property values. The owning item is not included; use if you need it. + /// An observable of property values. The owning item is not included; use WhenPropertyChanged<TObject, TKey, TValue> if you need it. /// /// /// Per-item subscriptions are created on Add, replaced on Update, disposed on Remove. Errors from individual /// property subscriptions are silently ignored. If you need to correlate a value back to its source item, - /// use which returns a pair. + /// use WhenPropertyChanged<TObject, TKey, TValue> which returns a PropertyValue<TObject, TValue> pair. /// /// /// EventBehavior @@ -51,16 +49,16 @@ public static partial class ObservableCacheEx /// OnErrorPer-item errors silently ignored. Source errors terminate the stream. /// /// - /// - /// - /// - /// + /// WhenPropertyChanged<TObject, TKey, TValue> + /// WhenAnyPropertyChanged<TObject, TKey> + /// AutoRefresh<TObject, TKey, TProperty>(IObservable<IChangeSet<TObject, TKey>>, Expression<Func<TObject, TProperty>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableListEx.WhenValueChanged public static IObservable WhenValueChanged(this IObservable> source, Expression> propertyAccessor, bool notifyOnInitialValue = true) where TObject : INotifyPropertyChanged where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); return source.MergeMany(t => t.WhenChanged(propertyAccessor, notifyOnInitialValue)); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.WhereReasonsAre.cs b/src/DynamicData/Cache/ObservableCacheEx.WhereReasonsAre.cs index 095e1ec11..82d8f4a36 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.WhereReasonsAre.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.WhereReasonsAre.cs @@ -1,24 +1,15 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -30,7 +21,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to filter by change reason. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter by change reason. /// The values to filter by. /// An observable which emits a change set with items matching the reasons. /// reasons. @@ -42,8 +33,8 @@ public static IObservable> WhereReasonsAre /// Extensions for dynamic data. @@ -30,7 +21,7 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to filter by excluding change reasons. + /// The source IObservable<IChangeSet<TObject, TKey>> to filter by excluding change reasons. /// The values to filter by. /// An observable which emits a change set with items not matching the reasons. /// reasons. @@ -42,7 +33,8 @@ public static IObservable> WhereReasonsAreNot /// Extensions for dynamic data. @@ -31,8 +29,8 @@ public static partial class ObservableCacheEx /// /// The type of the object. /// The type of the key. - /// The source to combine. - /// The additional streams to combine with. + /// The source IObservable<IChangeSet<TObject, TKey>> to combine. + /// The additional IObservable<IChangeSet<TObject, TKey>> streams to combine with. /// A changeset stream containing items present in exactly one source. /// /// @@ -49,15 +47,15 @@ public static partial class ObservableCacheEx /// /// /// or is . - /// - /// - /// - /// + /// And<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) + /// Or<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) + /// Except<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) + /// ObservableListEx.Xor public static IObservable> Xor(this IObservable> source, params IObservable>[] others) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (others is null || others.Length == 0) { @@ -67,14 +65,19 @@ public static IObservable> Xor(this IOb return source.Combine(CombineOperator.Xor, others); } - /// - /// The of streams to combine. + /// + /// Provides an overload of Xor for the supplied arguments. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The ICollection<T> of streams to combine. + /// The resulting observable sequence. /// This overload accepts a pre-built collection of sources instead of a params array. public static IObservable> Xor(this ICollection>> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Xor); } @@ -85,13 +88,13 @@ public static IObservable> Xor(this ICo /// /// The type of the object. /// The type of the key. - /// The of streams to combine. + /// The IObservableList<T> of streams to combine. /// An observable which emits a change set. public static IObservable> Xor(this IObservableList>> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Xor); } @@ -102,13 +105,13 @@ public static IObservable> Xor(this IOb /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<IObservableCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits a change set. public static IObservable> Xor(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Xor); } @@ -119,13 +122,13 @@ public static IObservable> Xor(this IOb /// /// The type of the object. /// The type of the key. - /// The of changeset streams to combine. + /// The IObservableList<ISourceCache<TObject, TKey>> of changeset streams to combine. /// An observable which emits a change set. public static IObservable> Xor(this IObservableList> sources) where TObject : notnull where TKey : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Combine(CombineOperator.Xor); } diff --git a/src/DynamicData/Cache/ObservableCacheEx.cs b/src/DynamicData/Cache/ObservableCacheEx.cs index 76a0cb1f8..548a3af9e 100644 --- a/src/DynamicData/Cache/ObservableCacheEx.cs +++ b/src/DynamicData/Cache/ObservableCacheEx.cs @@ -1,29 +1,23 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.CompilerServices; -using DynamicData.Binding; -using DynamicData.Cache; -using DynamicData.Cache.Internal; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. /// public static partial class ObservableCacheEx { + /// + /// The DefaultSortResetThreshold field. + /// private const int DefaultSortResetThreshold = 100; } diff --git a/src/DynamicData/Cache/PageContext.cs b/src/DynamicData/Cache/PageContext.cs index a36afc396..d260e5d4f 100644 --- a/src/DynamicData/Cache/PageContext.cs +++ b/src/DynamicData/Cache/PageContext.cs @@ -1,10 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Operators; +#else using DynamicData.Operators; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Parameters associated with the page operation. @@ -18,6 +28,9 @@ public record PageContext( IComparer Comparer, SortAndPageOptions Options) { + /// + /// The Empty field. + /// internal static readonly PageContext Empty = new ( new PageResponse(0, 0, 0, 0), diff --git a/src/DynamicData/Cache/PageRequest.cs b/src/DynamicData/Cache/PageRequest.cs index bddf8f33a..8bba7cb4e 100644 --- a/src/DynamicData/Cache/PageRequest.cs +++ b/src/DynamicData/Cache/PageRequest.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a new page request. @@ -67,12 +71,17 @@ public PageRequest() public int Size { get; } = 25; /// + /// The other value. + /// The result of the operation. public bool Equals(IPageRequest? other) => DefaultComparer.Equals(this, other); /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is IPageRequest value && Equals(value); /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -82,10 +91,20 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"Page: {Page}, Size: {Size}"; - private sealed class PageSizeEqualityComparer : IEqualityComparer +/// +/// Provides members for the PageSizeEqualityComparer class. +/// +private sealed class PageSizeEqualityComparer : IEqualityComparer { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(IPageRequest? x, IPageRequest? y) { if (ReferenceEquals(x, y)) @@ -111,6 +130,11 @@ public bool Equals(IPageRequest? x, IPageRequest? y) return x.Page == y.Page && x.Size == y.Size; } + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(IPageRequest? obj) { if (obj is null) diff --git a/src/DynamicData/Cache/PageResponse.cs b/src/DynamicData/Cache/PageResponse.cs index 425eb440e..4e445e73c 100644 --- a/src/DynamicData/Cache/PageResponse.cs +++ b/src/DynamicData/Cache/PageResponse.cs @@ -1,22 +1,53 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Operators; +#else using DynamicData.Operators; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; - +#endif + +/// +/// Provides members for the PageResponse class. +/// +/// The pageSize value. +/// The totalSize value. +/// The page value. +/// The pages value. internal sealed class PageResponse(int pageSize, int totalSize, int page, int pages) : IEquatable, IPageResponse { + /// + /// Gets the DefaultComparer value. + /// public static IEqualityComparer DefaultComparer { get; } = new PageResponseEqualityComparer(); + /// + /// Gets the Page value. + /// public int Page { get; } = page; + /// + /// Gets the Pages value. + /// public int Pages { get; } = pages; + /// + /// Gets the PageSize value. + /// public int PageSize { get; } = pageSize; + /// + /// Gets the TotalSize value. + /// public int TotalSize { get; } = totalSize; /// @@ -76,8 +107,17 @@ public override int GetHashCode() /// public override string ToString() => $"Page: {Page}, PageSize: {PageSize}, Pages: {Pages}, TotalSize: {TotalSize}"; - private sealed class PageResponseEqualityComparer : IEqualityComparer +/// +/// Provides members for the PageResponseEqualityComparer class. +/// +private sealed class PageResponseEqualityComparer : IEqualityComparer { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(IPageResponse? x, IPageResponse? y) { if (ReferenceEquals(x, y)) @@ -103,6 +143,11 @@ public bool Equals(IPageResponse? x, IPageResponse? y) return x.PageSize == y.PageSize && x.TotalSize == y.TotalSize && x.Page == y.Page && x.Pages == y.Pages; } + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(IPageResponse? obj) { if (obj is null) diff --git a/src/DynamicData/Cache/PagedChangeSet.cs b/src/DynamicData/Cache/PagedChangeSet.cs index f16135527..2c0541c30 100644 --- a/src/DynamicData/Cache/PagedChangeSet.cs +++ b/src/DynamicData/Cache/PagedChangeSet.cs @@ -1,19 +1,46 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.Operators; +#else using DynamicData.Operators; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the PagedChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class PagedChangeSet : ChangeSet, IPagedChangeSet where TObject : notnull where TKey : notnull { + /// + /// The Empty field. + /// public static new readonly IPagedChangeSet Empty = new PagedChangeSet(); + /// + /// Initializes a new instance of the class. + /// + /// The sortedItems value. + /// The updates value. + /// The response value. public PagedChangeSet(IKeyValueCollection sortedItems, IEnumerable> updates, IPageResponse response) : base(updates) { @@ -21,14 +48,23 @@ public PagedChangeSet(IKeyValueCollection sortedItems, IEnumerabl SortedItems = sortedItems; } + /// + /// Initializes a new instance of the class. + /// private PagedChangeSet() { SortedItems = new KeyValueCollection(); Response = new PageResponse(0, 0, 0, 0); } + /// + /// Gets the Response value. + /// public IPageResponse Response { get; } + /// + /// Gets the SortedItems value. + /// public IKeyValueCollection SortedItems { get; } /// @@ -38,8 +74,17 @@ private PagedChangeSet() /// If the page change set equals the other. public bool Equals(PagedChangeSet other) => SortedItems.SequenceEqual(other.SortedItems); + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is PagedChangeSet value && Equals(value); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => SortedItems.GetHashCode(); /// diff --git a/src/DynamicData/Cache/SortAndPageOptions.cs b/src/DynamicData/Cache/SortAndPageOptions.cs index 1783eced2..5ed8dfb62 100644 --- a/src/DynamicData/Cache/SortAndPageOptions.cs +++ b/src/DynamicData/Cache/SortAndPageOptions.cs @@ -1,15 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Options for the sort and virtualize operator. /// -public record struct SortAndPageOptions() +public readonly record struct SortAndPageOptions() { /// /// The sort reset threshold ie the number of changes before a reset is fired. diff --git a/src/DynamicData/Cache/SortAndVirtualizeOptions.cs b/src/DynamicData/Cache/SortAndVirtualizeOptions.cs index fa6843347..d078218fd 100644 --- a/src/DynamicData/Cache/SortAndVirtualizeOptions.cs +++ b/src/DynamicData/Cache/SortAndVirtualizeOptions.cs @@ -1,15 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Options for the sort and virtualize operator. /// -public record struct SortAndVirtualizeOptions() +public readonly record struct SortAndVirtualizeOptions() { /// /// The sort reset threshold ie the number of changes before a reset is fired. diff --git a/src/DynamicData/Cache/SortOptimisations.cs b/src/DynamicData/Cache/SortOptimisations.cs index 52cda18a8..af1226366 100644 --- a/src/DynamicData/Cache/SortOptimisations.cs +++ b/src/DynamicData/Cache/SortOptimisations.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Flags used to specify one or more sort optimisations. diff --git a/src/DynamicData/Cache/SortReason.cs b/src/DynamicData/Cache/SortReason.cs index b94ab15e4..d503f61b6 100644 --- a/src/DynamicData/Cache/SortReason.cs +++ b/src/DynamicData/Cache/SortReason.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// The reason why the sorted collection has changed. diff --git a/src/DynamicData/Cache/SortedChangeSet.cs b/src/DynamicData/Cache/SortedChangeSet.cs index fa9e37be0..364c8121f 100644 --- a/src/DynamicData/Cache/SortedChangeSet.cs +++ b/src/DynamicData/Cache/SortedChangeSet.cs @@ -1,30 +1,76 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the SortedChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class SortedChangeSet : ChangeSet, ISortedChangeSet where TObject : notnull where TKey : notnull { + /// + /// The Empty field. + /// public static new readonly ISortedChangeSet Empty = new SortedChangeSet(); + /// + /// Initializes a new instance of the class. + /// + /// The sortedItems value. + /// The updates value. public SortedChangeSet(IKeyValueCollection sortedItems, IEnumerable> updates) : base(updates) => SortedItems = sortedItems; + /// + /// Initializes a new instance of the class. + /// private SortedChangeSet() => SortedItems = new KeyValueCollection(); + /// + /// Gets the SortedItems value. + /// public IKeyValueCollection SortedItems { get; } + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(SortedChangeSet other) => SortedItems.SequenceEqual(other.SortedItems); + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is SortedChangeSet value && Equals(value); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => SortedItems.GetHashCode(); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"SortedChangeSet. Count= {SortedItems.Count}. Updates = {Count}"; } diff --git a/src/DynamicData/Cache/SourceCache.cs b/src/DynamicData/Cache/SourceCache.cs index 5d281579c..4aba29d00 100644 --- a/src/DynamicData/Cache/SourceCache.cs +++ b/src/DynamicData/Cache/SourceCache.cs @@ -3,10 +3,18 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An observable cache which exposes an update API. Used at the root @@ -24,6 +32,9 @@ public sealed class SourceCache(Func keySelector) where TObject : notnull where TKey : notnull { + /// + /// The _innerCache field. + /// private readonly ObservableCache _innerCache = new(keySelector); /// @@ -45,26 +56,38 @@ public sealed class SourceCache(Func keySelector) public IReadOnlyDictionary KeyValues => _innerCache.KeyValues; /// + /// The predicate value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public IObservable> Connect(Func? predicate = null, bool suppressEmptyChangeSets = true) => _innerCache.Connect(predicate, suppressEmptyChangeSets); /// public void Dispose() => _innerCache.Dispose(); /// + /// The updateAction value. public void Edit(Action> updateAction) => _innerCache.UpdateFromSource(updateAction); /// - public Optional Lookup(TKey key) => _innerCache.Lookup(key); + /// The key value. + /// The result of the operation. + public ReactiveUI.Primitives.Optional Lookup(TKey key) => _innerCache.Lookup(key); /// + /// The predicate value. + /// The result of the operation. public IObservable> Preview(Func? predicate = null) => _innerCache.Preview(predicate); /// + /// The key value. + /// The result of the operation. public IObservable> Watch(TKey key) => _innerCache.Watch(key); /// + /// The result of the operation. public IDisposable SuspendCount() => _innerCache.SuspendCount(); /// + /// The result of the operation. public IDisposable SuspendNotifications() => _innerCache.SuspendNotifications(); } diff --git a/src/DynamicData/Cache/SourceCacheEx.cs b/src/DynamicData/Cache/SourceCacheEx.cs index fa7a2e430..8d4c7dbb3 100644 --- a/src/DynamicData/Cache/SourceCacheEx.cs +++ b/src/DynamicData/Cache/SourceCacheEx.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Source cache convenience extensions. diff --git a/src/DynamicData/Cache/Tests/ChangeSetAggregator.cs b/src/DynamicData/Cache/Tests/ChangeSetAggregator.cs index dd2f6acbb..0b2e8a87c 100644 --- a/src/DynamicData/Cache/Tests/ChangeSetAggregator.cs +++ b/src/DynamicData/Cache/Tests/ChangeSetAggregator.cs @@ -1,13 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Diagnostics; +#else using DynamicData.Diagnostics; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a change set to help assertions when testing. @@ -19,6 +26,9 @@ public sealed class ChangeSetAggregator : IDisposable where TObject : notnull where TKey : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; /// @@ -27,6 +37,8 @@ public sealed class ChangeSetAggregator : IDisposable /// The source. public ChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); Data = published.AsObservableCache(); @@ -100,6 +112,9 @@ public sealed class ChangeSetAggregator : IDisposable where TObject : notnull where TKey : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; /// @@ -108,6 +123,8 @@ public sealed class ChangeSetAggregator : IDisposable /// The source. public ChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); Data = published.AsObservableCache(); diff --git a/src/DynamicData/Cache/Tests/DistinctChangeSetAggregator.cs b/src/DynamicData/Cache/Tests/DistinctChangeSetAggregator.cs index 745bf27ae..854d8f9f0 100644 --- a/src/DynamicData/Cache/Tests/DistinctChangeSetAggregator.cs +++ b/src/DynamicData/Cache/Tests/DistinctChangeSetAggregator.cs @@ -1,14 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Diagnostics; +#else using DynamicData.Diagnostics; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a distinct change set to help assertions when testing. @@ -17,8 +23,14 @@ namespace DynamicData.Tests; public class DistinctChangeSetAggregator : IDisposable where TValue : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; + /// + /// The _isDisposed field. + /// private bool _isDisposed; /// @@ -27,6 +39,8 @@ public class DistinctChangeSetAggregator : IDisposable /// The source. public DistinctChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); var error = published.Subscribe(_ => { }, ex => Error = ex); diff --git a/src/DynamicData/Cache/Tests/GroupChangeSetAggregator.cs b/src/DynamicData/Cache/Tests/GroupChangeSetAggregator.cs index 7711123f6..3f69fed5e 100644 --- a/src/DynamicData/Cache/Tests/GroupChangeSetAggregator.cs +++ b/src/DynamicData/Cache/Tests/GroupChangeSetAggregator.cs @@ -1,13 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Diagnostics; +#else using DynamicData.Diagnostics; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a group change set to help assertions when testing. @@ -20,8 +27,19 @@ public class GroupChangeSetAggregator : IDisposable where TKey : notnull where TGroupKey : notnull { + /// + /// The _compositeDisposable field. + /// private readonly CompositeDisposable _compositeDisposable; + + /// + /// The _messages field. + /// private readonly List> _messages = []; + + /// + /// The _disposedValue field. + /// private bool _disposedValue; /// @@ -30,6 +48,8 @@ public class GroupChangeSetAggregator : IDisposable /// The source. public GroupChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); Data = published.AsObservableCache(); diff --git a/src/DynamicData/Cache/Tests/PagedChangeSetAggregator.cs b/src/DynamicData/Cache/Tests/PagedChangeSetAggregator.cs index 42ff87a74..14bce5c9b 100644 --- a/src/DynamicData/Cache/Tests/PagedChangeSetAggregator.cs +++ b/src/DynamicData/Cache/Tests/PagedChangeSetAggregator.cs @@ -1,14 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Diagnostics; +#else using DynamicData.Diagnostics; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a paged change set to help assertions when testing. @@ -19,8 +25,14 @@ public class PagedChangeSetAggregator : IDisposable where TObject : notnull where TKey : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; + /// + /// The _isDisposed field. + /// private bool _isDisposed; /// @@ -29,6 +41,8 @@ public class PagedChangeSetAggregator : IDisposable /// The source. public PagedChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); var error = published.Subscribe(_ => { }, ex => Error = ex); diff --git a/src/DynamicData/Cache/Tests/SortedChangeSetAggregator.cs b/src/DynamicData/Cache/Tests/SortedChangeSetAggregator.cs index 70158e156..6984cc330 100644 --- a/src/DynamicData/Cache/Tests/SortedChangeSetAggregator.cs +++ b/src/DynamicData/Cache/Tests/SortedChangeSetAggregator.cs @@ -1,14 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Diagnostics; +#else using DynamicData.Diagnostics; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a sorted change set to help assertions when testing. @@ -19,8 +25,14 @@ public class SortedChangeSetAggregator : IDisposable where TObject : notnull where TKey : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; + /// + /// The _isDisposed field. + /// private bool _isDisposed; /// @@ -29,6 +41,8 @@ public class SortedChangeSetAggregator : IDisposable /// The source. public SortedChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); var error = published.Subscribe(_ => { }, ex => Error = ex); diff --git a/src/DynamicData/Cache/Tests/TestEx.cs b/src/DynamicData/Cache/Tests/TestEx.cs index aada3066a..0c693745b 100644 --- a/src/DynamicData/Cache/Tests/TestEx.cs +++ b/src/DynamicData/Cache/Tests/TestEx.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Test extensions. @@ -43,7 +47,7 @@ public static ChangeSetAggregator AsAggregator AsAggregator(this IObservable> source) where TValue : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DistinctChangeSetAggregator(source); } @@ -62,7 +66,7 @@ public static GroupChangeSetAggregator AsAggregator(source); } @@ -79,7 +83,7 @@ public static SortedChangeSetAggregator AsAggregator(source); } @@ -96,7 +100,7 @@ public static VirtualChangeSetAggregator AsAggregator(source); } @@ -112,7 +116,7 @@ public static PagedChangeSetAggregator AsAggregator(source); } diff --git a/src/DynamicData/Cache/Tests/VirtualChangeSetAggregator.cs b/src/DynamicData/Cache/Tests/VirtualChangeSetAggregator.cs index b972709a5..64a7bae69 100644 --- a/src/DynamicData/Cache/Tests/VirtualChangeSetAggregator.cs +++ b/src/DynamicData/Cache/Tests/VirtualChangeSetAggregator.cs @@ -1,14 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Diagnostics; +#else using DynamicData.Diagnostics; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a virtual change set to help assertions when testing. @@ -19,8 +25,14 @@ public class VirtualChangeSetAggregator : IDisposable where TObject : notnull where TKey : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; + /// + /// The _isDisposed field. + /// private bool _isDisposed; /// @@ -29,12 +41,13 @@ public class VirtualChangeSetAggregator : IDisposable /// The source. public VirtualChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); - var error = published.Subscribe(_ => { }, ex => Error = ex); - var results = published.Subscribe(updates => Messages.Add(updates)); + var results = published.Subscribe(updates => Messages.Add(updates), ex => Error = ex); Data = published.AsObservableCache(); - var summariser = published.CollectUpdateStats().Subscribe(summary => Summary = summary); + var summariser = published.CollectUpdateStats().Subscribe(summary => Summary = summary, _ => { }); var connected = published.Connect(); _disposer = Disposable.Create( @@ -43,7 +56,7 @@ public VirtualChangeSetAggregator(IObservable> connected.Dispose(); summariser.Dispose(); results.Dispose(); - error.Dispose(); + Data.Dispose(); }); } diff --git a/src/DynamicData/Cache/TransformAsyncOptions.cs b/src/DynamicData/Cache/TransformAsyncOptions.cs index 19ed9ab40..a2d1efc01 100644 --- a/src/DynamicData/Cache/TransformAsyncOptions.cs +++ b/src/DynamicData/Cache/TransformAsyncOptions.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Options for TransformAsync and TransformSafeAsync. diff --git a/src/DynamicData/Cache/VirtualChangeSet.cs b/src/DynamicData/Cache/VirtualChangeSet.cs index 3aae7f59f..6341236f9 100644 --- a/src/DynamicData/Cache/VirtualChangeSet.cs +++ b/src/DynamicData/Cache/VirtualChangeSet.cs @@ -1,18 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the VirtualChangeSet class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class VirtualChangeSet : ChangeSet, IVirtualChangeSet, IEquatable> where TObject : notnull where TKey : notnull { + /// + /// The Empty field. + /// public static new readonly IVirtualChangeSet Empty = new VirtualChangeSet(); + /// + /// Initializes a new instance of the class. + /// + /// The items value. + /// The sortedItems value. + /// The response value. public VirtualChangeSet(IEnumerable> items, IKeyValueCollection sortedItems, IVirtualResponse response) : base(items) { @@ -20,20 +43,46 @@ public VirtualChangeSet(IEnumerable> items, IKeyValueColle Response = response; } + /// + /// Initializes a new instance of the class. + /// private VirtualChangeSet() { SortedItems = new KeyValueCollection(); Response = new VirtualResponse(0, 0, 0); } + /// + /// Gets the Response value. + /// public IVirtualResponse Response { get; } + /// + /// Gets the SortedItems value. + /// public IKeyValueCollection SortedItems { get; } + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(VirtualChangeSet left, VirtualChangeSet right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(VirtualChangeSet left, VirtualChangeSet right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(VirtualChangeSet? other) { if (other is null) @@ -49,8 +98,17 @@ public bool Equals(VirtualChangeSet? other) return Response.Equals(other.Response) && Equals(SortedItems, other.SortedItems); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is VirtualChangeSet item && Equals(item); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() { unchecked diff --git a/src/DynamicData/Cache/VirtualContext.cs b/src/DynamicData/Cache/VirtualContext.cs index f909ddbc0..3ebf5a2c7 100644 --- a/src/DynamicData/Cache/VirtualContext.cs +++ b/src/DynamicData/Cache/VirtualContext.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Parameters associated with the virtualize operation. @@ -16,6 +21,9 @@ public record VirtualContext( IComparer Comparer, SortAndVirtualizeOptions Options) { + /// + /// The Empty field. + /// internal static readonly VirtualContext Empty = new ( new VirtualResponse(0, 0, 0), diff --git a/src/DynamicData/Cache/VirtualRequest.cs b/src/DynamicData/Cache/VirtualRequest.cs index 4d94c9412..9ee304d82 100644 --- a/src/DynamicData/Cache/VirtualRequest.cs +++ b/src/DynamicData/Cache/VirtualRequest.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A request object for virtualisation. @@ -52,12 +56,17 @@ public VirtualRequest() public int StartIndex { get; } /// + /// The other value. + /// The result of the operation. public bool Equals(IVirtualRequest? other) => StartIndexSizeComparer.Equals(this, other); /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is IVirtualRequest item && Equals(item); /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -67,10 +76,20 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"StartIndex: {StartIndex}, Size: {Size}"; - private sealed class StartIndexSizeEqualityComparer : IEqualityComparer +/// +/// Provides members for the StartIndexSizeEqualityComparer class. +/// +private sealed class StartIndexSizeEqualityComparer : IEqualityComparer { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(IVirtualRequest? x, IVirtualRequest? y) { if (ReferenceEquals(x, y)) @@ -96,6 +115,11 @@ public bool Equals(IVirtualRequest? x, IVirtualRequest? y) return x.StartIndex == y.StartIndex && x.Size == y.Size; } + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(IVirtualRequest? obj) { if (obj is null) diff --git a/src/DynamicData/Cache/VirtualResponse.cs b/src/DynamicData/Cache/VirtualResponse.cs index 70152976c..af347f103 100644 --- a/src/DynamicData/Cache/VirtualResponse.cs +++ b/src/DynamicData/Cache/VirtualResponse.cs @@ -1,15 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Defines values used to virtualise the result set. /// +/// The size value. +/// The startIndex value. +/// The totalSize value. internal sealed class VirtualResponse(int size, int startIndex, int totalSize) : IEquatable, IVirtualResponse { + /// + /// Gets the DefaultComparer value. + /// public static IEqualityComparer DefaultComparer { get; } = new TotalSizeStartIndexSizeEqualityComparer(); /// @@ -70,8 +80,17 @@ public override int GetHashCode() /// public override string ToString() => $"Size: {Size}, StartIndex: {StartIndex}, TotalSize: {TotalSize}"; - private sealed class TotalSizeStartIndexSizeEqualityComparer : IEqualityComparer +/// +/// Provides members for the TotalSizeStartIndexSizeEqualityComparer class. +/// +private sealed class TotalSizeStartIndexSizeEqualityComparer : IEqualityComparer { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(IVirtualResponse? x, IVirtualResponse? y) { if (ReferenceEquals(x, y)) @@ -97,6 +116,11 @@ public bool Equals(IVirtualResponse? x, IVirtualResponse? y) return x.TotalSize == y.TotalSize && x.StartIndex == y.StartIndex && x.Size == y.Size; } + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(IVirtualResponse? obj) { if (obj is null) diff --git a/src/DynamicData/Constants.cs b/src/DynamicData/Constants.cs index 11f6d9330..f03c46cd1 100644 --- a/src/DynamicData/Constants.cs +++ b/src/DynamicData/Constants.cs @@ -1,13 +1,36 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the Constants class. +/// internal static class Constants { + /// + /// The VirtualizeIsObsolete field. + /// public const string VirtualizeIsObsolete = "Use SortAndVirtualize as it's more efficient"; + + /// + /// The PageIsObsolete field. + /// public const string PageIsObsolete = "Use SortAndPage as it's more efficient"; + + /// + /// The TopIsObsolete field. + /// public const string TopIsObsolete = "Use Overload with comparer as it's more efficient"; + + /// + /// The SortIsObsolete field. + /// public const string SortIsObsolete = "Use SortAndBind as it's more efficient"; } diff --git a/src/DynamicData/Diagnostics/ChangeStatistics.cs b/src/DynamicData/Diagnostics/ChangeStatistics.cs index b9ddf9f49..09623de49 100644 --- a/src/DynamicData/Diagnostics/ChangeStatistics.cs +++ b/src/DynamicData/Diagnostics/ChangeStatistics.cs @@ -1,63 +1,31 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Diagnostics; +#else namespace DynamicData.Diagnostics; +#endif /// /// Object used to capture accumulated changes. /// -public class ChangeStatistics : IEquatable +/// Gets the index. +/// Gets the adds. +/// Gets the updates. +/// Gets the removes. +/// Gets the refreshes. +/// Gets the moves. +/// Gets the count. +public record ChangeStatistics(int Index, int Adds, int Updates, int Removes, int Refreshes, int Moves, int Count) { /// /// Initializes a new instance of the class. /// - public ChangeStatistics() => Index = -1; - - /// - /// Initializes a new instance of the class. - /// - /// The index of the change. - /// The number of additions. - /// The number of updates. - /// The number of removals. - /// The number of refreshes. - /// The number of moves. - /// The new count. - public ChangeStatistics(int index, int adds, int updates, int removes, int refreshes, int moves, int count) - { - Index = index; - Adds = adds; - Updates = updates; - Removes = removes; - Refreshes = refreshes; - Moves = moves; - Count = count; - } - - /// - /// Gets the adds. - /// - /// - /// The adds. - /// - public int Adds { get; } - - /// - /// Gets the count. - /// - /// - /// The count. - /// - public int Count { get; } - - /// - /// Gets the index. - /// - /// - /// The index. - /// - public int Index { get; } + public ChangeStatistics() + : this(-1, default, default, default, default, default, default) => Index = -1; /// /// Gets the last updated. @@ -67,74 +35,8 @@ public ChangeStatistics(int index, int adds, int updates, int removes, int refre /// public DateTime LastUpdated { get; } = DateTime.Now; - /// - /// Gets the moves. - /// - /// - /// The moves. - /// - public int Moves { get; } - - /// - /// Gets the refreshes. - /// - /// - /// The refreshes. - /// - public int Refreshes { get; } - - /// - /// Gets the removes. - /// - /// - /// The removes. - /// - public int Removes { get; } - - /// - /// Gets the updates. - /// - /// - /// The updates. - /// - public int Updates { get; } - - /// - /// Checks to see if both sides are equal. - /// - /// The left side to compare. - /// The right side to compare. - /// If the two sides are equal. - public static bool operator ==(ChangeStatistics left, ChangeStatistics right) => Equals(left, right); - - /// - /// Checks to see if both sides are not equal. - /// - /// The left side to compare. - /// The right side to compare. - /// If the two sides are not equal. - public static bool operator !=(ChangeStatistics left, ChangeStatistics right) => !Equals(left, right); - - /// - public bool Equals(ChangeStatistics? other) - { - if (other is null) - { - return false; - } - - if (ReferenceEquals(this, other)) - { - return true; - } - - return Adds == other.Adds && Updates == other.Updates && Removes == other.Removes && Refreshes == other.Refreshes && Moves == other.Moves && Count == other.Count && Index == other.Index && LastUpdated.Equals(other.LastUpdated); - } - - /// - public override bool Equals(object? obj) => obj is ChangeStatistics change && Equals(change); - /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -152,5 +54,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"CurrentIndex: {Index}, Adds: {Adds}, Updates: {Updates}, Removes: {Removes}, Refreshes: {Refreshes}, Count: {Count}, Timestamp: {LastUpdated}"; } diff --git a/src/DynamicData/Diagnostics/ChangeSummary.cs b/src/DynamicData/Diagnostics/ChangeSummary.cs index 5b9f88a34..efe4b767b 100644 --- a/src/DynamicData/Diagnostics/ChangeSummary.cs +++ b/src/DynamicData/Diagnostics/ChangeSummary.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Diagnostics; +#else namespace DynamicData.Diagnostics; +#endif /// /// Accumulates change statics. @@ -14,6 +19,9 @@ public class ChangeSummary /// public static readonly ChangeSummary Empty = new(); + /// + /// The _index field. + /// private readonly int _index; /// @@ -56,6 +64,8 @@ private ChangeSummary() public ChangeStatistics Overall { get; } /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -72,6 +82,7 @@ public override bool Equals(object? obj) } /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -84,7 +95,13 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"CurrentIndex: {_index}, Latest Count: {Latest.Count}, Overall Count: {Overall.Count}"; + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. private bool Equals(ChangeSummary other) => _index == other._index && Equals(Latest, other.Latest) && Equals(Overall, other.Overall); } diff --git a/src/DynamicData/Diagnostics/DiagnosticOperators.cs b/src/DynamicData/Diagnostics/DiagnosticOperators.cs index 0e13e735c..7e8b0193c 100644 --- a/src/DynamicData/Diagnostics/DiagnosticOperators.cs +++ b/src/DynamicData/Diagnostics/DiagnosticOperators.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Diagnostics; +#else namespace DynamicData.Diagnostics; +#endif /// /// Extensions for diagnostics. @@ -23,7 +26,7 @@ public static IObservable CollectUpdateStats(this where TSource : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Scan( ChangeSummary.Empty, @@ -53,7 +56,7 @@ public static IObservable CollectUpdateStats(this public static IObservable CollectUpdateStats(this IObservable> source) where TSource : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Scan( ChangeSummary.Empty, diff --git a/src/DynamicData/DynamicData.csproj b/src/DynamicData/DynamicData.csproj index 1b45eb1b3..a6e98141e 100644 --- a/src/DynamicData/DynamicData.csproj +++ b/src/DynamicData/DynamicData.csproj @@ -1,33 +1,75 @@ - - - netstandard2.0;net462;net6.0;net7.0;net8.0;net9.0;net10.0 - true - true - true - enable - - - - - - - - - - - - - Dynamic Data - -Bring the power of Rx to collections using Dynamic Data. -Dynamic Data is a comprehensive caching and data manipulation solution which introduces domain centric observable collections. - Linq extensions enable dynamic filtering, sorting, grouping, transforms, binding, pagination, data virtualisation, expiration, disposal management plus more. - - - - - - - - - + + + Dynamic Data + +Bring the power of Rx to collections using Dynamic Data. +Dynamic Data is a comprehensive caching and data manipulation solution which introduces domain centric observable collections. + Linq extensions enable dynamic filtering, sorting, grouping, transforms, binding, pagination, data virtualisation, expiration, disposal management plus more. + + net462;net472;net48;net481;net8.0;net9.0;net10.0;net11.0 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ObservableCacheEx.cs + + + + + + + + + + + + + + + + + + diff --git a/src/DynamicData/DynamicDataOptions.cs b/src/DynamicData/DynamicDataOptions.cs index 4d0cececb..91019d5a9 100644 --- a/src/DynamicData/DynamicDataOptions.cs +++ b/src/DynamicData/DynamicDataOptions.cs @@ -1,10 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// System-wide options container. diff --git a/src/DynamicData/EnumerableEx.cs b/src/DynamicData/EnumerableEx.cs index 124a4da30..35698a848 100644 --- a/src/DynamicData/EnumerableEx.cs +++ b/src/DynamicData/EnumerableEx.cs @@ -1,11 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for dynamic data. @@ -29,8 +31,8 @@ public static IObservable> AsObservableChangeSet>( obs => @@ -59,7 +61,7 @@ public static IObservable> AsObservableChangeSet> AsObservableChangeSet(this IEnumerable source, bool completable = false) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>( obs => diff --git a/src/DynamicData/Experimental/ExperimentalEx.cs b/src/DynamicData/Experimental/ExperimentalEx.cs index 69f7d3adc..8ba1573e8 100644 --- a/src/DynamicData/Experimental/ExperimentalEx.cs +++ b/src/DynamicData/Experimental/ExperimentalEx.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; +namespace DynamicData.Reactive.Experimental; +#else namespace DynamicData.Experimental; +#endif /// /// Experimental operator extensions. @@ -24,7 +27,7 @@ public static IWatcher AsWatcher(this IObservable< where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new Watcher(source, scheduler ?? GlobalConfig.DefaultScheduler); } diff --git a/src/DynamicData/Experimental/ISubjectWithRefCount.cs b/src/DynamicData/Experimental/ISubjectWithRefCount.cs index 3bf4d4eda..2d4142f1f 100644 --- a/src/DynamicData/Experimental/ISubjectWithRefCount.cs +++ b/src/DynamicData/Experimental/ISubjectWithRefCount.cs @@ -1,16 +1,19 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Experimental; +#else namespace DynamicData.Experimental; +#endif /// /// A subject which also contains its current reference count. /// /// The type of item. -internal interface ISubjectWithRefCount : ISubject +internal interface ISubjectWithRefCount : ISignal { /// Gets number of subscribers. /// diff --git a/src/DynamicData/Experimental/IWatcher.cs b/src/DynamicData/Experimental/IWatcher.cs index c936472ac..ccc6d4a4b 100644 --- a/src/DynamicData/Experimental/IWatcher.cs +++ b/src/DynamicData/Experimental/IWatcher.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Experimental; +#else namespace DynamicData.Experimental; +#endif /// /// A specialisation of the SourceList which is optimised for watching individual items. diff --git a/src/DynamicData/Experimental/SubjectWithRefCount.cs b/src/DynamicData/Experimental/SubjectWithRefCount.cs index 0554eb718..f067ce700 100644 --- a/src/DynamicData/Experimental/SubjectWithRefCount.cs +++ b/src/DynamicData/Experimental/SubjectWithRefCount.cs @@ -1,11 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Experimental; +#else namespace DynamicData.Experimental; +#endif /// /// A subject with a count of the number of subscribers. @@ -15,10 +17,21 @@ namespace DynamicData.Experimental; /// Initializes a new instance of the class. /// /// The subject to perform reference counting on. -internal sealed class SubjectWithRefCount(ISubject? subject = null) : ISubjectWithRefCount +internal sealed class SubjectWithRefCount(ISignal? subject = null) : ISubjectWithRefCount { - private readonly ISubject _subject = subject ?? new Subject(); + /// + /// The _subject field. + /// + private readonly ISignal _subject = subject ?? new Signal(); + + /// + /// The _isDisposed field. + /// + private bool _isDisposed; + /// + /// The _refCount field. + /// private int _refCount; /// Gets number of subscribers. @@ -27,6 +40,19 @@ internal sealed class SubjectWithRefCount(ISubject? subject = null) : ISub /// public int RefCount => _refCount; + /// + public bool HasObservers => Volatile.Read(ref _refCount) > 0; + + /// + public bool IsDisposed => _isDisposed; + + /// + public void Dispose() + { + _isDisposed = true; + (_subject as IDisposable)?.Dispose(); + } + /// /// Notifies the observer that the provider has finished sending push-based notifications. /// diff --git a/src/DynamicData/Experimental/Watcher.cs b/src/DynamicData/Experimental/Watcher.cs index 9825ae686..da704d459 100644 --- a/src/DynamicData/Experimental/Watcher.cs +++ b/src/DynamicData/Experimental/Watcher.cs @@ -1,32 +1,50 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Experimental; +#else namespace DynamicData.Experimental; +#endif +/// +/// Provides members for the Watcher class. +/// +/// The type of the TObject value. +/// The type of the TKey value. internal sealed class Watcher : IWatcher where TObject : notnull where TKey : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; -#if NET9_0_OR_GREATER - private readonly Lock _locker = new(); -#else + /// + /// The _locker field. + /// private readonly object _locker = new(); -#endif - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + /// + /// The _source field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] private readonly IObservableCache _source; - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] + /// + /// The _subscribers field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed with _cleanUp")] private readonly IntermediateCache>, TKey> _subscribers = new(); + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The scheduler value. public Watcher(IObservable> source, IScheduler scheduler) { _source = source.AsObservableCache(); @@ -40,7 +58,13 @@ public Watcher(IObservable> source, IScheduler schedul var subscriber = _subscribers.Lookup(update.Key); if (subscriber.HasValue) { - scheduler.Schedule(() => subscriber.Value.OnNext(update)); + scheduler.Schedule( + state: (subject: subscriber.Value, update), + action: static (_, state) => + { + state.subject.OnNext(state.update); + return Disposable.Empty; + }); } })); @@ -55,8 +79,16 @@ public Watcher(IObservable> source, IScheduler schedul }); } + /// + /// Executes the Dispose operation. + /// public void Dispose() => _disposer.Dispose(); + /// + /// Executes the Watch operation. + /// + /// The key value. + /// The result of the operation. public IObservable> Watch(TKey key) => Observable.Create>( observer => { @@ -71,7 +103,7 @@ public IObservable> Watch(TKey key) => Observable.Create>(new ReplaySubject>(1)); + subject = new SubjectWithRefCount>(new ReplaySignal>(1)); var initial = _source.Lookup(key); if (initial.HasValue) diff --git a/src/DynamicData/GlobalConfig.cs b/src/DynamicData/GlobalConfig.cs index 106e66aec..26d52c8a3 100644 --- a/src/DynamicData/GlobalConfig.cs +++ b/src/DynamicData/GlobalConfig.cs @@ -1,12 +1,21 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the GlobalConfig class. +/// internal static class GlobalConfig { + /// + /// Gets the DefaultScheduler value. + /// public static IScheduler DefaultScheduler => TaskPoolScheduler.Default; } diff --git a/src/DynamicData/IChangeSet.cs b/src/DynamicData/IChangeSet.cs index e0396936e..de3314701 100644 --- a/src/DynamicData/IChangeSet.cs +++ b/src/DynamicData/IChangeSet.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Base interface representing a set of changes. diff --git a/src/DynamicData/Internal/CacheParentSubscription.cs b/src/DynamicData/Internal/CacheParentSubscription.cs index e817c9fb3..b897b7f0b 100644 --- a/src/DynamicData/Internal/CacheParentSubscription.cs +++ b/src/DynamicData/Internal/CacheParentSubscription.cs @@ -1,12 +1,14 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; -using System.Reactive.Linq; +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Internal; +#else namespace DynamicData.Internal; +#endif /// /// Base class for subscriptions that need to manage child subscriptions and emit updates @@ -26,10 +28,12 @@ internal abstract class CacheParentSubscription _childSubscriptions = new(); + private readonly Dictionary _activeChildSubscriptionIds = []; private readonly SingleAssignmentDisposable _parentSubscription = new(); private readonly SharedDeliveryQueue _queue; private readonly IObserver _observer; private int _subscriptionCounter = 1; // Starts at 1 for the parent subscription + private long _childSubscriptionId; private int _frameDepth; private bool _isCompleted; private bool _hasTerminated; @@ -63,6 +67,9 @@ protected void AddChildSubscription(IObservable observable, TKey parentK // Add a new subscription. Do first so cleanup of existing subs doesn't trigger OnCompleted. Interlocked.Increment(ref _subscriptionCounter); + var subscriptionId = ++_childSubscriptionId; + _activeChildSubscriptionIds[parentKey] = subscriptionId; + // Create a container for the Disposable and add to the KeyedDisposable var disposableContainer = _childSubscriptions.Add(parentKey, new SingleAssignmentDisposable()); @@ -75,24 +82,26 @@ protected void AddChildSubscription(IObservable observable, TKey parentK // on normal completion (not disposal), so RemoveChildSubscription is NOT called when the // parent disposes child subscriptions during Dispose(). This asymmetry is intentional: // disposal cleanup is handled by KeyedDisposable, not by individual completion callbacks. - disposableContainer.Disposable = observable - .Finally(CheckCompleted) - .SubscribeSafe( - onNext: val => DeliverChild(val, parentKey), - onError: TerminalError, - onCompleted: () => CompleteChild(parentKey)); + disposableContainer.Disposable = PrimitivesLinqExtensions.SubscribeSafe( + observable.Finally(CheckCompleted), + onNext: val => DeliverChild(val, parentKey, subscriptionId), + onError: TerminalError, + onCompleted: () => CompleteChild(parentKey, subscriptionId)); } - protected void RemoveChildSubscription(TKey parentKey) => _childSubscriptions.Remove(parentKey); + protected void RemoveChildSubscription(TKey parentKey) + { + _activeChildSubscriptionIds.Remove(parentKey); + _childSubscriptions.Remove(parentKey); + } protected void CreateParentSubscription(IObservable> source) => _parentSubscription.Disposable = - source - .SynchronizeSafe(_queue) - .SubscribeSafe( - onNext: DeliverParent, - onError: TerminalError, - onCompleted: CompleteParent); + PrimitivesLinqExtensions.SubscribeSafe( + source.SynchronizeSafe(_queue), + onNext: DeliverParent, + onError: TerminalError, + onCompleted: CompleteParent); protected virtual void Dispose(bool disposing) { @@ -120,14 +129,27 @@ protected IObservable MakeChildObservable(IObservable observable) => private void DeliverParent(IChangeSet changes) { + if (_hasTerminated) + { + return; + } + using var frame = BeginFrame(); ParentOnNext(changes); } - private void DeliverChild(TChild child, TKey parentKey) + private void DeliverChild(TChild child, TKey parentKey, long subscriptionId) { + if (_hasTerminated) + { + return; + } + using var frame = BeginFrame(); - ChildOnNext(child, parentKey); + if (IsActiveChildSubscription(parentKey, subscriptionId)) + { + ChildOnNext(child, parentKey); + } } private void CompleteParent() @@ -136,12 +158,23 @@ private void CompleteParent() CheckCompleted(); } - private void CompleteChild(TKey parentKey) + private void CompleteChild(TKey parentKey, long subscriptionId) { + if (_hasTerminated) + { + return; + } + using var frame = BeginFrame(); - RemoveChildSubscription(parentKey); + if (IsActiveChildSubscription(parentKey, subscriptionId)) + { + RemoveChildSubscription(parentKey); + } } + private bool IsActiveChildSubscription(TKey parentKey, long subscriptionId) => + _activeChildSubscriptionIds.TryGetValue(parentKey, out var activeSubscriptionId) && activeSubscriptionId == subscriptionId; + /// /// Opens a delivery frame that stays open until the returned is disposed. /// Deliveries nested beneath this one, which the queue runs inline on the same thread, open and close @@ -162,7 +195,7 @@ private FrameTracker BeginFrame() /// private void EndFrame() { - if (--_frameDepth != 0) + if (--_frameDepth != 0 || _hasTerminated) { return; } @@ -178,6 +211,11 @@ private void EndFrame() private void TerminalError(Exception error) { + if (_hasTerminated) + { + return; + } + _hasTerminated = true; _observer.OnError(error); } diff --git a/src/DynamicData/Internal/DeliveryQueue.cs b/src/DynamicData/Internal/DeliveryQueue.cs index 74a688f25..34a209f9a 100644 --- a/src/DynamicData/Internal/DeliveryQueue.cs +++ b/src/DynamicData/Internal/DeliveryQueue.cs @@ -1,27 +1,55 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Internal; +#else namespace DynamicData.Internal; +#endif /// /// A queue that serializes item delivery outside a caller-owned lock. -/// Internally stores values. Delivery -/// is dispatched to an outside the lock. +/// Internally stores Notification<T> values. Delivery +/// is dispatched to an IObserver<T> outside the lock. /// /// The value type delivered via OnNext. internal sealed class DeliveryQueue : IObserver, IDisposable { + /// + /// The _queue field. + /// private readonly Queue> _queue = new(1); -#if NET9_0_OR_GREATER + /// + /// The _gate field. + /// private readonly Lock _gate; -#else - private readonly object _gate; -#endif + /// + /// The _queueGate field. + /// + private readonly Lock _queueGate = new(); + + /// + /// The _observer field. + /// private readonly IObserver _observer; + + /// + /// The _activeAccessCount field. + /// + private int _activeAccessCount; + + /// + /// The _drainThreadId field. + /// private int _drainThreadId = -1; + + /// + /// The _isTerminated field. + /// private volatile bool _isTerminated; /// @@ -30,11 +58,7 @@ internal sealed class DeliveryQueue : IObserver, IDisposable /// The observer that receives delivered items. public DeliveryQueue(IObserver observer) { -#if NET9_0_OR_GREATER _gate = new Lock(); -#else - _gate = new object(); -#endif _observer = observer; } @@ -43,11 +67,7 @@ public DeliveryQueue(IObserver observer) /// /// The lock shared with the caller. /// The observer that receives delivered items. -#if NET9_0_OR_GREATER public DeliveryQueue(Lock gate, IObserver observer) -#else - public DeliveryQueue(object gate, IObserver observer) -#endif { _gate = gate; _observer = observer; @@ -58,6 +78,11 @@ public DeliveryQueue(object gate, IObserver observer) /// public bool IsTerminated => _isTerminated; + /// + /// Gets whether the current thread is delivering queued notifications. + /// + internal bool IsDeliveringOnCurrentThread => Volatile.Read(ref _drainThreadId) == Environment.CurrentManagedThreadId; + /// /// Terminates the queue (rejecting further enqueues) and blocks until /// any in-flight delivery has completed. After this returns, no more @@ -66,16 +91,26 @@ public DeliveryQueue(object gate, IObserver observer) /// private void EnsureDeliveryComplete() { - using (AcquireReadLock()) + var isDrainThread = false; + + EnterQueueLock(); + try { _isTerminated = true; _queue.Clear(); + isDrainThread = _drainThreadId == Environment.CurrentManagedThreadId; + } + finally + { + ExitQueueLock(); + } - // If we're being called from within the drain loop (e.g., downstream - // disposed during OnNext), the current thread IS the deliverer. - // The drain loop will see _isTerminated and exit after we return. - if (_drainThreadId == Environment.CurrentManagedThreadId) - return; + // If we're being called from within the drain loop (e.g., downstream + // disposed during OnNext), the current thread IS the deliverer. + // The drain loop will see _isTerminated and exit after we return. + if (isDrainThread) + { + return; } SpinWait spinner = default; @@ -90,14 +125,17 @@ private void EnsureDeliveryComplete() /// Acquires the gate and returns a scoped access for enqueueing notifications. /// Disposing releases the gate and triggers delivery if needed. /// + /// The result of the operation. public ScopedAccess AcquireLock() => new(this); /// /// Acquires the gate for read-only inspection. Does not trigger delivery on dispose. /// + /// The result of the operation. public ReadOnlyScopedAccess AcquireReadLock() => new(this); /// Enqueues an OnNext notification via the lock, then drains. + /// The value value. public void OnNext(T value) { using var scope = AcquireLock(); @@ -105,6 +143,7 @@ public void OnNext(T value) } /// Enqueues an OnError notification via the lock, then drains. + /// The error value. public void OnError(Exception error) { using var scope = AcquireLock(); @@ -117,31 +156,112 @@ public void OnCompleted() using var scope = AcquireLock(); scope.EnqueueCompleted(); } - #if NET9_0_OR_GREATER + + /// + /// Executes the EnterLock operation. + /// private void EnterLock() => _gate.Enter(); + /// + /// Executes the ExitLock operation. + /// private void ExitLock() => _gate.Exit(); #else + + /// + /// Executes the EnterLock operation. + /// private void EnterLock() => Monitor.Enter(_gate); + /// + /// Executes the ExitLock operation. + /// private void ExitLock() => Monitor.Exit(_gate); #endif +#if NET9_0_OR_GREATER - private void EnqueueNotification(Notification item) + /// + /// Executes the EnterQueueLock operation. + /// + private void EnterQueueLock() => _queueGate.Enter(); + + /// + /// Executes the ExitQueueLock operation. + /// + private void ExitQueueLock() => _queueGate.Exit(); +#else + + /// + /// Executes the EnterQueueLock operation. + /// + private void EnterQueueLock() => Monitor.Enter(_queueGate); + + /// + /// Executes the ExitQueueLock operation. + /// + private void ExitQueueLock() => Monitor.Exit(_queueGate); +#endif + + /// + /// Enters caller-owned access and prevents queue draining until the access is released. + /// + private void EnterAccess() { - if (_isTerminated) + Interlocked.Increment(ref _activeAccessCount); + + try { - return; + EnterLock(); } + catch + { + Interlocked.Decrement(ref _activeAccessCount); + throw; + } + } + + /// + /// Releases caller-owned access and starts delivery if this was the final active access. + /// + private void ExitAccessAndDeliver() + { + ExitLock(); + + if (Interlocked.Decrement(ref _activeAccessCount) == 0) + { + DeliverIfNeeded(); + } + } + + /// + /// Executes the EnqueueNotification operation. + /// + /// The item value. + private void EnqueueNotification(Notification item) + { + EnterQueueLock(); + try + { + if (_isTerminated) + { + return; + } - _queue.Enqueue(item); + _queue.Enqueue(item); + } + finally + { + ExitQueueLock(); + } } - private void ExitLockAndDeliver() + /// + /// Executes the DeliverIfNeeded operation. + /// + private void DeliverIfNeeded() { var shouldDeliver = TryStartDelivery(); - ExitLock(); if (shouldDeliver) { @@ -150,13 +270,21 @@ private void ExitLockAndDeliver() bool TryStartDelivery() { - if (_drainThreadId != -1 || _queue.Count == 0) + EnterQueueLock(); + try { - return false; - } + if (_drainThreadId != -1 || _queue.Count == 0 || _isTerminated || Volatile.Read(ref _activeAccessCount) != 0) + { + return false; + } - _drainThreadId = Environment.CurrentManagedThreadId; - return true; + Volatile.Write(ref _drainThreadId, Environment.CurrentManagedThreadId); + return true; + } + finally + { + ExitQueueLock(); + } } void DeliverAll() @@ -165,25 +293,9 @@ void DeliverAll() { while (true) { - Notification notification; - - using (AcquireReadLock()) + if (!TryTakeNotification(out var notification)) { - if (_queue.Count == 0 || _isTerminated) - { - _drainThreadId = -1; - return; - } - - notification = _queue.Dequeue(); - - // Mark terminated BEFORE delivery so concurrent code - // (e.g., InvokePreview) sees the terminal state immediately. - if (notification.IsTerminal) - { - _isTerminated = true; - _queue.Clear(); - } + return; } // Deliver outside the lock @@ -191,44 +303,105 @@ void DeliverAll() if (notification.IsTerminal) { - using (AcquireReadLock()) - { - _drainThreadId = -1; - } - + StopDelivery(); return; } } } catch { - using (AcquireReadLock()) + StopDelivery(); + throw; + } + } + + bool TryTakeNotification(out Notification notification) + { + EnterQueueLock(); + try + { + if (_queue.Count == 0 || _isTerminated || Volatile.Read(ref _activeAccessCount) != 0) { - _drainThreadId = -1; + Volatile.Write(ref _drainThreadId, -1); + notification = default; + return false; } - throw; + notification = _queue.Dequeue(); + + // Mark terminated BEFORE delivery so concurrent code + // (e.g., InvokePreview) sees the terminal state immediately. + if (notification.IsTerminal) + { + _isTerminated = true; + _queue.Clear(); + } + + return true; + } + finally + { + ExitQueueLock(); + } + } + + void StopDelivery() + { + EnterQueueLock(); + try + { + Volatile.Write(ref _drainThreadId, -1); + } + finally + { + ExitQueueLock(); } } } /// - /// Scoped access for enqueueing notifications under the gate lock. + /// Gets whether queue delivery is currently pending or in progress. /// - public ref struct ScopedAccess + /// when there are queued or in-flight notifications. + private bool HasPendingNotifications() { + EnterQueueLock(); + try + { + return _queue.Count > 0 || _drainThreadId != -1; + } + finally + { + ExitQueueLock(); + } + } + +/// +/// Scoped access for enqueueing notifications under the gate lock. +/// +public ref struct ScopedAccess + { + /// + /// The _owner field. + /// private DeliveryQueue? _owner; + /// + /// Initializes a new instance of the struct. + /// + /// The owner value. internal ScopedAccess(DeliveryQueue owner) { _owner = owner; - owner.EnterLock(); + owner.EnterAccess(); } /// Enqueues an OnNext notification. + /// The value value. public readonly void EnqueueNext(T value) => _owner?.EnqueueNotification(Notification.CreateNext(value)); /// Enqueues an OnError notification (terminal). + /// The error value. public readonly void EnqueueError(Exception error) => _owner?.EnqueueNotification(Notification.CreateError(error)); /// Enqueues an OnCompleted notification (terminal). @@ -244,26 +417,32 @@ public void Dispose() } _owner = null; - owner.ExitLockAndDeliver(); + owner.ExitAccessAndDeliver(); } } - /// - /// Read-only scoped access. Disposing releases the gate without triggering delivery. - /// - public ref struct ReadOnlyScopedAccess +/// +/// Read-only scoped access. Disposing releases the gate and resumes any deferred delivery. +/// +public ref struct ReadOnlyScopedAccess { + /// + /// The _owner field. + /// private DeliveryQueue? _owner; + /// + /// Initializes a new instance of the struct. + /// + /// The owner value. internal ReadOnlyScopedAccess(DeliveryQueue owner) { _owner = owner; - owner.EnterLock(); + owner.EnterAccess(); } /// Gets whether there are notifications pending delivery. - public readonly bool HasPending => - _owner is not null && (_owner._queue.Count > 0 || _owner._drainThreadId != -1); + public readonly bool HasPending => _owner?.HasPendingNotifications() == true; /// Releases the gate lock. public void Dispose() @@ -275,7 +454,7 @@ public void Dispose() } _owner = null; - owner.ExitLock(); + owner.ExitAccessAndDeliver(); } } } diff --git a/src/DynamicData/Internal/ExceptionMixins.cs b/src/DynamicData/Internal/ExceptionMixins.cs deleted file mode 100644 index 7baad015f..000000000 --- a/src/DynamicData/Internal/ExceptionMixins.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -namespace DynamicData -{ - internal static class ExceptionMixins - { - public static void ThrowArgumentNullExceptionIfNull(this T? value, string name) - { - if (value is null) - { - throw new ArgumentNullException(name); - } - } - } -} diff --git a/src/DynamicData/Internal/KeyedDisposable.cs b/src/DynamicData/Internal/KeyedDisposable.cs index 4e2ab2951..92c013df9 100644 --- a/src/DynamicData/Internal/KeyedDisposable.cs +++ b/src/DynamicData/Internal/KeyedDisposable.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Internal; +#else namespace DynamicData.Internal; +#endif /// /// Manages Disposables by Key: @@ -14,16 +19,24 @@ namespace DynamicData.Internal; internal sealed class KeyedDisposable : IDisposable where TKey : notnull { + /// + /// The _disposables field. + /// private readonly Dictionary _disposables = []; -#if NET9_0_OR_GREATER + /// + /// The _gate field. + /// private readonly Lock _gate = new(); -#else - private readonly object _gate = new(); -#endif + /// + /// The _disposedValue field. + /// private bool _disposedValue; + /// + /// Gets the Count value. + /// public int Count { get @@ -33,6 +46,9 @@ public int Count } } + /// + /// Gets the Keys value. + /// public IEnumerable Keys { get @@ -42,12 +58,20 @@ public IEnumerable Keys } } + /// + /// Executes the ContainsKey operation. + /// + /// The key value. + /// The result of the operation. public bool ContainsKey(TKey key) { lock (_gate) return _disposables.ContainsKey(key); } + /// + /// Gets the IsDisposed value. + /// public bool IsDisposed { get @@ -63,6 +87,10 @@ public bool IsDisposed /// If the item is NOT disposable, any existing entry for the key is removed /// and disposed. /// + /// The type of the TItem value. + /// The key value. + /// The item value. + /// The result of the operation. public TItem Add(TKey key, TItem item) where TItem : notnull { @@ -105,6 +133,10 @@ public TItem Add(TKey key, TItem item) return item; } + /// + /// Executes the Remove operation. + /// + /// The key value. public void Remove(TKey key) { IDisposable? toDispose; @@ -123,6 +155,9 @@ public void Remove(TKey key) toDispose.Dispose(); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { Dictionary? snapshot; diff --git a/src/DynamicData/Internal/Notification.cs b/src/DynamicData/Internal/Notification.cs index 9e3eaf4a0..4c9dd7f2c 100644 --- a/src/DynamicData/Internal/Notification.cs +++ b/src/DynamicData/Internal/Notification.cs @@ -1,40 +1,61 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using DynamicData.Kernel; +namespace DynamicData.Reactive.Internal; +#else namespace DynamicData.Internal; +#endif /// /// A lightweight notification struct for delivery queues. Discriminates -/// OnNext, OnError, and OnCompleted using +/// OnNext, OnError, and OnCompleted using Optional<T>.HasValue /// and the error field, avoiding null discrimination on T? which /// is broken for value types in generic struct fields on .NET 9. /// +/// The type of the T value. internal readonly struct Notification { - private readonly Optional _value; + /// + /// The _value field. + /// + private readonly ReactiveUI.Primitives.Optional _value; + + /// + /// The _error field. + /// private readonly Exception? _error; - private Notification(Optional value, Exception? error) + /// + /// Initializes a new instance of the struct. + /// + /// The value value. + /// The error value. + private Notification(ReactiveUI.Primitives.Optional value, Exception? error) { _value = value; _error = error; } /// Creates an OnNext notification. + /// The value value. + /// The result of the operation. public static Notification CreateNext(T value) => new(value, null); /// Creates an OnError notification (terminal). + /// The error value. + /// The result of the operation. public static Notification CreateError(Exception error) { - error.ThrowArgumentNullExceptionIfNull(nameof(error)); - return new(Optional.None(), error); + ArgumentExceptionHelper.ThrowIfNull(error); + return new(ReactiveUI.Primitives.Optional.None, error); } /// Creates an OnCompleted notification (terminal). - public static Notification CreateCompleted() => new(Optional.None(), null); + /// The result of the operation. + public static Notification CreateCompleted() => new(ReactiveUI.Primitives.Optional.None, null); /// Gets whether this is an OnError notification. public bool IsError => _error is not null; @@ -43,6 +64,7 @@ public static Notification CreateError(Exception error) public bool IsTerminal => !_value.HasValue; /// Delivers this notification to the specified observer. + /// The observer value. public void Accept(IObserver observer) { if (_value.HasValue) diff --git a/src/DynamicData/Internal/ObservableEx.cs b/src/DynamicData/Internal/ObservableEx.cs deleted file mode 100644 index 8fce9a875..000000000 --- a/src/DynamicData/Internal/ObservableEx.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Reactive; - -namespace DynamicData.Internal; - -internal static class ObservableEx -{ - public static IDisposable SubscribeSafe(this IObservable observable, Action onNext, Action onError, Action onCompleted) => - observable.SubscribeSafe(Observer.Create(onNext, onError, onCompleted)); - - public static IDisposable SubscribeSafe(this IObservable observable, Action onNext, Action onError) => - observable.SubscribeSafe(Observer.Create(onNext, onError)); - - public static IDisposable SubscribeSafe(this IObservable observable, Action onError, Action onCompleted) => - observable.SubscribeSafe(Observer.Create(Stub.Ignore, onError, onCompleted)); - - public static IDisposable SubscribeSafe(this IObservable observable, Action onError) => - observable.SubscribeSafe(Observer.Create(Stub.Ignore, onError)); - - private static class Stub - { - public static readonly Action Ignore = static _ => { }; - } -} diff --git a/src/DynamicData/Internal/Rxx.cs b/src/DynamicData/Internal/Rxx.cs deleted file mode 100644 index 8fe86a561..000000000 --- a/src/DynamicData/Internal/Rxx.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -#if NET9_0_OR_GREATER -using DynamicData.Internal; - -namespace System.Reactive.Linq; - -internal static class Rxx -{ - /// - /// Keep this class internal as it should be supplied by System.Reactive and probably will be one day. - /// - public static IObservable Synchronize(this IObservable source, Lock locker) - { - return Observable.Create(observer => - { - return source.SubscribeSafe(t => - { - lock (locker) - { - observer.OnNext(t); - } - }, ex => - { - lock (locker) - { - observer.OnError(ex); - } - }, () => - { - lock (locker) - { - observer.OnCompleted(); - } - }); - }); - } -} -#endif diff --git a/src/DynamicData/Internal/SharedDeliveryQueue.cs b/src/DynamicData/Internal/SharedDeliveryQueue.cs index cdcd762f2..65e276c5d 100644 --- a/src/DynamicData/Internal/SharedDeliveryQueue.cs +++ b/src/DynamicData/Internal/SharedDeliveryQueue.cs @@ -1,10 +1,14 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. using System.Runtime.CompilerServices; +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Internal; +#else namespace DynamicData.Internal; +#endif /// /// A delivery queue that serializes delivery across multiple sources with different @@ -427,4 +431,4 @@ public void Dispose() owner._parent.ExitLockAndDrain(); } } -} \ No newline at end of file +} diff --git a/src/DynamicData/Internal/SwappableLock.cs b/src/DynamicData/Internal/SwappableLock.cs index 6b9fd31f3..5466de6a9 100644 --- a/src/DynamicData/Internal/SwappableLock.cs +++ b/src/DynamicData/Internal/SwappableLock.cs @@ -1,29 +1,47 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -namespace DynamicData; +namespace DynamicData.Reactive; +#else +namespace DynamicData; +#endif #if NET9_0_OR_GREATER +/// +/// Represents the SwappableLock value. +/// internal ref struct SwappableLock { + /// + /// Executes the CreateAndEnter operation. + /// + /// The gate value. + /// The result of the operation. public static SwappableLock CreateAndEnter(Lock gate) { gate.Enter(); return new SwappableLock { _gate = gate }; } + /// + /// Executes the SwapTo operation. + /// + /// The gate value. public void SwapTo(Lock gate) { if (_gate is null) throw new InvalidOperationException("Lock is not initialized"); - gate.Enter(); _gate.Exit(); _gate = gate; } + /// + /// Executes the Dispose operation. + /// public void Dispose() { if (_gate is not null) @@ -33,13 +51,23 @@ public void Dispose() } } + /// + /// The _gate field. + /// private Lock? _gate; } - #else +/// +/// Represents the SwappableLock value. +/// internal ref struct SwappableLock { + /// + /// Executes the CreateAndEnter operation. + /// + /// The gate value. + /// The result of the operation. public static SwappableLock CreateAndEnter(object gate) { var result = new SwappableLock() @@ -52,6 +80,10 @@ public static SwappableLock CreateAndEnter(object gate) return result; } + /// + /// Executes the SwapTo operation. + /// + /// The gate value. public void SwapTo(object gate) { if (_gate is null) @@ -69,6 +101,9 @@ public void SwapTo(object gate) _gate = gate; } + /// + /// Executes the Dispose operation. + /// public void Dispose() { if (_hasLock && (_gate is not null)) @@ -79,7 +114,14 @@ public void Dispose() } } + /// + /// The _hasLock field. + /// private bool _hasLock; + + /// + /// The _gate field. + /// private object? _gate; } diff --git a/src/DynamicData/Internal/SynchronizeSafeExtensions.cs b/src/DynamicData/Internal/SynchronizeSafeExtensions.cs index ace8ed4a1..e9a0027f7 100644 --- a/src/DynamicData/Internal/SynchronizeSafeExtensions.cs +++ b/src/DynamicData/Internal/SynchronizeSafeExtensions.cs @@ -1,11 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.Internal; +#else namespace DynamicData.Internal; +#endif /// /// Provides SynchronizeSafe extension methods, drop-in replacements @@ -25,7 +27,7 @@ namespace DynamicData.Internal; /// /// Queue-first (parameterless overload) /// Used by operators with teardown side effects (DisposeMany, OnBeingRemoved). -/// The queue is terminated first via , which ensures +/// The queue is terminated first via DeliveryQueue<T>.Dispose, which ensures /// all in-flight deliveries complete before the subscription is disposed and teardown logic /// (e.g., disposing removed items) runs. Terminal notifications are not needed because /// the subscriber is explicitly tearing down. @@ -38,7 +40,12 @@ internal static class SynchronizeSafeExtensions /// Synchronizes the source observable through a . /// Use when multiple sources of different types share a gate. /// - public static IObservable SynchronizeSafe(this IObservable source, SharedDeliveryQueue queue) => + /// The type of the T value. + /// The source value. + /// The queue value. + /// The result of the operation. + public static IObservable SynchronizeSafe(this IObservable source, SharedDeliveryQueue queue) + => Observable.Create(observer => { var subQueue = queue.CreateQueue(observer); @@ -48,14 +55,15 @@ public static IObservable SynchronizeSafe(this IObservable source, Shar }); /// - /// Synchronizes the source observable through an implicitly created . + /// Synchronizes the source observable through an implicitly created DeliveryQueue<T>. /// Drop-in replacement for Synchronize(locker). /// -#if NET9_0_OR_GREATER - public static IObservable SynchronizeSafe(this IObservable source, Lock gate) => -#else - public static IObservable SynchronizeSafe(this IObservable source, object gate) => -#endif + /// The type of the T value. + /// The source value. + /// The gate value. + /// The result of the operation. + public static IObservable SynchronizeSafe(this IObservable source, Lock gate) + => Observable.Create(observer => { var queue = new DeliveryQueue(gate, observer); @@ -65,12 +73,16 @@ public static IObservable SynchronizeSafe(this IObservable source, obje }); /// - /// Synchronizes the source observable through an implicitly created + /// Synchronizes the source observable through an implicitly created DeliveryQueue<T> /// with automatic delivery completion on dispose. The queue is terminated and drained /// before the source subscription is disposed, ensuring all in-flight notifications /// are delivered before teardown. /// - public static IObservable SynchronizeSafe(this IObservable source) => + /// The type of the T value. + /// The source value. + /// The result of the operation. + public static IObservable SynchronizeSafe(this IObservable source) + => Observable.Create(observer => { var queue = new DeliveryQueue(observer); diff --git a/src/DynamicData/Kernel/ConnectionStatus.cs b/src/DynamicData/Kernel/ConnectionStatus.cs index a6a41d5cf..d6d0f49f2 100644 --- a/src/DynamicData/Kernel/ConnectionStatus.cs +++ b/src/DynamicData/Kernel/ConnectionStatus.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Connectable cache status. diff --git a/src/DynamicData/Kernel/EnumerableEx.cs b/src/DynamicData/Kernel/EnumerableEx.cs index afeca3d3e..08ad055e8 100644 --- a/src/DynamicData/Kernel/EnumerableEx.cs +++ b/src/DynamicData/Kernel/EnumerableEx.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Enumerable extensions. @@ -17,7 +22,7 @@ public static class EnumerableEx /// The array of items. public static T[] AsArray(this IEnumerable source) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source as T[] ?? source.ToArray(); } @@ -30,7 +35,7 @@ public static T[] AsArray(this IEnumerable source) /// The list. public static List AsList(this IEnumerable source) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source as List ?? source.ToList(); } @@ -45,8 +50,8 @@ public static List AsList(this IEnumerable source) /// The enumerable of items. public static IEnumerable Duplicates(this IEnumerable source, Func valueSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.GroupBy(valueSelector).Where(group => group.Count() > 1).SelectMany(t => t); } @@ -73,21 +78,39 @@ public static IEnumerable Duplicates(this IEnumerable source, F /// A result as specified by the result selector. public static IEnumerable IndexOfMany(this IEnumerable source, IEnumerable itemsToFind, Func resultSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - itemsToFind.ThrowArgumentNullExceptionIfNull(nameof(itemsToFind)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(itemsToFind); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); var indexed = source.Select((element, index) => new { Element = element, Index = index }); return itemsToFind.Join(indexed, left => left, right => right.Element, (_, right) => right).Select(x => resultSelector(x.Element, x.Index)); } + /// + /// Executes the EmptyIfNull operation. + /// + /// The type of the T value. + /// The source value. + /// The result of the operation. internal static IEnumerable EmptyIfNull(this IEnumerable? source) => source ?? Enumerable.Empty(); + /// + /// Executes the EnumerateOne operation. + /// + /// The type of the T value. + /// The source value. + /// The result of the operation. internal static IEnumerable EnumerateOne(this T source) { yield return source; } + /// + /// Executes the ForEach operation. + /// + /// The type of the T value. + /// The source value. + /// The action value. internal static void ForEach(this IEnumerable source, Action action) { foreach (var item in source) @@ -96,6 +119,12 @@ internal static void ForEach(this IEnumerable source, Action action) } } + /// + /// Executes the ForEach operation. + /// + /// The type of the TObject value. + /// The source value. + /// The action value. internal static void ForEach(this IEnumerable source, Action action) { var i = 0; @@ -106,6 +135,12 @@ internal static void ForEach(this IEnumerable source, Action + /// Executes the ToHashSet operation. + /// + /// The type of the T value. + /// The source value. + /// The result of the operation. internal static HashSet ToHashSet(this IEnumerable source) => new(source); /// diff --git a/src/DynamicData/Kernel/EnumerableIList.cs b/src/DynamicData/Kernel/EnumerableIList.cs index 242f83b67..53bfcb3e6 100644 --- a/src/DynamicData/Kernel/EnumerableIList.cs +++ b/src/DynamicData/Kernel/EnumerableIList.cs @@ -1,16 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections; -using System.Diagnostics.CodeAnalysis; - // Lifted from here https://github.com/benaadams/Ben.Enumerable. Many thanks to the genius of the man. +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif +/// +/// Represents the EnumerableIList value. +/// +/// The type of the T value. +/// The list value. [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Same class name, different generics.")] internal readonly struct EnumerableIList(IList list) : IEnumerableIList, IList { + /// + /// Gets the Empty value. + /// public static EnumerableIList Empty { get; } /// @@ -20,51 +29,102 @@ internal readonly struct EnumerableIList(IList list) : IEnumerableIList public bool IsReadOnly => list.IsReadOnly; /// + /// The index value. public T this[int index] { get => list[index]; set => list[index] = value; } + /// + /// Executes the conversion operator operation. + /// + /// The list value. + /// The result of the operation. public static implicit operator EnumerableIList(List list) => new(list); + /// + /// Executes the conversion operator operation. + /// + /// The array value. + /// The result of the operation. public static implicit operator EnumerableIList(T[] array) => new(array); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public EnumeratorIList GetEnumerator() => new(list); /// + /// The item value. public void Add(T item) => list.Add(item); /// public void Clear() => list.Clear(); /// + /// The item value. + /// The result of the operation. public bool Contains(T item) => list.Contains(item); /// + /// The array value. + /// The arrayIndex value. public void CopyTo(T[] array, int arrayIndex) => list.CopyTo(array, arrayIndex); /// + /// The item value. + /// The result of the operation. public int IndexOf(T item) => list.IndexOf(item); /// + /// The index value. + /// The item value. public void Insert(int index, T item) => list.Insert(index, item); /// + /// The item value. + /// The result of the operation. public bool Remove(T item) => list.Remove(item); /// + /// The index value. public void RemoveAt(int index) => list.RemoveAt(index); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } +/// +/// Provides members for the EnumerableIList class. +/// internal static class EnumerableIList { + /// + /// Executes the Create operation. + /// + /// The type of the T value. + /// The list value. + /// The result of the operation. public static EnumerableIList Create(IList list) => new(list); + /// + /// Executes the Create operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The changeSet value. + /// The result of the operation. public static EnumerableIList> Create(IChangeSet changeSet) where TObject : notnull where TKey : notnull => diff --git a/src/DynamicData/Kernel/EnumeratorIList.cs b/src/DynamicData/Kernel/EnumeratorIList.cs index 237ad591e..b913693b4 100644 --- a/src/DynamicData/Kernel/EnumeratorIList.cs +++ b/src/DynamicData/Kernel/EnumeratorIList.cs @@ -1,20 +1,40 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections; - // Lifted from here https://github.com/benaadams/Ben.Enumerable. Many thanks to the genius of the man. +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif +/// +/// Represents the EnumeratorIList value. +/// +/// The type of the T value. +/// The list value. internal struct EnumeratorIList(IList list) : IEnumerator { + /// + /// The _index field. + /// private int _index = -1; + /// + /// Gets the Current value. + /// public readonly T Current => list[_index]; + /// + /// Gets the Current value. + /// readonly object? IEnumerator.Current => Current; + /// + /// Executes the MoveNext operation. + /// + /// The result of the operation. public bool MoveNext() { _index++; @@ -22,9 +42,15 @@ public bool MoveNext() return _index < list.Count; } + /// + /// Executes the Dispose operation. + /// public void Dispose() { } + /// + /// Executes the Reset operation. + /// public void Reset() => _index = -1; } diff --git a/src/DynamicData/Kernel/Error.cs b/src/DynamicData/Kernel/Error.cs index 05d61f4a4..0b78080b4 100644 --- a/src/DynamicData/Kernel/Error.cs +++ b/src/DynamicData/Kernel/Error.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// An error container used to report errors from within dynamic data operators. @@ -15,7 +20,7 @@ namespace DynamicData.Kernel; /// The exception that caused the error. /// The value for the error. /// The key for the error. -[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716:Identifiers should not match keywords", Justification = "By Design.")] +[SuppressMessage("Naming", "CA1716:Identifiers should not match keywords", Justification = "By Design.")] public sealed class Error(Exception? exception, TObject value, TKey key) : IKeyValue, IEquatable> where TKey : notnull { @@ -34,11 +39,25 @@ public sealed class Error(Exception? exception, TObject value, TK /// public TObject Value { get; } = value; + /// + /// Determines whether two instances are equal. + /// + /// The left error to compare. + /// The right error to compare. + /// when the values are equal; otherwise, . public static bool operator ==(Error left, Error right) => Equals(left, right); + /// + /// Determines whether two instances are not equal. + /// + /// The left error to compare. + /// The right error to compare. + /// when the values are not equal; otherwise, . public static bool operator !=(Error left, Error right) => !Equals(left, right); /// + /// The other value. + /// The result of the operation. public bool Equals(Error? other) { if (other is null) @@ -55,6 +74,8 @@ public bool Equals(Error? other) } /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -71,6 +92,7 @@ public override bool Equals(object? obj) } /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -83,5 +105,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"Key: {Key}, Value: {Value}, Exception: {Exception}"; } diff --git a/src/DynamicData/Kernel/IEnumerableIList.cs b/src/DynamicData/Kernel/IEnumerableIList.cs index 34511c156..170376afa 100644 --- a/src/DynamicData/Kernel/IEnumerableIList.cs +++ b/src/DynamicData/Kernel/IEnumerableIList.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // Lifted from here https://github.com/benaadams/Ben.Enumerable. Many thanks to the genius of the man. +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// A enumerable that also contains the enumerable list. diff --git a/src/DynamicData/Kernel/ISupportsCapacity.cs b/src/DynamicData/Kernel/ISupportsCapacity.cs index ce0bfa83a..68e448f0a 100644 --- a/src/DynamicData/Kernel/ISupportsCapacity.cs +++ b/src/DynamicData/Kernel/ISupportsCapacity.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// A collection type that supports a capacity. diff --git a/src/DynamicData/Kernel/InternalEx.cs b/src/DynamicData/Kernel/InternalEx.cs index 68e6fa47d..26815b82e 100644 --- a/src/DynamicData/Kernel/InternalEx.cs +++ b/src/DynamicData/Kernel/InternalEx.cs @@ -1,24 +1,30 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Extensions associated with times and intervals. /// public static class InternalEx { -#if NET9_0_OR_GREATER + /// + /// Executes the NewLock operation. + /// + /// The result of the operation. internal static Lock NewLock() => new(); -#else - internal static object NewLock() => new(); -#endif + + /// + /// Creates a monitor-backed synchronization gate for APIs that lock on . + /// + /// The result of the operation. + internal static object NewMonitorGate() => new(); /// /// Retries the with back off. @@ -35,6 +41,9 @@ public static class InternalEx public static IObservable RetryWithBackOff(this IObservable source, Func backOffStrategy) where TException : Exception { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(backOffStrategy); + IObservable Retry(int failureCount) => source.Catch( error => @@ -45,6 +54,11 @@ IObservable Retry(int failureCount) => return Observable.Throw(error); } + if (delay.Value == TimeSpan.Zero) + { + return Retry(failureCount + 1); + } + return Observable.Timer(delay.Value).SelectMany(Retry(failureCount + 1)); }); @@ -62,13 +76,25 @@ IObservable Retry(int failureCount) => /// The interval. /// The action. /// A disposable that will stop the schedule. - public static IDisposable ScheduleRecurringAction(this IScheduler scheduler, TimeSpan interval, Action action) => scheduler.Schedule( - interval, - scheduleNext => - { - action(); - scheduleNext(interval); - }); + public static IDisposable ScheduleRecurringAction(this IScheduler scheduler, TimeSpan interval, Action action) + { + ArgumentExceptionHelper.ThrowIfNull(scheduler); + ArgumentExceptionHelper.ThrowIfNull(action); + + var disposable = new SerialDisposable(); + + void ScheduleNext() => + disposable.Disposable = scheduler.Schedule( + interval, + () => + { + action(); + ScheduleNext(); + }); + + ScheduleNext(); + return disposable; + } /// /// Schedules a recurring action. @@ -84,32 +110,58 @@ public static IDisposable ScheduleRecurringAction(this IScheduler scheduler, Tim /// A disposable that will stop the schedule. public static IDisposable ScheduleRecurringAction(this IScheduler scheduler, Func interval, Action action) { - interval.ThrowArgumentNullExceptionIfNull(nameof(interval)); - - return scheduler.Schedule( - interval(), - scheduleNext => - { - action(); - var next = interval(); - scheduleNext(next); - }); + ArgumentExceptionHelper.ThrowIfNull(interval); + ArgumentExceptionHelper.ThrowIfNull(scheduler); + ArgumentExceptionHelper.ThrowIfNull(action); + + var disposable = new SerialDisposable(); + + void ScheduleNext() => + disposable.Disposable = scheduler.Schedule( + interval(), + () => + { + action(); + ScheduleNext(); + }); + + ScheduleNext(); + return disposable; } - internal static void OnNext(this ISubject source) => source.OnNext(Unit.Default); + /// + /// Executes the OnNext operation. + /// + /// The source value. + internal static void OnNext(this ISignal source) => source.OnNext(Unit.Default); + /// + /// Executes the Swap operation. + /// + /// The type of the TSwap value. + /// The t1 value. + /// The t2 value. internal static void Swap(ref TSwap t1, ref TSwap t2) => (t2, t1) = (t1, t2); + /// + /// Executes the ToUnit operation. + /// + /// The type of the T value. + /// The source value. + /// The result of the operation. internal static IObservable ToUnit(this IObservable source) => source.Select(_ => Unit.Default); /// /// Observable.Return without the memory leak. /// + /// The type of the T value. + /// The source value. + /// The result of the operation. internal static IObservable Return(Func source) => Observable.Create(o => { o.OnNext(source()); o.OnCompleted(); - return () => { }; + return Disposable.Empty; }); } diff --git a/src/DynamicData/Kernel/ItemWithIndex.cs b/src/DynamicData/Kernel/ItemWithIndex.cs index 2fe6f7588..46f94f049 100644 --- a/src/DynamicData/Kernel/ItemWithIndex.cs +++ b/src/DynamicData/Kernel/ItemWithIndex.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Container for an item and it's index from a list. @@ -12,50 +17,15 @@ namespace DynamicData.Kernel; /// Initializes a new instance of the struct. /// Initializes a new instance of the class. /// -/// The item. -/// The index. -public readonly struct ItemWithIndex(T item, int index) : IEquatable> +/// The item. +/// The index. +public readonly record struct ItemWithIndex(T Item, int Index) { - /// - /// Gets the item. - /// - public T Item { get; } = item; - - /// - /// Gets the index. - /// - public int Index { get; } = index; - - /// Returns a value that indicates whether the values of two objects are equal. - /// The first value to compare. - /// The second value to compare. - /// true if the and parameters have the same value; otherwise, false. - public static bool operator ==(in ItemWithIndex left, in ItemWithIndex right) => left.Equals(right); - - /// Returns a value that indicates whether two objects have different values. - /// The first value to compare. - /// The second value to compare. - /// true if and are not equal; otherwise, false. - public static bool operator !=(in ItemWithIndex left, in ItemWithIndex right) => !left.Equals(right); - - /// - public bool Equals(ItemWithIndex other) => EqualityComparer.Default.Equals(Item, other.Item); - - /// - public override bool Equals(object? obj) - { - if (obj is null) - { - return false; - } - - return obj is ItemWithIndex itemWithIndex && Equals(itemWithIndex); - } - /// Returns the hash code for this instance. /// A 32-bit signed integer that is the hash code for this instance. public override int GetHashCode() => Item is null ? 0 : EqualityComparer.Default.GetHashCode(Item); /// + /// The result of the operation. public override string ToString() => $"{Item} ({Index})"; } diff --git a/src/DynamicData/Kernel/ItemWithValue.cs b/src/DynamicData/Kernel/ItemWithValue.cs index 16d22182b..957547bf4 100644 --- a/src/DynamicData/Kernel/ItemWithValue.cs +++ b/src/DynamicData/Kernel/ItemWithValue.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Container for an item and it's Value from a list. @@ -13,55 +18,12 @@ namespace DynamicData.Kernel; /// Initializes a new instance of the struct. /// Initializes a new instance of the class. /// -/// The item. -/// The Value. -public readonly struct ItemWithValue(TObject item, TValue value) : IEquatable> +/// The item. +/// The Value. +public readonly record struct ItemWithValue(TObject Item, TValue Value) { - /// - /// Gets the item. - /// - public TObject Item { get; } = item; - - /// - /// Gets the Value. - /// - public TValue Value { get; } = value; - - /// - /// Implements the operator ==. - /// - /// The left. - /// The right. - /// - /// The result of the operator. - /// - public static bool operator ==(in ItemWithValue left, in ItemWithValue right) => Equals(left, right); - - /// - /// Implements the operator !=. - /// - /// The left. - /// The right. - /// - /// The result of the operator. - /// - public static bool operator !=(in ItemWithValue left, in ItemWithValue right) => !Equals(left, right); - - /// - public bool Equals(ItemWithValue other) => EqualityComparer.Default.Equals(Item, other.Item) && EqualityComparer.Default.Equals(Value, other.Value); - - /// - public override bool Equals(object? obj) - { - if (obj is null) - { - return false; - } - - return obj is ItemWithValue itemWithValue && Equals(itemWithValue); - } - /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -71,5 +33,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"{Item} ({Value})"; } diff --git a/src/DynamicData/Kernel/OptionElse.cs b/src/DynamicData/Kernel/OptionElse.cs index d644e62de..57af263d4 100644 --- a/src/DynamicData/Kernel/OptionElse.cs +++ b/src/DynamicData/Kernel/OptionElse.cs @@ -1,18 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Continuation container used for the else operator on an option object. /// public sealed class OptionElse { + /// + /// The NoAction field. + /// internal static readonly OptionElse NoAction = new(false); + /// + /// The _shouldRunAction field. + /// private readonly bool _shouldRunAction; + /// + /// Initializes a new instance of the class. + /// + /// The shouldRunAction value. internal OptionElse(bool shouldRunAction = true) => _shouldRunAction = shouldRunAction; /// @@ -22,7 +37,7 @@ public sealed class OptionElse /// action. public void Else(Action action) { - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(action); if (_shouldRunAction) { diff --git a/src/DynamicData/Kernel/OptionExtensions.cs b/src/DynamicData/Kernel/OptionExtensions.cs index 0c6c982cc..b7dfcbee4 100644 --- a/src/DynamicData/Kernel/OptionExtensions.cs +++ b/src/DynamicData/Kernel/OptionExtensions.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Extensions for optional. @@ -18,13 +23,13 @@ public static class OptionExtensions /// The converter. /// The converted value. /// converter. - public static Optional Convert(this in Optional source, Func converter) + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, Func converter) where TSource : notnull where TDestination : notnull { - converter.ThrowArgumentNullExceptionIfNull(nameof(converter)); + ArgumentExceptionHelper.ThrowIfNull(converter); - return source.HasValue ? converter(source.Value) : Optional.None(); + return source.HasValue ? converter(source.Value) : ReactiveUI.Primitives.Optional.None; } /// @@ -36,13 +41,13 @@ public static Optional Convert(this in Opti /// The converter that returns an optional value. /// The converted value. /// converter. - public static Optional Convert(this in Optional source, Func> converter) + public static ReactiveUI.Primitives.Optional Convert(this in ReactiveUI.Primitives.Optional source, Func> converter) where TSource : notnull where TDestination : notnull { - converter.ThrowArgumentNullExceptionIfNull(nameof(converter)); + ArgumentExceptionHelper.ThrowIfNull(converter); - return source.HasValue ? converter(source.Value) : Optional.None(); + return source.HasValue ? converter(source.Value) : ReactiveUI.Primitives.Optional.None; } /// @@ -59,11 +64,11 @@ public static Optional Convert(this in Opti /// or /// fallbackConverter. /// - public static TDestination? ConvertOr(this in Optional source, Func converter, Func fallbackConverter) + public static TDestination? ConvertOr(this in ReactiveUI.Primitives.Optional source, Func converter, Func fallbackConverter) where TSource : notnull { - converter.ThrowArgumentNullExceptionIfNull(nameof(converter)); - fallbackConverter.ThrowArgumentNullExceptionIfNull(nameof(fallbackConverter)); + ArgumentExceptionHelper.ThrowIfNull(converter); + ArgumentExceptionHelper.ThrowIfNull(fallbackConverter); return source.HasValue ? converter(source.Value) : fallbackConverter(); } @@ -80,16 +85,16 @@ public static Optional Convert(this in Opti /// or /// fallbackOperation. /// - public static Optional OrElse(this in Optional source, Func> fallbackOperation) + public static ReactiveUI.Primitives.Optional OrElse(this in ReactiveUI.Primitives.Optional source, Func> fallbackOperation) where T : notnull { - fallbackOperation.ThrowArgumentNullExceptionIfNull(nameof(fallbackOperation)); + ArgumentExceptionHelper.ThrowIfNull(fallbackOperation); return source.HasValue ? source : fallbackOperation(); } /// - /// Overloads Enumerable.FirstOrDefault() and wraps the result in a Optional + /// Overloads Enumerable.FirstOrDefault() and wraps the result in a ReactiveUI.Primitives.Optional /// &gt;T /// container. /// @@ -97,18 +102,18 @@ public static Optional OrElse(this in Optional source, Func /// The source. /// The selector. /// The first value or none. - public static Optional FirstOrOptional(this IEnumerable source, Func selector) + public static ReactiveUI.Primitives.Optional FirstOrOptional(this IEnumerable source, Func selector) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - selector.ThrowArgumentNullExceptionIfNull(nameof(selector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(selector); foreach (var item in source.Where(item => selector(item))) { - return Optional.Create(item); + return ReactiveUI.Primitives.Optional.Create(item); } - return Optional.None(); + return ReactiveUI.Primitives.Optional.None; } /// @@ -118,7 +123,7 @@ public static Optional FirstOrOptional(this IEnumerable source, FuncThe source. /// The action. /// The optional else extension. - public static OptionElse IfHasValue(this in Optional source, Action action) + public static OptionElse IfHasValue(this in ReactiveUI.Primitives.Optional source, Action action) where T : notnull { if (!source.HasValue || source.Value is null) @@ -126,7 +131,7 @@ public static OptionElse IfHasValue(this in Optional source, Action act return new OptionElse(); } - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(action); action(source.Value); return OptionElse.NoAction; @@ -139,7 +144,7 @@ public static OptionElse IfHasValue(this in Optional source, Action act /// The source. /// The action. /// The optional else extension. - public static OptionElse IfHasValue(this Optional? source, Action action) + public static OptionElse IfHasValue(this ReactiveUI.Primitives.Optional? source, Action action) where T : notnull { if (!source.HasValue) @@ -152,14 +157,14 @@ public static OptionElse IfHasValue(this Optional? source, Action actio return new OptionElse(); } - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(action); action(source.Value.Value); return OptionElse.NoAction; } /// - /// Overloads a TryGetValue of the dictionary wrapping the result as an Optional. + /// Overloads a TryGetValue of the dictionary wrapping the result as an ReactiveUI.Primitives.Optional. /// &gt;TValue /// /// @@ -168,13 +173,13 @@ public static OptionElse IfHasValue(this Optional? source, Action actio /// The source. /// The key. /// The option of the looked up value. - public static Optional Lookup(this IDictionary source, TKey key) + public static ReactiveUI.Primitives.Optional Lookup(this IDictionary source, TKey key) where TValue : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); var result = source.TryGetValue(key, out var contained); - return result ? contained : Optional.None(); + return result ? contained : ReactiveUI.Primitives.Optional.None; } /// @@ -187,7 +192,7 @@ public static Optional Lookup(this IDictionaryIf the item was removed. public static bool RemoveIfContained(this IDictionary source, TKey key) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.ContainsKey(key) && source.Remove(key); } @@ -199,7 +204,7 @@ public static bool RemoveIfContained(this IDictionaryThe type of item. /// The source. /// An enumerable of the selected items. - public static IEnumerable SelectValues(this IEnumerable> source) + public static IEnumerable SelectValues(this IEnumerable> source) where T : notnull => source.Where(t => t.HasValue && t.Value is not null).Select(t => t.Value!); /// @@ -220,10 +225,10 @@ public static T ValueOr(this T? source, T defaultValue) /// The value selector. /// If the value or a provided default. /// valueSelector. - public static T ValueOr(this in Optional source, Func valueSelector) + public static T ValueOr(this in ReactiveUI.Primitives.Optional source, Func valueSelector) where T : notnull { - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.HasValue ? source.Value : valueSelector(); } @@ -234,7 +239,7 @@ public static T ValueOr(this in Optional source, Func valueSelector) /// The type of the item. /// The source. /// The value or default. - public static T? ValueOrDefault(this in Optional source) + public static T? ValueOrDefault(this in ReactiveUI.Primitives.Optional source) where T : notnull { if (source.HasValue) @@ -253,10 +258,10 @@ public static T ValueOr(this in Optional source, Func valueSelector) /// The exception generator. /// The value. /// exceptionGenerator. - public static T ValueOrThrow(this in Optional source, Func exceptionGenerator) + public static T ValueOrThrow(this in ReactiveUI.Primitives.Optional source, Func exceptionGenerator) where T : notnull { - exceptionGenerator.ThrowArgumentNullExceptionIfNull(nameof(exceptionGenerator)); + ArgumentExceptionHelper.ThrowIfNull(exceptionGenerator); if (source.HasValue && source.Value is not null) { diff --git a/src/DynamicData/Kernel/OptionObservableExtensions.cs b/src/DynamicData/Kernel/OptionObservableExtensions.cs index bbb23a052..42c98faf7 100644 --- a/src/DynamicData/Kernel/OptionObservableExtensions.cs +++ b/src/DynamicData/Kernel/OptionObservableExtensions.cs @@ -1,10 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif /// /// Extensions for optional. @@ -21,20 +24,20 @@ public static class OptionObservableExtensions /// The converter. /// Observable Optional of . /// Source or Converter was null. - /// Observable version of . - public static IObservable> Convert(this IObservable> source, Func converter) + /// Observable version of OptionExtensions.Convert<TSource, TDestination>(in Optional<TSource>, Func<TSource, TDestination>). + public static IObservable> Convert(this IObservable> source, Func converter) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - converter.ThrowArgumentNullExceptionIfNull(nameof(converter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(converter); - return source.Select(optional => optional.HasValue ? converter(optional.Value) : Optional.None()); + return source.Select(optional => optional.HasValue ? converter(optional.Value) : ReactiveUI.Primitives.Optional.None); } /// - /// Overload of that allows the conversion - /// operation to also return an Optional. + /// Overload of Convert<TSource, TDestination>(IObservable<Optional<TSource>>, Func<TSource, TDestination>) that allows the conversion + /// operation to also return an ReactiveUI.Primitives.Optional. /// /// The type of the source. /// The type of the destination. @@ -42,15 +45,15 @@ public static IObservable> Convert /// The converter that returns an optional value. /// Observable Optional of . /// Source or Converter was null. - /// Observable version of . - public static IObservable> Convert(this IObservable> source, Func> converter) + /// Observable version of OptionExtensions.Convert<TSource, TDestination>(in Optional<TSource>, Func<TSource, Optional<TDestination>>). + public static IObservable> Convert(this IObservable> source, Func> converter) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - converter.ThrowArgumentNullExceptionIfNull(nameof(converter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(converter); - return source.Select(optional => optional.HasValue ? converter(optional.Value) : Optional.None()); + return source.Select(optional => optional.HasValue ? converter(optional.Value) : ReactiveUI.Primitives.Optional.None); } /// @@ -70,12 +73,12 @@ public static IObservable> Convert /// or /// fallbackConverter. /// - public static IObservable ConvertOr(this IObservable> source, Func converter, Func fallbackConverter) + public static IObservable ConvertOr(this IObservable> source, Func converter, Func fallbackConverter) where TSource : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - converter.ThrowArgumentNullExceptionIfNull(nameof(converter)); - fallbackConverter.ThrowArgumentNullExceptionIfNull(nameof(fallbackConverter)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(converter); + ArgumentExceptionHelper.ThrowIfNull(fallbackConverter); return source.Select(optional => optional.HasValue ? converter(optional.Value) : fallbackConverter()); } @@ -92,12 +95,12 @@ public static IObservable> Convert /// or /// fallbackOperation. /// - /// Observable version of . - public static IObservable> OrElse(this IObservable> source, Func> fallbackOperation) + /// Observable version of OptionExtensions.OrElse<T>(in Optional<T>, Func<Optional<T>>). + public static IObservable> OrElse(this IObservable> source, Func> fallbackOperation) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - fallbackOperation.ThrowArgumentNullExceptionIfNull(nameof(fallbackOperation)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(fallbackOperation); return source.Select(optional => optional.HasValue ? optional : fallbackOperation()); } @@ -109,13 +112,13 @@ public static IObservable> OrElse(this IObservable> s /// The source. /// The action. /// Optional alternative action for the Else case. - /// The same Observable Optional. - /// Observable version of . - public static IObservable> OnHasValue(this IObservable> source, Action action, Action? elseAction = null) + /// The same Observable ReactiveUI.Primitives.Optional. + /// Observable version of OptionExtensions.IfHasValue<T>(in Optional<T>, Action<T>). + public static IObservable> OnHasValue(this IObservable> source, Action action, Action? elseAction = null) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(action); return source.Do(optional => optional.IfHasValue(action).Else(() => elseAction?.Invoke())); } @@ -127,29 +130,34 @@ public static IObservable> OnHasValue(this IObservableThe source. /// The action. /// Optional alternative action for the Else case. - /// The same Observable Optional. - public static IObservable> OnHasNoValue(this IObservable> source, Action action, Action? elseAction = null) + /// The same Observable ReactiveUI.Primitives.Optional. + public static IObservable> OnHasNoValue(this IObservable> source, Action action, Action? elseAction = null) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(action); return source.Do(optional => optional.IfHasValue(val => elseAction?.Invoke(val)).Else(action)); } /// - /// Converts an Observable of into an IObservable of by extracting + /// Converts an Observable of Optional<T> into an IObservable of by extracting /// the values from Optionals that have one. /// /// The type of item. /// The source. /// An Observable with the Values. - /// Observable version of . - public static IObservable SelectValues(this IObservable> source) - where T : notnull => source.Where(t => t.HasValue && t.Value is not null).Select(t => t.Value!); + /// Observable version of OptionExtensions.SelectValues<T>(IEnumerable<Optional<T>>). + public static IObservable SelectValues(this IObservable> source) + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.Where(t => t.HasValue && t.Value is not null).Select(t => t.Value!); + } /// - /// Converts an Observable of into an IObservable of by extracting the + /// Converts an Observable of Optional<T> into an IObservable of by extracting the /// values from the ones that contain a value and then using to generate a value for the others. /// /// The type of the item. @@ -157,11 +165,12 @@ public static IObservable SelectValues(this IObservable> sourc /// The value selector. /// If the value or a provided default. /// valueSelector. - /// Observable version of . - public static IObservable ValueOr(this IObservable> source, Func valueSelector) + /// Observable version of OptionExtensions.ValueOr<T>(in Optional<T>, Func<T>). + public static IObservable ValueOr(this IObservable> source, Func valueSelector) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return source.Select(optional => optional.HasValue ? optional.Value : valueSelector()); } @@ -172,17 +181,17 @@ public static IObservable ValueOr(this IObservable> source, Fu /// The type of the item. /// The source. /// The value or default. - /// Observable version of . - public static IObservable ValueOrDefault(this IObservable> source) + /// Observable version of OptionExtensions.ValueOrDefault<T>(in Optional<T>). + public static IObservable ValueOrDefault(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Select(optional => optional.ValueOrDefault()); } /// - /// Converts an Observable of into an IObservable of by extracting the values. + /// Converts an Observable of Optional<T> into an IObservable of by extracting the values. /// If it has no value, is used to generate an exception that is injected into the stream as error. /// /// The type of the item. @@ -190,13 +199,12 @@ public static IObservable ValueOr(this IObservable> source, Fu /// The exception generator. /// The value. /// exceptionGenerator. - /// Observable version of . - public static IObservable ValueOrThrow(this IObservable> source, Func exceptionGenerator) + /// Observable version of OptionExtensions.ValueOrThrow<T>(in Optional<T>, Func<Exception>). + public static IObservable ValueOrThrow(this IObservable> source, Func exceptionGenerator) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - exceptionGenerator.ThrowArgumentNullExceptionIfNull(nameof(exceptionGenerator)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(exceptionGenerator); return Observable.Create(observer => source.Subscribe( diff --git a/src/DynamicData/Kernel/Optional.cs b/src/DynamicData/Kernel/Optional.cs deleted file mode 100644 index 0dbbd567f..000000000 --- a/src/DynamicData/Kernel/Optional.cs +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Diagnostics.CodeAnalysis; - -namespace DynamicData.Kernel; - -/// -/// The equivalent of a nullable type which works on value and reference types. -/// -/// The underlying value type of the generic type.1. -[SuppressMessage("Naming", "CA1716:Identifiers should not match keywords", Justification = "Deliberate usage.")] -[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Class names the same, generic differences.")] -public readonly struct Optional : IEquatable> - where T : notnull -{ - private readonly T? _value; - - /// - /// Initializes a new instance of the struct. - /// - /// The value. - internal Optional(T? value) - { - if (value is null) - { - HasValue = false; - _value = default; - } - else - { - _value = value; - HasValue = true; - } - } - - /// - /// Gets the default valueless optional. - /// - public static Optional None { get; } - - /// - /// Gets a value indicating whether the current object has a value. - /// - /// - /// - /// true if the current object has a value; false if the current object has no value. - /// - public bool HasValue { get; } - - /// - /// Gets the value of the current value. - /// - /// - /// - /// The value of the current object if the property is true. An exception is thrown if the property is false. - /// - /// The property is false. - public T Value - { - get - { - if (!HasValue || _value is null) - { - throw new InvalidOperationException("Optional has no value"); - } - - return _value; - } - } - - /// - /// Implicit cast from the vale to the optional. - /// - /// The value. - /// The optional value. - public static implicit operator Optional(T? value) => ToOptional(value); - - /// - /// Explicit cast from option to value. - /// - /// The value. - /// The optional value. - public static explicit operator T?(in Optional value) => FromOptional(value); - - public static bool operator ==(in Optional left, in Optional right) => left.Equals(right); - - public static bool operator !=(in Optional left, in Optional right) => !left.Equals(right); - - /// - /// Creates the specified value. - /// - /// The value. - /// The optional value. - public static Optional Create(T? value) => new(value); - - /// - /// Gets the value from the optional value. - /// - /// The optional value. - /// The value. - public static T? FromOptional(in Optional value) => value.Value; - - /// - /// Gets the optional from a value. - /// - /// The value to get the optional for. - /// The optional. - public static Optional ToOptional(T? value) => new(value); - - /// - public bool Equals(Optional other) - { - if (!HasValue) - { - return !other.HasValue; - } - - if (!other.HasValue) - { - return false; - } - - if (_value is null && other._value is null) - { - return true; - } - - if (_value is null || other._value is null) - { - return false; - } - - return HasValue.Equals(other.HasValue) && EqualityComparer.Default.Equals(_value, other._value); - } - - /// - public override bool Equals(object? obj) - { - if (obj is null) - { - return false; - } - - return obj is Optional optional && Equals(optional); - } - - /// - public override int GetHashCode() - { - unchecked - { - if (_value is null) - { - return 0; - } - - return (HasValue.GetHashCode() * 397) ^ EqualityComparer.Default.GetHashCode(_value); - } - } - - /// - public override string? ToString() - { - if (_value is null) - { - return ""; - } - - return !HasValue ? "" : _value.ToString(); - } -} - -/// -/// Optional factory class. -/// -[SuppressMessage("Naming", "CA1716:Identifiers should not match keywords", Justification = "By Design.")] -public static class Optional -{ - /// - /// Returns an None optional value for the specified type. - /// - /// The type of the item. - /// The optional value. - public static Optional None() - where T : notnull - => Optional.None; - - /// - /// Wraps the specified value in an Optional container. - /// - /// The type of the item. - /// The value. - /// The optional value. - public static Optional Some(T? value) - where T : notnull - => new(value); -} diff --git a/src/DynamicData/Kernel/ParallelEx.cs b/src/DynamicData/Kernel/ParallelEx.cs index c5b1ff14d..0c7163e24 100644 --- a/src/DynamicData/Kernel/ParallelEx.cs +++ b/src/DynamicData/Kernel/ParallelEx.cs @@ -1,15 +1,32 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif +/// +/// Provides members for the ParallelEx class. +/// internal static class ParallelEx { + /// + /// Executes the SelectParallel operation. + /// + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The selector value. + /// The maximumThreads value. + /// The result of the operation. public static async Task> SelectParallel(this IEnumerable source, Func> selector, int maximumThreads = 5) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - selector.ThrowArgumentNullExceptionIfNull(nameof(selector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(selector); var semaphore = new SemaphoreSlim(maximumThreads); var tasks = new List>(); diff --git a/src/DynamicData/Kernel/ReadOnlyCollectionLight.cs b/src/DynamicData/Kernel/ReadOnlyCollectionLight.cs index 3f621f60b..886a3b039 100644 --- a/src/DynamicData/Kernel/ReadOnlyCollectionLight.cs +++ b/src/DynamicData/Kernel/ReadOnlyCollectionLight.cs @@ -1,28 +1,59 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif +/// +/// Provides members for the ReadOnlyCollectionLight class. +/// +/// The type of the T value. internal sealed class ReadOnlyCollectionLight : IReadOnlyCollection { + /// + /// The _items field. + /// private readonly IList _items; + /// + /// Initializes a new instance of the class. + /// + /// The items value. public ReadOnlyCollectionLight(IEnumerable items) { _items = items.ToList(); Count = _items.Count; } + /// + /// Initializes a new instance of the class. + /// private ReadOnlyCollectionLight() => _items = new List(); + /// + /// Gets the Empty value. + /// public static IReadOnlyCollection Empty { get; } = new ReadOnlyCollectionLight(); + /// + /// Gets the Count value. + /// public int Count { get; } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator GetEnumerator() => _items.GetEnumerator(); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/Kernel/ReferenceEqualityComparer.cs b/src/DynamicData/Kernel/ReferenceEqualityComparer.cs index 962be384f..f02477e44 100644 --- a/src/DynamicData/Kernel/ReferenceEqualityComparer.cs +++ b/src/DynamicData/Kernel/ReferenceEqualityComparer.cs @@ -1,14 +1,37 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.Kernel; +#else namespace DynamicData.Kernel; +#endif +/// +/// Provides members for the ReferenceEqualityComparer class. +/// +/// The type of the T value. internal sealed class ReferenceEqualityComparer : IEqualityComparer { + /// + /// The Instance field. + /// public static readonly IEqualityComparer Instance = new ReferenceEqualityComparer(); + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(T? x, T? y) => ReferenceEquals(x, y); + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(T? obj) => obj is null ? 0 : obj.GetHashCode(); } diff --git a/src/DynamicData/List/Change.cs b/src/DynamicData/List/Change.cs index 07e830ae6..43851fe06 100644 --- a/src/DynamicData/List/Change.cs +++ b/src/DynamicData/List/Change.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Container to describe a single change to a cache. @@ -19,7 +23,7 @@ public sealed class Change : IEquatable> /// The current. /// The index. public Change(ListChangeReason reason, T current, int index = -1) - : this(reason, current, Optional.None(), index) + : this(reason, current, ReactiveUI.Primitives.Optional.None, index) { } @@ -70,13 +74,13 @@ public Change(T current, int currentIndex, int previousIndex) } Reason = ListChangeReason.Moved; - Item = new ItemChange(Reason, current, Optional.None(), currentIndex, previousIndex); + Item = new ItemChange(Reason, current, ReactiveUI.Primitives.Optional.None, currentIndex, previousIndex); Range = RangeChange.Empty; } /// /// Initializes a new instance of the class. - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The reason. /// The current. @@ -90,7 +94,7 @@ public Change(T current, int currentIndex, int previousIndex) /// or /// For , must supply an index. /// - public Change(ListChangeReason reason, T current, in Optional previous, int currentIndex = -1, int previousIndex = -1) + public Change(ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) { if (reason == ListChangeReason.Add && previous.HasValue) { @@ -135,11 +139,25 @@ public Change(ListChangeReason reason, T current, in Optional previous, int c /// public ChangeType Type => Reason.GetChangeType(); + /// + /// Determines whether two instances are equal. + /// + /// The left change to compare. + /// The right change to compare. + /// when the values are equal; otherwise, . public static bool operator ==(Change left, Change right) => Equals(left, right); + /// + /// Determines whether two instances are not equal. + /// + /// The left change to compare. + /// The right change to compare. + /// when the values are not equal; otherwise, . public static bool operator !=(Change left, Change right) => !Equals(left, right); /// + /// The other value. + /// The result of the operation. public bool Equals(Change? other) { if (other is null) @@ -156,6 +174,8 @@ public bool Equals(Change? other) } /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -177,6 +197,7 @@ public override bool Equals(object? obj) } /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -189,5 +210,6 @@ public override int GetHashCode() } /// + /// The result of the operation. public override string ToString() => $"{Reason}. {Range.Count} changes"; } diff --git a/src/DynamicData/List/ChangeAwareList.cs b/src/DynamicData/List/ChangeAwareList.cs index 90d8e3abc..d1be01452 100644 --- a/src/DynamicData/List/ChangeAwareList.cs +++ b/src/DynamicData/List/ChangeAwareList.cs @@ -1,21 +1,31 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A list which captures all changes which are made to it. These changes are recorded until CaptureChanges() at which point the changes are cleared. /// Used for creating custom operators. /// /// The item type. -/// +/// IExtendedList<T> public class ChangeAwareList : IExtendedList where T : notnull { + /// + /// The _innerList field. + /// private readonly List _innerList; + + /// + /// The _changes field. + /// private ChangeSet _changes = []; /// @@ -33,7 +43,7 @@ public ChangeAwareList(int capacity = -1) => /// The items to seed the change aware list with. public ChangeAwareList(IEnumerable items) { - items.ThrowArgumentNullExceptionIfNull(nameof(items)); + ArgumentExceptionHelper.ThrowIfNull(items); var list = items.ToList(); @@ -53,7 +63,7 @@ public ChangeAwareList(IEnumerable items) /// Should the list of changes also be copied over?. public ChangeAwareList(ChangeAwareList list, bool copyChanges) { - list.ThrowArgumentNullExceptionIfNull(nameof(list)); + ArgumentExceptionHelper.ThrowIfNull(list); _innerList = new List(list._innerList); @@ -85,7 +95,7 @@ public int Capacity /// /// Gets the last change in the collection. /// - private Optional> Last => _changes.Count == 0 ? Optional.None>() : _changes[_changes.Count - 1]; + private ReactiveUI.Primitives.Optional> Last => _changes.Count == 0 ? ReactiveUI.Primitives.Optional>.None : _changes[_changes.Count - 1]; /// /// Gets or sets the item at the specified index. @@ -119,6 +129,7 @@ public void AddRange(IEnumerable collection) _changes.Add(args); _innerList.AddRange(args.Range); + OnInsertItems(args.Range.Index, args.Range); } /// @@ -177,6 +188,7 @@ public virtual void Clear() public void CopyTo(T[] array, int arrayIndex) => _innerList.CopyTo(array, arrayIndex); /// + /// The result of the operation. public IEnumerator GetEnumerator() => _innerList.ToList().GetEnumerator(); /// @@ -215,12 +227,12 @@ public void Insert(int index, T item) } /// - /// Inserts the elements of a collection into the at the specified index. + /// Inserts the elements of a collection into the List<T> at the specified index. /// /// Inserts the specified items. /// The zero-based index at which the new elements should be inserted. /// is null. - /// is less than 0.-or- is greater than . + /// is less than 0.-or- is greater than List<T>.Count. public void InsertRange(IEnumerable collection, int index) { var args = new Change(ListChangeReason.AddRange, collection, index); @@ -389,9 +401,9 @@ public void RemoveAt(int index) } /// - /// Removes a range of elements from the . + /// Removes a range of elements from the List<T>. /// - /// The zero-based starting index of the range of elements to remove.The number of elements to remove. is less than 0.-or- is less than 0. and do not denote a valid range of elements in the . + /// The zero-based starting index of the range of elements to remove.The number of elements to remove. is less than 0.-or- is less than 0. and do not denote a valid range of elements in the List<T>. public void RemoveRange(int index, int count) { if (index >= _innerList.Count || index + count > _innerList.Count) @@ -414,6 +426,7 @@ public void RemoveRange(int index, int count) } /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); /// diff --git a/src/DynamicData/List/ChangeAwareListWithRefCounts.cs b/src/DynamicData/List/ChangeAwareListWithRefCounts.cs index 234b07930..6b27b2448 100644 --- a/src/DynamicData/List/ChangeAwareListWithRefCounts.cs +++ b/src/DynamicData/List/ChangeAwareListWithRefCounts.cs @@ -1,35 +1,80 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the ChangeAwareListWithRefCounts class. +/// +/// The type of the T value. internal sealed class ChangeAwareListWithRefCounts : ChangeAwareList where T : notnull { + /// + /// The _tracker field. + /// private readonly ReferenceCountTracker _tracker = new(); + /// + /// Executes the Clear operation. + /// public override void Clear() { _tracker.Clear(); base.Clear(); } + /// + /// Executes the Contains operation. + /// + /// The item value. + /// The result of the operation. public override bool Contains(T item) => _tracker.Contains(item); + /// + /// Executes the InsertItem operation. + /// + /// The index value. + /// The item value. protected override void InsertItem(int index, T item) { _tracker.Add(item); base.InsertItem(index, item); } + /// + /// Executes the OnInsertItems operation. + /// + /// The startIndex value. + /// The items value. protected override void OnInsertItems(int startIndex, IEnumerable items) => items.ForEach(t => _tracker.Add(t)); + /// + /// Executes the OnRemoveItems operation. + /// + /// The startIndex value. + /// The items value. protected override void OnRemoveItems(int startIndex, IEnumerable items) => items.ForEach(t => _tracker.Remove(t)); + /// + /// Executes the OnSetItem operation. + /// + /// The index value. + /// The newItem value. + /// The oldItem value. protected override void OnSetItem(int index, T newItem, T oldItem) { _tracker.Remove(oldItem); @@ -37,6 +82,11 @@ protected override void OnSetItem(int index, T newItem, T oldItem) base.OnSetItem(index, newItem, oldItem); } + /// + /// Executes the RemoveItem operation. + /// + /// The index value. + /// The item value. protected override void RemoveItem(int index, T item) { _tracker.Remove(item); diff --git a/src/DynamicData/List/ChangeSet.cs b/src/DynamicData/List/ChangeSet.cs index d1b18aa09..e50a25f24 100644 --- a/src/DynamicData/List/ChangeSet.cs +++ b/src/DynamicData/List/ChangeSet.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A set of changes which has occurred since the last reported change. @@ -25,7 +29,7 @@ public ChangeSet() } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The items. /// items. diff --git a/src/DynamicData/List/ChangeSetEx.cs b/src/DynamicData/List/ChangeSetEx.cs index 7abe7c5fa..915f0dd1f 100644 --- a/src/DynamicData/List/ChangeSetEx.cs +++ b/src/DynamicData/List/ChangeSetEx.cs @@ -1,12 +1,25 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Linq; +#else using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Change set extensions. @@ -23,7 +36,7 @@ public static class ChangeSetEx public static IEnumerable> Flatten(this IChangeSet source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new ItemChangeEnumerator(source); } @@ -57,8 +70,8 @@ public static IChangeSet Transform(this ICh where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformer.ThrowArgumentNullExceptionIfNull(nameof(transformer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformer); var changes = source.Select( change => @@ -75,7 +88,7 @@ public static IChangeSet Transform(this ICh } /// - /// Remove the index from the changes. + /// Removes mutation indices and omits moves. Refresh notifications retain their required original source index. /// /// The type of the item. /// The source. @@ -83,7 +96,7 @@ public static IChangeSet Transform(this ICh public static IEnumerable> YieldWithoutIndex(this IEnumerable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new WithoutIndexEnumerator(source); } @@ -98,7 +111,7 @@ public static IEnumerable> YieldWithoutIndex(this IEnumerable> Unified(this IChangeSet source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new UnifiedChangeEnumerator(source); } diff --git a/src/DynamicData/List/ChangeType.cs b/src/DynamicData/List/ChangeType.cs index 481e7c1bf..cf91a311e 100644 --- a/src/DynamicData/List/ChangeType.cs +++ b/src/DynamicData/List/ChangeType.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Description of the type of change. diff --git a/src/DynamicData/List/IChangeSet.cs b/src/DynamicData/List/IChangeSet.cs index 36434a08d..f4dd92d5b 100644 --- a/src/DynamicData/List/IChangeSet.cs +++ b/src/DynamicData/List/IChangeSet.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A collection of changes. diff --git a/src/DynamicData/List/IChangeSetAdaptor.cs b/src/DynamicData/List/IChangeSetAdaptor.cs index db579cb12..79e579d01 100644 --- a/src/DynamicData/List/IChangeSetAdaptor.cs +++ b/src/DynamicData/List/IChangeSetAdaptor.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A simple adaptor to inject side effects into a change set observable. diff --git a/src/DynamicData/List/IExtendedList.cs b/src/DynamicData/List/IExtendedList.cs index 8afb9e5df..c1e2b8733 100644 --- a/src/DynamicData/List/IExtendedList.cs +++ b/src/DynamicData/List/IExtendedList.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a list which supports range operations. @@ -19,12 +23,12 @@ public interface IExtendedList : IList void AddRange(IEnumerable collection); /// - /// Inserts the elements of a collection into the at the specified index. + /// Inserts the elements of a collection into the List<T> at the specified index. /// /// The items to insert. /// The zero-based index at which the new elements should be inserted. /// is null. - /// is less than 0.-or- is greater than . + /// is less than 0.-or- is greater than List<T>.Count. void InsertRange(IEnumerable collection, int index); /// @@ -35,8 +39,8 @@ public interface IExtendedList : IList void Move(int original, int destination); /// - /// Removes a range of elements from the . + /// Removes a range of elements from the List<T>. /// - /// The zero-based starting index of the range of elements to remove.The number of elements to remove. is less than 0.-or- is less than 0. and do not denote a valid range of elements in the . + /// The zero-based starting index of the range of elements to remove.The number of elements to remove. is less than 0.-or- is less than 0. and do not denote a valid range of elements in the List<T>. void RemoveRange(int index, int count); } diff --git a/src/DynamicData/List/IGroup.cs b/src/DynamicData/List/IGroup.cs index c8f4e09e9..60e28cb3b 100644 --- a/src/DynamicData/List/IGroup.cs +++ b/src/DynamicData/List/IGroup.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A grouping of observable lists. diff --git a/src/DynamicData/List/IGrouping.cs b/src/DynamicData/List/IGrouping.cs index 30af65d59..2568fb638 100644 --- a/src/DynamicData/List/IGrouping.cs +++ b/src/DynamicData/List/IGrouping.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List; +#else namespace DynamicData.List; +#endif /// /// Represents a group which provides an update after any value within the group changes. diff --git a/src/DynamicData/List/IObservableList.cs b/src/DynamicData/List/IObservableList.cs index 0935c0df0..f2b54db40 100644 --- a/src/DynamicData/List/IObservableList.cs +++ b/src/DynamicData/List/IObservableList.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// A readonly observable list, providing observable methods diff --git a/src/DynamicData/List/IPageChangeSet.cs b/src/DynamicData/List/IPageChangeSet.cs index 447612a76..b64f1c1ee 100644 --- a/src/DynamicData/List/IPageChangeSet.cs +++ b/src/DynamicData/List/IPageChangeSet.cs @@ -1,11 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Operators; +#else using DynamicData.Operators; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a paged subset of data reduced by a defined set of parameters diff --git a/src/DynamicData/List/ISourceList.cs b/src/DynamicData/List/ISourceList.cs index d75ec1042..981f279cd 100644 --- a/src/DynamicData/List/ISourceList.cs +++ b/src/DynamicData/List/ISourceList.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An editable observable list, providing observable methods diff --git a/src/DynamicData/List/IVirtualChangeSet.cs b/src/DynamicData/List/IVirtualChangeSet.cs index c971d7a3f..fd590316f 100644 --- a/src/DynamicData/List/IVirtualChangeSet.cs +++ b/src/DynamicData/List/IVirtualChangeSet.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Represents a subset of data reduced by a defined set of parameters diff --git a/src/DynamicData/List/Internal/AnonymousObservableList.cs b/src/DynamicData/List/Internal/AnonymousObservableList.cs index 79051b1d6..a28471ebb 100644 --- a/src/DynamicData/List/Internal/AnonymousObservableList.cs +++ b/src/DynamicData/List/Internal/AnonymousObservableList.cs @@ -3,41 +3,87 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the AnonymousObservableList class. +/// +/// The type of the T value. [DebuggerDisplay("AnonymousObservableList<{typeof(T).Name}> ({Count} Items)")] internal sealed class AnonymousObservableList : IObservableList where T : notnull { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed through _cleanUp")] + /// + /// The _sourceList field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposed through _cleanUp")] private readonly ISourceList _sourceList; + + /// + /// The _cleanUp field. + /// private readonly IDisposable _cleanUp; + /// + /// Initializes a new instance of the class. + /// + /// The source value. public AnonymousObservableList(IObservable> source) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); _sourceList = new SourceList(source); _cleanUp = _sourceList; } + /// + /// Initializes a new instance of the class. + /// + /// The sourceList value. public AnonymousObservableList(ISourceList sourceList) { - _sourceList = sourceList ?? throw new ArgumentNullException(nameof(sourceList)); + ArgumentExceptionHelper.ThrowIfNull(sourceList); + _sourceList = sourceList; _cleanUp = Disposable.Empty; } + /// + /// Gets the Count value. + /// public int Count => _sourceList.Count; + /// + /// Gets the CountChanged value. + /// public IObservable CountChanged => _sourceList.CountChanged; + /// + /// Gets the Items value. + /// public IReadOnlyList Items => _sourceList.Items; + /// + /// Executes the Connect operation. + /// + /// The predicate value. + /// The result of the operation. public IObservable> Connect(Func? predicate = null) => _sourceList.Connect(predicate); + /// + /// Executes the Preview operation. + /// + /// The predicate value. + /// The result of the operation. public IObservable> Preview(Func? predicate = null) => _sourceList.Preview(predicate); + /// + /// Executes the Dispose operation. + /// public void Dispose() => _cleanUp.Dispose(); } diff --git a/src/DynamicData/List/Internal/AutoRefresh.cs b/src/DynamicData/List/Internal/AutoRefresh.cs index da2e4dc6a..882694c91 100644 --- a/src/DynamicData/List/Internal/AutoRefresh.cs +++ b/src/DynamicData/List/Internal/AutoRefresh.cs @@ -1,23 +1,44 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the AutoRefresh class. +/// +/// The type of the TObject value. +/// The type of the TAny value. +/// The source value. +/// The reEvaluator value. +/// The buffer value. +/// The scheduler value. internal sealed class AutoRefresh(IObservable> source, Func> reEvaluator, TimeSpan? buffer = null, IScheduler? scheduler = null) where TObject : notnull { + /// + /// The _reEvaluator field. + /// private readonly Func> _reEvaluator = reEvaluator ?? throw new ArgumentNullException(nameof(reEvaluator)); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var allItems = new List(); diff --git a/src/DynamicData/List/Internal/BufferIf.cs b/src/DynamicData/List/Internal/BufferIf.cs index 8f7d1993c..86ebb78b9 100644 --- a/src/DynamicData/List/Internal/BufferIf.cs +++ b/src/DynamicData/List/Internal/BufferIf.cs @@ -1,33 +1,58 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the BufferIf class. +/// +/// The type of the T value. +/// The source value. +/// The pauseIfTrueSelector value. +/// The initialPauseState value. +/// The timeOut value. +/// The scheduler value. internal sealed class BufferIf(IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState = false, TimeSpan? timeOut = null, IScheduler? scheduler = null) where T : notnull { + /// + /// The _pauseIfTrueSelector field. + /// private readonly IObservable _pauseIfTrueSelector = pauseIfTrueSelector ?? throw new ArgumentNullException(nameof(pauseIfTrueSelector)); + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler = scheduler ?? GlobalConfig.DefaultScheduler; + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _timeOut field. + /// private readonly TimeSpan _timeOut = timeOut ?? TimeSpan.Zero; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var paused = initialPauseState; var buffer = new ChangeSet(); var timeoutSubscriber = new SerialDisposable(); - var timeoutSubject = new Subject(); + var timeoutSubject = new Signal(); var bufferSelector = Observable.Return(initialPauseState).Concat(_pauseIfTrueSelector.Merge(timeoutSubject)).ObserveOn(_scheduler).Synchronize(locker).Publish(); diff --git a/src/DynamicData/List/Internal/ChangeSetMergeTracker.cs b/src/DynamicData/List/Internal/ChangeSetMergeTracker.cs index fa2e2cec0..30f026b75 100644 --- a/src/DynamicData/List/Internal/ChangeSetMergeTracker.cs +++ b/src/DynamicData/List/Internal/ChangeSetMergeTracker.cs @@ -1,14 +1,31 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ChangeSetMergeTracker class. +/// +/// The type of the TObject value. internal sealed class ChangeSetMergeTracker where TObject : notnull { + /// + /// The _resultList field. + /// private readonly ChangeAwareList _resultList = new(); + /// + /// Executes the ProcessChangeSet operation. + /// + /// The changes value. + /// The observer value. public void ProcessChangeSet(IChangeSet changes, IObserver>? observer = null) { foreach (var change in changes) @@ -55,6 +72,11 @@ public void ProcessChangeSet(IChangeSet changes, IObserver + /// Executes the RemoveItems operation. + /// + /// The removeItems value. + /// The observer value. public void RemoveItems(IEnumerable removeItems, IObserver>? observer = null) { _resultList.Remove(removeItems); @@ -65,6 +87,10 @@ public void RemoveItems(IEnumerable removeItems, IObserver + /// Executes the EmitChanges operation. + /// + /// The observer value. public void EmitChanges(IObserver> observer) { var changeSet = _resultList.CaptureChanges(); @@ -74,17 +100,45 @@ public void EmitChanges(IObserver> observer) } } + /// + /// Executes the OnClear operation. + /// + /// The change value. private void OnClear(Change change) => _resultList.ClearOrRemoveMany(change); + /// + /// Executes the OnItemAdded operation. + /// + /// The item value. private void OnItemAdded(ItemChange item) => _resultList.Add(item.Current); + /// + /// Executes the OnItemRefreshed operation. + /// + /// The item value. private void OnItemRefreshed(ItemChange item) => _resultList.Refresh(item.Current); + /// + /// Executes the OnItemRemoved operation. + /// + /// The item value. private void OnItemRemoved(ItemChange item) => _resultList.Remove(item.Current); + /// + /// Executes the OnItemReplaced operation. + /// + /// The item value. private void OnItemReplaced(ItemChange item) => _resultList.ReplaceOrAdd(item.Previous.Value, item.Current); + /// + /// Executes the OnRangeAdded operation. + /// + /// The range value. private void OnRangeAdded(RangeChange range) => _resultList.AddRange(range); + /// + /// Executes the OnRangeRemoved operation. + /// + /// The range value. private void OnRangeRemoved(RangeChange range) => _resultList.Remove(range); } diff --git a/src/DynamicData/List/Internal/ClonedListChangeSet.cs b/src/DynamicData/List/Internal/ClonedListChangeSet.cs index 3b9996a1f..e90c4564c 100644 --- a/src/DynamicData/List/Internal/ClonedListChangeSet.cs +++ b/src/DynamicData/List/Internal/ClonedListChangeSet.cs @@ -1,18 +1,36 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ClonedListChangeSet class. +/// +/// The type of the TObject value. internal sealed class ClonedListChangeSet where TObject : notnull { + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The equalityComparer value. public ClonedListChangeSet(IObservable> source, IEqualityComparer? equalityComparer) => Source = source.Do(changeSet => List.Clone(changeSet, equalityComparer)); + /// + /// Gets the List value. + /// public List List { get; } = []; + /// + /// Gets the Source value. + /// public IObservable> Source { get; } } diff --git a/src/DynamicData/List/Internal/Combiner.cs b/src/DynamicData/List/Internal/Combiner.cs index 64882a3ba..48c106b3a 100644 --- a/src/DynamicData/List/Internal/Combiner.cs +++ b/src/DynamicData/List/Internal/Combiner.cs @@ -1,25 +1,44 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Combiner class. +/// +/// The type of the T value. +/// The source value. +/// The type value. internal sealed class Combiner(ICollection>> source, CombineOperator type) where T : notnull { -#if NET9_0_OR_GREATER - private readonly Lock _locker = new(); -#else + /// + /// The _locker field. + /// private readonly object _locker = new(); -#endif + /// + /// The _source field. + /// private readonly ICollection>> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -51,6 +70,11 @@ public IObservable> Run() => Observable.Create>( return disposable; }); + /// + /// Executes the CloneSourceList operation. + /// + /// The tracker value. + /// The changes value. private static void CloneSourceList(ReferenceCountTracker tracker, IChangeSet changes) { foreach (var change in changes) @@ -90,6 +114,12 @@ private static void CloneSourceList(ReferenceCountTracker tracker, IChangeSet } } + /// + /// Executes the MatchesConstraint operation. + /// + /// The sourceLists value. + /// The item value. + /// The result of the operation. private bool MatchesConstraint(List> sourceLists, T item) { switch (type) @@ -121,6 +151,12 @@ private bool MatchesConstraint(List> sourceLists, T ite } } + /// + /// Executes the UpdateItemMembership operation. + /// + /// The item value. + /// The sourceLists value. + /// The resultList value. private void UpdateItemMembership(T item, List> sourceLists, ChangeAwareListWithRefCounts resultList) { var isInResult = resultList.Contains(item); @@ -135,7 +171,14 @@ private void UpdateItemMembership(T item, List> sourceL } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2208:Instantiate argument exceptions correctly", Justification = "By Design.")] + /// + /// Executes the UpdateResultList operation. + /// + /// The changes value. + /// The sourceLists value. + /// The resultList value. + /// The result of the operation. + [SuppressMessage("Usage", "CA2208:Instantiate argument exceptions correctly", Justification = "By Design.")] private IChangeSet UpdateResultList(IChangeSet changes, List> sourceLists, ChangeAwareListWithRefCounts resultList) { // child caches have been updated before we reached this point. diff --git a/src/DynamicData/List/Internal/DeferUntilLoaded.cs b/src/DynamicData/List/Internal/DeferUntilLoaded.cs index aae382472..293e94413 100644 --- a/src/DynamicData/List/Internal/DeferUntilLoaded.cs +++ b/src/DynamicData/List/Internal/DeferUntilLoaded.cs @@ -1,15 +1,30 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the DeferUntilLoaded class. +/// +/// The type of the T value. +/// The source value. internal sealed class DeferUntilLoaded(IObservable> source) where T : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => _source.MonitorStatus().Where(status => status == ConnectionStatus.Loaded).Take(1).Select(_ => new ChangeSet()).Concat(_source).NotEmpty(); } diff --git a/src/DynamicData/List/Internal/DisposeMany.cs b/src/DynamicData/List/Internal/DisposeMany.cs index 046e19e4d..a7d743ff9 100644 --- a/src/DynamicData/List/Internal/DisposeMany.cs +++ b/src/DynamicData/List/Internal/DisposeMany.cs @@ -1,16 +1,26 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the DisposeMany class. +/// +/// The type of the T value. +/// The source value. internal sealed class DisposeMany(IObservable> source) where T : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { @@ -84,6 +94,10 @@ public IObservable> Run() }); }); + /// + /// Executes the ProcessFinalization operation. + /// + /// The cachedItems value. private static void ProcessFinalization(List cachedItems) { foreach (var item in cachedItems) diff --git a/src/DynamicData/List/Internal/Distinct.cs b/src/DynamicData/List/Internal/Distinct.cs index 00ab3a458..bd4f4f9a6 100644 --- a/src/DynamicData/List/Internal/Distinct.cs +++ b/src/DynamicData/List/Internal/Distinct.cs @@ -1,19 +1,39 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the Distinct class. +/// +/// The type of the T value. +/// The type of the TValue value. +/// The source value. +/// The valueSelector value. internal sealed class Distinct(IObservable> source, Func valueSelector) where T : notnull where TValue : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _valueSelector field. + /// private readonly Func _valueSelector = valueSelector ?? throw new ArgumentNullException(nameof(valueSelector)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -30,6 +50,13 @@ public IObservable> Run() => Observable.Create Process(valueCounters, result, changes)).NotEmpty().SubscribeSafe(observer); }); + /// + /// Executes the Process operation. + /// + /// The values value. + /// The result value. + /// The changes value. + /// The result of the operation. private static IChangeSet Process(Dictionary values, ChangeAwareList result, IChangeSet changes) { void AddAction(TValue value) => @@ -135,26 +162,46 @@ void RemoveAction(TValue value) return result.CaptureChanges(); } - private sealed class ItemWithMatch(T item, TValue value, TValue? previousValue) : IEquatable +/// +/// Provides members for the ItemWithMatch class. +/// +/// The item value. +/// The value value. +/// The previousValue value. +private sealed class ItemWithMatch(T item, TValue value, TValue? previousValue) : IEquatable { + /// + /// Gets the Item value. + /// public T Item { get; } = item; + /// + /// Gets the Previous value. + /// public TValue? Previous { get; } = previousValue; + /// + /// Gets the Value value. + /// public TValue Value { get; } = value; - /// Returns a value that indicates whether the values of two objects are equal. + /// Returns a value that indicates whether the values of two Filter<T>.ItemWithMatch objects are equal. /// The first value to compare. /// The second value to compare. /// true if the and parameters have the same value; otherwise, false. public static bool operator ==(ItemWithMatch left, ItemWithMatch right) => Equals(left, right); - /// Returns a value that indicates whether two objects have different values. + /// Returns a value that indicates whether two Filter<T>.ItemWithMatch objects have different values. /// The first value to compare. /// The second value to compare. /// true if and are not equal; otherwise, false. public static bool operator !=(ItemWithMatch left, ItemWithMatch right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ItemWithMatch? other) { if (other is null) @@ -170,6 +217,11 @@ public bool Equals(ItemWithMatch? other) return EqualityComparer.Default.Equals(Item, other.Item); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -190,8 +242,16 @@ public override bool Equals(object? obj) return Equals((ItemWithMatch)obj); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Item is null ? 0 : EqualityComparer.Default.GetHashCode(Item); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"{nameof(Item)}: {Item}, {nameof(Value)}: {Value}, {nameof(Previous)}: {Previous}"; } } diff --git a/src/DynamicData/List/Internal/DynamicCombiner.cs b/src/DynamicData/List/Internal/DynamicCombiner.cs index bb3091378..61413d522 100644 --- a/src/DynamicData/List/Internal/DynamicCombiner.cs +++ b/src/DynamicData/List/Internal/DynamicCombiner.cs @@ -1,25 +1,44 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the DynamicCombiner class. +/// +/// The type of the T value. +/// The source value. +/// The type value. internal sealed class DynamicCombiner(IObservableList>> source, CombineOperator type) where T : notnull { -#if NET9_0_OR_GREATER - private readonly Lock _locker = new(); -#else + /// + /// The _locker field. + /// private readonly object _locker = new(); -#endif + /// + /// The _source field. + /// private readonly IObservableList>> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -89,6 +108,12 @@ public IObservable> Run() => Observable.Create>( return new CompositeDisposable(sourceLists, allChanges, removedItem, sourceChanged); }); + /// + /// Executes the MatchesConstraint operation. + /// + /// The sourceLists value. + /// The item value. + /// The result of the operation. private bool MatchesConstraint(MergeContainer[] sourceLists, T item) { if (sourceLists.Length == 0) @@ -125,6 +150,12 @@ private bool MatchesConstraint(MergeContainer[] sourceLists, T item) } } + /// + /// Executes the UpdateItemMembership operation. + /// + /// The item value. + /// The sourceLists value. + /// The resultList value. private void UpdateItemMembership(T item, MergeContainer[] sourceLists, ChangeAwareListWithRefCounts resultList) { var isInResult = resultList.Contains(item); @@ -139,13 +170,27 @@ private void UpdateItemMembership(T item, MergeContainer[] sourceLists, ChangeAw } } + /// + /// Executes the UpdateItemSetMemberships operation. + /// + /// The sourceLists value. + /// The resultingList value. + /// The items value. + /// The result of the operation. private IChangeSet UpdateItemSetMemberships(MergeContainer[] sourceLists, ChangeAwareListWithRefCounts resultingList, IEnumerable items) { items.ForEach(item => UpdateItemMembership(item, sourceLists, resultingList)); return resultingList.CaptureChanges(); } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2208:Instantiate argument exceptions correctly", Justification = "By Design.")] + /// + /// Executes the UpdateResultList operation. + /// + /// The sourceLists value. + /// The resultList value. + /// The changes value. + /// The result of the operation. + [SuppressMessage("Usage", "CA2208:Instantiate argument exceptions correctly", Justification = "By Design.")] private IChangeSet UpdateResultList(MergeContainer[] sourceLists, ChangeAwareListWithRefCounts resultList, IChangeSet changes) { // child caches have been updated before we reached this point. @@ -185,14 +230,31 @@ private IChangeSet UpdateResultList(MergeContainer[] sourceLists, ChangeAware return resultList.CaptureChanges(); } + /// + /// Provides members for the MergeContainer class. + /// private sealed class MergeContainer { + /// + /// Initializes a new instance of the class. + /// + /// The source value. public MergeContainer(IObservable> source) => Source = source.Do(Clone); + /// + /// Gets the Source value. + /// public IObservable> Source { get; } + /// + /// Gets the Tracker value. + /// public ReferenceCountTracker Tracker { get; } = new(); + /// + /// Executes the Clone operation. + /// + /// The changes value. private void Clone(IChangeSet changes) { foreach (var change in changes) diff --git a/src/DynamicData/List/Internal/EditDiff.cs b/src/DynamicData/List/Internal/EditDiff.cs index 0c48ff45f..df7a96532 100644 --- a/src/DynamicData/List/Internal/EditDiff.cs +++ b/src/DynamicData/List/Internal/EditDiff.cs @@ -1,16 +1,37 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the EditDiff class. +/// +/// The type of the T value. +/// The source value. +/// The equalityComparer value. internal sealed class EditDiff(ISourceList source, IEqualityComparer? equalityComparer) where T : notnull { + /// + /// The _equalityComparer field. + /// private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; + /// + /// The _source field. + /// private readonly ISourceList _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Edit operation. + /// + /// The items value. public void Edit(IEnumerable items) => _source.Edit( innerList => { diff --git a/src/DynamicData/List/Internal/ExpirableItem.cs b/src/DynamicData/List/Internal/ExpirableItem.cs index 23227719a..f03995ffb 100644 --- a/src/DynamicData/List/Internal/ExpirableItem.cs +++ b/src/DynamicData/List/Internal/ExpirableItem.cs @@ -1,21 +1,59 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ExpirableItem class. +/// +/// The type of the TObject value. +/// The value value. +/// The dateTime value. +/// The index value. internal sealed class ExpirableItem(TObject value, DateTime dateTime, long index) : IEquatable> { + /// + /// Gets the ExpireAt value. + /// public DateTime ExpireAt { get; } = dateTime; + /// + /// Gets the Index value. + /// public long Index { get; } = index; + /// + /// Gets the Item value. + /// public TObject Item { get; } = value; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(ExpirableItem left, ExpirableItem right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(ExpirableItem left, ExpirableItem right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ExpirableItem? other) { if (other is null) @@ -31,6 +69,11 @@ public bool Equals(ExpirableItem? other) return EqualityComparer.Default.Equals(Item, other.Item) && ExpireAt.Equals(other.ExpireAt) && Index == other.Index; } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -46,6 +89,10 @@ public override bool Equals(object? obj) return obj is ExpirableItem item && Equals(item); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -57,5 +104,9 @@ public override int GetHashCode() } } + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"{Item} @ {ExpireAt}"; } diff --git a/src/DynamicData/List/Internal/ExpireAfter.cs b/src/DynamicData/List/Internal/ExpireAfter.cs index 97a39c84e..b6b0858f9 100644 --- a/src/DynamicData/List/Internal/ExpireAfter.cs +++ b/src/DynamicData/List/Internal/ExpireAfter.cs @@ -1,26 +1,37 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; - -using DynamicData.Internal; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ExpireAfter class. +/// +/// The type of the T value. internal sealed class ExpireAfter where T : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The timeSelector value. + /// The pollingInterval value. + /// The scheduler value. + /// The result of the operation. public static IObservable> Create( ISourceList source, Func timeSelector, TimeSpan? pollingInterval = null, IScheduler? scheduler = null) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - timeSelector.ThrowArgumentNullExceptionIfNull(nameof(timeSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(timeSelector); return Observable.Create>(observer => (pollingInterval is { } pollingIntervalValue) ? new PollingSubscription( @@ -36,21 +47,74 @@ public static IObservable> Create( timeSelector: timeSelector)); } - private abstract class SubscriptionBase +/// +/// Provides members for the SubscriptionBase class. +/// +private abstract class SubscriptionBase : IDisposable { + /// + /// The _expirationDueTimes field. + /// private readonly List _expirationDueTimes; - private readonly List _expiringIndexesBuffer; + + /// + /// The _items field. + /// + private readonly List _items; + + /// + /// The _expiringItemsBuffer field. + /// + private readonly List _expiringItemsBuffer; + + /// + /// The _observer field. + /// private readonly IObserver> _observer; + + /// + /// The _onEditingSource field. + /// private readonly Action> _onEditingSource; + + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler; + + /// + /// The _source field. + /// private readonly ISourceList _source; + + /// + /// The _sourceSubscription field. + /// private readonly IDisposable _sourceSubscription; + + /// + /// The _timeSelector field. + /// private readonly Func _timeSelector; + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _nextScheduledManagement field. + /// private ScheduledManagement? _nextScheduledManagement; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. protected SubscriptionBase( IObserver> observer, IScheduler? scheduler, @@ -66,19 +130,23 @@ protected SubscriptionBase( _onEditingSource = OnEditingSource; _expirationDueTimes = new(); - _expiringIndexesBuffer = new(); - - _sourceSubscription = source - .Connect() - // It's important to set this flag outside the context of a lock, because it'll be read outside of lock as well. - .Finally(() => _hasSourceCompleted = true) - .Synchronize(SynchronizationGate) - .SubscribeSafe( - onNext: OnSourceNext, - onError: OnSourceError, - onCompleted: OnSourceCompleted); + _items = new(); + _expiringItemsBuffer = new(); + + _sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source + .Connect() + // It's important to set this flag outside the context of a lock, because it'll be read outside of lock as well. + .Finally(() => _hasSourceCompleted = true) + .Synchronize(SynchronizationGate), + onNext: OnSourceNext, + onError: OnSourceError, + onCompleted: OnSourceCompleted); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { lock (SynchronizationGate) @@ -89,15 +157,29 @@ public void Dispose() } } + /// + /// Gets the Scheduler value. + /// protected IScheduler Scheduler => _scheduler; - // Instead of using a dedicated _synchronizationGate object, we can save an allocation by using any object that is never exposed to public consumers. + + /// + /// Gets the SynchronizationGate value. + /// protected object SynchronizationGate => _expirationDueTimes; + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected abstract DateTimeOffset? GetNextManagementDueTime(); + /// + /// Executes the GetNextProposedExpirationDueTime operation. + /// + /// The result of the operation. protected DateTimeOffset? GetNextProposedExpirationDueTime() { var result = null as DateTimeOffset?; @@ -111,8 +193,15 @@ protected object SynchronizationGate return result; } + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected abstract void OnExpirationsManaged(DateTimeOffset dueTime); + /// + /// Executes the ManageExpirations operation. + /// private void ManageExpirations() { // This check is needed, to make sure we don't try and call .Edit() on a disposed _source, @@ -129,6 +218,10 @@ private void ManageExpirations() _source.Edit(_onEditingSource); } + /// + /// Executes the OnEditingSource operation. + /// + /// The updater value. private void OnEditingSource(IExtendedList updater) { lock (SynchronizationGate) @@ -150,7 +243,7 @@ private void OnEditingSource(IExtendedList updater) { if ((_expirationDueTimes[i] is { } dueTime) && (dueTime <= now)) { - _expiringIndexesBuffer.Add(i); + _expiringItemsBuffer.Add(new ExpiringItem(i, _items[i])); // This shouldn't be necessary, but it guarantees we don't accidentally expire an item more than once, // in the event of a race condition or something we haven't predicted. @@ -159,22 +252,30 @@ private void OnEditingSource(IExtendedList updater) } // I'm pretty sure it shouldn't be possible to end up with no removals here, but it costs basically nothing to check. - if (_expiringIndexesBuffer.Count is not 0) + if (_expiringItemsBuffer.Count is not 0) { // Processing removals in reverse-index order eliminates the need for us to adjust index of each .RemoveAt() call, as we go. - _expiringIndexesBuffer.Sort(static (x, y) => y.CompareTo(x)); + _expiringItemsBuffer.Sort(static (x, y) => y.Index.CompareTo(x.Index)); - var removedItems = new T[_expiringIndexesBuffer.Count]; - for (var i = 0; i < _expiringIndexesBuffer.Count; ++i) + var removedItems = new List(_expiringItemsBuffer.Count); + for (var i = 0; i < _expiringItemsBuffer.Count; ++i) { - var removedIndex = _expiringIndexesBuffer[i]; - removedItems[i] = updater[removedIndex]; + var expiringItem = _expiringItemsBuffer[i]; + if (!TryGetCurrentIndex(updater, expiringItem, out var removedIndex)) + { + continue; + } + + removedItems.Add(updater[removedIndex]); updater.RemoveAt(removedIndex); } - _observer.OnNext(removedItems); + if (removedItems.Count != 0) + { + _observer.OnNext(removedItems); + } - _expiringIndexesBuffer.Clear(); + _expiringItemsBuffer.Clear(); } OnExpirationsManaged(thisScheduledManagement.DueTime); @@ -184,6 +285,9 @@ private void OnEditingSource(IExtendedList updater) } } + /// + /// Executes the OnExpirationDueTimesChanged operation. + /// private void OnExpirationDueTimesChanged() { // Check if we need to re-schedule the next management operation @@ -219,6 +323,9 @@ private void OnExpirationDueTimesChanged() } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { // If the source completes, we can no longer remove items from it, so any pending expirations are moot. @@ -227,6 +334,10 @@ private void OnSourceCompleted() _observer.OnCompleted(); } + /// + /// Executes the OnSourceError operation. + /// + /// The error value. private void OnSourceError(Exception error) { TryCancelNextScheduledManagement(); @@ -234,6 +345,10 @@ private void OnSourceError(Exception error) _observer.OnError(error); } + /// + /// Executes the OnSourceNext operation. + /// + /// The changes value. private void OnSourceNext(IChangeSet changes) { try @@ -250,6 +365,10 @@ private void OnSourceNext(IChangeSet changes) { var dueTime = now + _timeSelector.Invoke(change.Item.Current); + _items.Insert( + index: change.Item.CurrentIndex, + item: change.Item.Current); + _expirationDueTimes.Insert( index: change.Item.CurrentIndex, item: dueTime); @@ -267,6 +386,10 @@ private void OnSourceNext(IChangeSet changes) { var dueTime = now + _timeSelector.Invoke(item); + _items.Insert( + index: itemIndex, + item: item); + _expirationDueTimes.Insert( index: itemIndex, item: dueTime); @@ -289,12 +412,19 @@ private void OnSourceNext(IChangeSet changes) } _expirationDueTimes.Clear(); + _items.Clear(); break; case ListChangeReason.Moved: { + var item = _items[change.Item.PreviousIndex]; var expirationDueTime = _expirationDueTimes[change.Item.PreviousIndex]; + _items.RemoveAt(change.Item.PreviousIndex); + _items.Insert( + index: change.Item.CurrentIndex, + item: item); + _expirationDueTimes.RemoveAt(change.Item.PreviousIndex); _expirationDueTimes.Insert( index: change.Item.CurrentIndex, @@ -310,6 +440,7 @@ private void OnSourceNext(IChangeSet changes) } _expirationDueTimes.RemoveAt(change.Item.CurrentIndex); + _items.RemoveAt(change.Item.CurrentIndex); } break; @@ -326,6 +457,7 @@ private void OnSourceNext(IChangeSet changes) } _expirationDueTimes.RemoveRange(change.Range.Index, change.Range.Count); + _items.RemoveRange(change.Range.Index, change.Range.Count); } break; @@ -337,6 +469,7 @@ private void OnSourceNext(IChangeSet changes) // Ignoring the possibility that the item's index has changed as well, because ISourceList does not allow for this. _expirationDueTimes[change.Item.CurrentIndex] = newDueTime; + _items[change.Item.CurrentIndex] = change.Item.Current; haveExpirationDueTimesChanged |= newDueTime != oldDueTime; } @@ -357,23 +490,82 @@ private void OnSourceNext(IChangeSet changes) } } + /// + /// Executes the TryCancelNextScheduledManagement operation. + /// private void TryCancelNextScheduledManagement() { _nextScheduledManagement?.Cancellation.Dispose(); _nextScheduledManagement = null; } - private readonly record struct ScheduledManagement + /// + /// Attempts to find the current source index for an item scheduled for expiration. + /// + /// The updater value. + /// The expiringItem value. + /// The index value. + /// when the item is still present in the source list. + private static bool TryGetCurrentIndex(IExtendedList updater, ExpiringItem expiringItem, out int index) + { + if (expiringItem.Index >= 0 && + expiringItem.Index < updater.Count && + EqualityComparer.Default.Equals(updater[expiringItem.Index], expiringItem.Item)) + { + index = expiringItem.Index; + return true; + } + + for (var i = 0; i < updater.Count; ++i) + { + if (EqualityComparer.Default.Equals(updater[i], expiringItem.Item)) + { + index = i; + return true; + } + } + + index = -1; + return false; + } + +/// +/// The source item and index captured when an expiration becomes due. +/// +/// The Index value. +/// The Item value. +private readonly record struct ExpiringItem(int Index, T Item); + +/// +/// Represents the ScheduledManagement record. +/// +private readonly record struct ScheduledManagement { + /// + /// Gets or sets the Cancellation value. + /// public required IDisposable Cancellation { get; init; } + /// + /// Gets or sets the DueTime value. + /// public required DateTimeOffset DueTime { get; init; } } } - private sealed class OnDemandSubscription +/// +/// Provides members for the OnDemandSubscription class. +/// +private sealed class OnDemandSubscription : SubscriptionBase { + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. public OnDemandSubscription( IObserver> observer, IScheduler? scheduler, @@ -387,21 +579,46 @@ public OnDemandSubscription( { } + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected override DateTimeOffset? GetNextManagementDueTime() => GetNextProposedExpirationDueTime(); + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected override void OnExpirationsManaged(DateTimeOffset dueTime) { } } - private sealed class PollingSubscription +/// +/// Provides members for the PollingSubscription class. +/// +private sealed class PollingSubscription : SubscriptionBase { + /// + /// The _pollingInterval field. + /// private readonly TimeSpan _pollingInterval; + /// + /// The _lastManagementDueTime field. + /// private DateTimeOffset _lastManagementDueTime; + /// + /// Initializes a new instance of the class. + /// + /// The observer value. + /// The pollingInterval value. + /// The scheduler value. + /// The source value. + /// The timeSelector value. public PollingSubscription( IObserver> observer, TimeSpan pollingInterval, @@ -419,6 +636,10 @@ public PollingSubscription( _lastManagementDueTime = Scheduler.Now; } + /// + /// Executes the GetNextManagementDueTime operation. + /// + /// The result of the operation. protected override DateTimeOffset? GetNextManagementDueTime() { var now = Scheduler.Now; @@ -430,6 +651,10 @@ public PollingSubscription( : now; } + /// + /// Executes the OnExpirationsManaged operation. + /// + /// The dueTime value. protected override void OnExpirationsManaged(DateTimeOffset dueTime) => _lastManagementDueTime = dueTime; } diff --git a/src/DynamicData/List/Internal/Filter.Dynamic.cs b/src/DynamicData/List/Internal/Filter.Dynamic.cs index 8d9b5e8dc..db3933632 100644 --- a/src/DynamicData/List/Internal/Filter.Dynamic.cs +++ b/src/DynamicData/List/Internal/Filter.Dynamic.cs @@ -1,24 +1,52 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Filter class. +/// internal static partial class Filter { + /// + /// Provides members for the Dynamic class. + /// + /// The type of the T value. internal sealed class Dynamic - where T : notnull + where T : notnull { + /// + /// The _policy field. + /// private readonly ListFilterPolicy _policy; + /// + /// The _predicate field. + /// private readonly Func? _predicate; + /// + /// The _predicates field. + /// private readonly IObservable>? _predicates; + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The predicates value. + /// The policy value. public Dynamic(IObservable> source, IObservable> predicates, ListFilterPolicy policy = ListFilterPolicy.CalculateDiff) { _policy = policy; @@ -26,6 +54,12 @@ public Dynamic(IObservable> source, IObservable> pre _predicates = predicates ?? throw new ArgumentNullException(nameof(predicates)); } + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The predicate value. + /// The policy value. public Dynamic(IObservable> source, Func predicate, ListFilterPolicy policy = ListFilterPolicy.CalculateDiff) { _policy = policy; @@ -33,10 +67,14 @@ public Dynamic(IObservable> source, Func predicate, ListF _predicate = predicate ?? throw new ArgumentNullException(nameof(predicate)); } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); Func predicate = _ => false; var all = new List(); @@ -78,16 +116,18 @@ public IObservable> Run() => Observable.Create>( var wasMatch = previous.ConvertOr(p => p!.IsMatch, () => false); return new ItemWithMatch(t, predicate(t), wasMatch); }, - true) + false) .Select(changes => { + var result = Process(predicate, filtered, changes); + // keep track of all changes if filtering on an observable if (!immutableFilter) { all.Clone(changes); } - return Process(filtered, changes); + return result; }); return predicateChanged.Merge(filteredResult).NotEmpty() @@ -95,7 +135,14 @@ public IObservable> Run() => Observable.Create>( .SubscribeSafe(observer); }); - private static IChangeSet Process(ChangeAwareList filtered, IChangeSet changes) + /// + /// Executes the Process operation. + /// + /// The active predicate. + /// The filtered value. + /// The changes value. + /// The result of the operation. + private static IChangeSet Process(Func predicate, ChangeAwareList filtered, IChangeSet changes) { // Maintain all items as well as filtered list. This enables us to a) re-query when the predicate changes b) check the previous state when Refresh is called foreach (var item in changes) @@ -124,7 +171,7 @@ private static IChangeSet Process(ChangeAwareList { var change = item.Item; var match = change.Current.IsMatch; - var wasMatch = item.Item.Current.WasMatch; + var wasMatch = change.Previous.Value.IsMatch; if (match) { if (wasMatch) @@ -151,8 +198,10 @@ private static IChangeSet Process(ChangeAwareList case ListChangeReason.Refresh: { var change = item.Item; - var match = change.Current.IsMatch; - var wasMatch = item.Item.Current.WasMatch; + var wasMatch = change.Current.IsMatch; + var match = predicate(change.Current.Item); + change.Current.WasMatch = wasMatch; + change.Current.IsMatch = match; if (match) { if (wasMatch) @@ -198,6 +247,13 @@ private static IChangeSet Process(ChangeAwareList return filtered.CaptureChanges(); } + /// + /// Executes the Requery operation. + /// + /// The predicate value. + /// The all value. + /// The filtered value. + /// The result of the operation. private IChangeSet Requery(Func predicate, List all, ChangeAwareList filtered) { if (all.Count == 0) @@ -248,20 +304,52 @@ private IChangeSet Requery(Func predicate, List + /// Provides members for the ItemWithMatch class. + /// + /// The item value. + /// The isMatch value. + /// The wasMatch value. private sealed class ItemWithMatch(T item, bool isMatch, bool wasMatch = false) : IEquatable { + /// + /// Gets the Item value. + /// public T Item { get; } = item; + /// + /// Gets or sets the IsMatch value. + /// public bool IsMatch { get; set; } = isMatch; + /// + /// Gets or sets the WasMatch value. + /// public bool WasMatch { get; set; } = wasMatch; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(ItemWithMatch? left, ItemWithMatch? right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(ItemWithMatch? left, ItemWithMatch? right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ItemWithMatch? other) { if (other is null) @@ -277,6 +365,11 @@ public bool Equals(ItemWithMatch? other) return EqualityComparer.Default.Equals(Item, other.Item); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -297,8 +390,16 @@ public override bool Equals(object? obj) return Equals((ItemWithMatch)obj); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => EqualityComparer.Default.GetHashCode(Item!); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"{Item}, (was {IsMatch} is {WasMatch}"; } } diff --git a/src/DynamicData/List/Internal/Filter.Static.cs b/src/DynamicData/List/Internal/Filter.Static.cs index 48b12020c..cfbb4de8d 100644 --- a/src/DynamicData/List/Internal/Filter.Static.cs +++ b/src/DynamicData/List/Internal/Filter.Static.cs @@ -1,23 +1,40 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Filter class. +/// internal static partial class Filter { - public static class Static +/// +/// Provides members for the Static class. +/// +/// The type of the T value. +public static class Static where T : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The predicate value. + /// The suppressEmptyChangesets value. + /// The result of the operation. public static IObservable> Create( IObservable> source, Func predicate, bool suppressEmptyChangesets) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicate); return Observable.Create>(downstreamObserver => { diff --git a/src/DynamicData/List/Internal/Filter.WithPredicateState.cs b/src/DynamicData/List/Internal/Filter.WithPredicateState.cs index c9f04be4f..b3b3b06da 100644 --- a/src/DynamicData/List/Internal/Filter.WithPredicateState.cs +++ b/src/DynamicData/List/Internal/Filter.WithPredicateState.cs @@ -1,18 +1,36 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; - -using DynamicData.Internal; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Filter class. +/// internal static partial class Filter { - public static class WithPredicateState +/// +/// Provides members for the WithPredicateState class. +/// +/// The type of the T value. +/// The type of the TState value. +public static class WithPredicateState where T : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The predicateState value. + /// The predicate value. + /// The filterPolicy value. + /// The suppressEmptyChangeSets value. + /// The result of the operation. public static IObservable> Create( IObservable> source, IObservable predicateState, @@ -20,9 +38,9 @@ public static IObservable> Create( ListFilterPolicy filterPolicy = ListFilterPolicy.CalculateDiff, bool suppressEmptyChangeSets = true) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - predicateState.ThrowArgumentNullExceptionIfNull(nameof(predicateState)); - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(predicateState); + ArgumentExceptionHelper.ThrowIfNull(predicate); if (!EnumEx.IsDefined(filterPolicy)) throw new ArgumentException($"Invalid {nameof(ListFilterPolicy)} value {filterPolicy}"); @@ -47,24 +65,83 @@ public static IObservable> Create( }); } - private abstract class SubscriptionBase +/// +/// Provides members for the SubscriptionBase class. +/// +private abstract class SubscriptionBase : IDisposable { + /// + /// The _downstreamChangesBuffer field. + /// private readonly List> _downstreamChangesBuffer; + + /// + /// The _downstreamObserver field. + /// private readonly IObserver> _downstreamObserver; + + /// + /// The _itemsBuffer field. + /// private readonly List _itemsBuffer; + + /// + /// The _itemStates field. + /// private readonly List _itemStates; + + /// + /// The _itemStatesBuffer field. + /// private readonly List _itemStatesBuffer; + + /// + /// The _predicate field. + /// private readonly Func _predicate; + + /// + /// The _suppressEmptyChangeSets field. + /// private readonly bool _suppressEmptyChangeSets; + /// + /// The _hasPredicateStateCompleted field. + /// private bool _hasPredicateStateCompleted; + + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _isLatestPredicateStateValid field. + /// private bool _isLatestPredicateStateValid; + + /// + /// The _latestPredicateState field. + /// private TState _latestPredicateState; + + /// + /// The _predicateStateSubscription field. + /// private IDisposable? _predicateStateSubscription; + + /// + /// The _sourceSubscription field. + /// private IDisposable? _sourceSubscription; + /// + /// Initializes a new instance of the class. + /// + /// The downstreamObserver value. + /// The predicate value. + /// The suppressEmptyChangeSets value. protected SubscriptionBase( IObserver> downstreamObserver, Func predicate, @@ -80,78 +157,155 @@ protected SubscriptionBase( _itemStatesBuffer = new(); _latestPredicateState = default!; } - // Keeping subscriptions out of the constructor prevents subscriptions that emit immediately from triggering virtual method calls within the constructor. + + /// + /// Executes the Activate operation. + /// + /// The predicateState value. + /// The source value. public void Activate( IObservable predicateState, IObservable> source) { var onError = OnError; - - _predicateStateSubscription = predicateState - .SubscribeSafe( - onNext: OnPredicateStateNext, - onError: onError, - onCompleted: OnPredicateStateCompleted); - - _sourceSubscription = source - .SubscribeSafe( - onNext: OnSourceNext, - onError: onError, - onCompleted: OnSourceCompleted); + var predicateStateSubscription = new SingleAssignmentDisposable(); + var sourceSubscription = new SingleAssignmentDisposable(); + + _predicateStateSubscription = predicateStateSubscription; + _sourceSubscription = sourceSubscription; + + predicateStateSubscription.Disposable = predicateState.SubscribeSafe(Observer.Create( + onNext: OnPredicateStateNext, + onError: onError, + onCompleted: OnPredicateStateCompleted)); + + sourceSubscription.Disposable = PrimitivesLinqExtensions.SubscribeSafe( + source, + onNext: OnSourceNext, + onError: onError, + onCompleted: OnSourceCompleted); } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _predicateStateSubscription?.Dispose(); _sourceSubscription?.Dispose(); } + /// + /// Gets the DownstreamChangesBuffer value. + /// protected List> DownstreamChangesBuffer => _downstreamChangesBuffer; + /// + /// Gets the IsLatestPredicateStateValid value. + /// protected bool IsLatestPredicateStateValid => _isLatestPredicateStateValid; + /// + /// Gets the ItemsBuffer value. + /// protected List ItemsBuffer => _itemsBuffer; + /// + /// Gets the ItemStates value. + /// protected List ItemStates => _itemStates; + /// + /// Gets the ItemStatesBuffer value. + /// protected List ItemStatesBuffer => _itemStatesBuffer; + /// + /// Gets the LatestPredicateState value. + /// protected TState LatestPredicateState => _latestPredicateState; + /// + /// Gets the Predicate value. + /// protected Func Predicate => _predicate; + /// + /// Executes the PerformAdd operation. + /// + /// The change value. protected abstract void PerformAdd(ItemChange change); + /// + /// Executes the PerformAddRange operation. + /// + /// The change value. protected abstract void PerformAddRange(RangeChange change); + /// + /// Executes the PerformClear operation. + /// protected abstract void PerformClear(); + /// + /// Executes the PerformMove operation. + /// + /// The change value. protected abstract void PerformMove(ItemChange change); + /// + /// Executes the PerformReFilter operation. + /// protected abstract void PerformReFilter(); + /// + /// Executes the PerformRefresh operation. + /// + /// The change value. protected abstract void PerformRefresh(ItemChange change); + /// + /// Executes the PerformRemove operation. + /// + /// The change value. protected abstract void PerformRemove(ItemChange change); + /// + /// Executes the PerformRemoveRange operation. + /// + /// The change value. protected abstract void PerformRemoveRange(RangeChange change); + /// + /// Executes the PerformReplace operation. + /// + /// The change value. protected abstract void PerformReplace(ItemChange change); + /// + /// Gets the DownstreamSynchronizationGate value. + /// private object DownstreamSynchronizationGate => _downstreamChangesBuffer; + /// + /// Gets the UpstreamSynchronizationGate value. + /// private object UpstreamSynchronizationGate => _itemStates; + /// + /// Executes the AssembleDownstreamChanges operation. + /// + /// The result of the operation. private IChangeSet AssembleDownstreamChanges() { if (_downstreamChangesBuffer.Count is 0) @@ -163,6 +317,10 @@ private IChangeSet AssembleDownstreamChanges() return downstreamChanges; } + /// + /// Executes the OnError operation. + /// + /// The error value. private void OnError(Exception error) { var hasUpstreamLock = false; @@ -194,6 +352,9 @@ private void OnError(Exception error) } } + /// + /// Executes the OnPredicateStateCompleted operation. + /// private void OnPredicateStateCompleted() { var hasUpstreamLock = false; @@ -208,6 +369,9 @@ private void OnPredicateStateCompleted() // no matter how many items come through from source, so just go ahead and complete now. if (_hasSourceCompleted || (!_isLatestPredicateStateValid && _suppressEmptyChangeSets)) { + _predicateStateSubscription?.Dispose(); + _sourceSubscription?.Dispose(); + Monitor.Enter(DownstreamSynchronizationGate, ref hasDownstreamLock); if (hasUpstreamLock) @@ -229,6 +393,10 @@ private void OnPredicateStateCompleted() } } + /// + /// Executes the OnPredicateStateNext operation. + /// + /// The predicateState value. private void OnPredicateStateNext(TState predicateState) { var hasUpstreamLock = false; @@ -267,6 +435,9 @@ private void OnPredicateStateNext(TState predicateState) } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { var hasUpstreamLock = false; @@ -281,6 +452,9 @@ private void OnSourceCompleted() // and the source has reported that it'll never change, so go ahead and complete now. if (_hasPredicateStateCompleted || ((_itemStates.Count is 0) && _suppressEmptyChangeSets)) { + _predicateStateSubscription?.Dispose(); + _sourceSubscription?.Dispose(); + Monitor.Enter(DownstreamSynchronizationGate, ref hasDownstreamLock); if (hasUpstreamLock) @@ -302,6 +476,10 @@ private void OnSourceCompleted() } } + /// + /// Executes the OnSourceNext operation. + /// + /// The upstreamChanges value. private void OnSourceNext(IChangeSet upstreamChanges) { var hasUpstreamLock = false; @@ -375,17 +553,35 @@ private void OnSourceNext(IChangeSet upstreamChanges) } } - protected readonly struct ItemState +/// +/// Represents the ItemState value. +/// +protected readonly struct ItemState { + /// + /// Gets or sets the FilteredIndex value. + /// public required int? FilteredIndex { get; init; } + /// + /// Gets or sets the Item value. + /// public required T Item { get; init; } } } - private sealed class CalculateDiffSubscription +/// +/// Provides members for the CalculateDiffSubscription class. +/// +private sealed class CalculateDiffSubscription : SubscriptionBase { + /// + /// Initializes a new instance of the class. + /// + /// The downstreamObserver value. + /// The predicate value. + /// The suppressEmptyChangeSets value. public CalculateDiffSubscription( IObserver> downstreamObserver, Func predicate, @@ -397,6 +593,10 @@ public CalculateDiffSubscription( { } + /// + /// Executes the PerformAdd operation. + /// + /// The change value. protected override void PerformAdd(ItemChange change) { var isIncluded = IsLatestPredicateStateValid && Predicate.Invoke(LatestPredicateState, change.Current); @@ -441,6 +641,10 @@ protected override void PerformAdd(ItemChange change) } } + /// + /// Executes the PerformAddRange operation. + /// + /// The change value. protected override void PerformAddRange(RangeChange change) { var nextFilteredIndex = 0; @@ -500,6 +704,9 @@ protected override void PerformAddRange(RangeChange change) } } + /// + /// Executes the PerformClear operation. + /// protected override void PerformClear() { ItemsBuffer.EnsureCapacity(ItemStates.Count); @@ -520,6 +727,10 @@ protected override void PerformClear() } } + /// + /// Executes the PerformMove operation. + /// + /// The change value. protected override void PerformMove(ItemChange change) { var itemState = ItemStates[change.PreviousIndex]; @@ -606,6 +817,9 @@ protected override void PerformMove(ItemChange change) } } + /// + /// Executes the PerformReFilter operation. + /// protected override void PerformReFilter() { var nextFilteredIndex = 0; @@ -660,6 +874,10 @@ protected override void PerformReFilter() } } + /// + /// Executes the PerformRefresh operation. + /// + /// The change value. protected override void PerformRefresh(ItemChange change) { var itemState = ItemStates[change.CurrentIndex]; @@ -737,6 +955,10 @@ protected override void PerformRefresh(ItemChange change) } } + /// + /// Executes the PerformRemove operation. + /// + /// The change value. protected override void PerformRemove(ItemChange change) { var itemState = ItemStates[change.CurrentIndex]; @@ -763,6 +985,10 @@ protected override void PerformRemove(ItemChange change) } } + /// + /// Executes the PerformRemoveRange operation. + /// + /// The change value. protected override void PerformRemoveRange(RangeChange change) { ItemsBuffer.EnsureCapacity(change.Count); @@ -805,6 +1031,10 @@ protected override void PerformRemoveRange(RangeChange change) } } + /// + /// Executes the PerformReplace operation. + /// + /// The change value. protected override void PerformReplace(ItemChange change) { var itemState = ItemStates[change.CurrentIndex]; @@ -900,11 +1130,23 @@ protected override void PerformReplace(ItemChange change) } } - private sealed class ClearAndReplaceSubscription +/// +/// Provides members for the ClearAndReplaceSubscription class. +/// +private sealed class ClearAndReplaceSubscription : SubscriptionBase { + /// + /// The _filteredCount field. + /// private int _filteredCount; + /// + /// Initializes a new instance of the class. + /// + /// The downstreamObserver value. + /// The predicate value. + /// The suppressEmptyChangeSets value. public ClearAndReplaceSubscription( IObserver> downstreamObserver, Func predicate, @@ -916,6 +1158,10 @@ public ClearAndReplaceSubscription( { } + /// + /// Executes the PerformAdd operation. + /// + /// The change value. protected override void PerformAdd(ItemChange change) { var isIncluded = IsLatestPredicateStateValid && Predicate.Invoke(LatestPredicateState, change.Current); @@ -939,6 +1185,10 @@ protected override void PerformAdd(ItemChange change) }); } + /// + /// Executes the PerformAddRange operation. + /// + /// The change value. protected override void PerformAddRange(RangeChange change) { var priorFilteredCount = _filteredCount; @@ -977,6 +1227,9 @@ protected override void PerformAddRange(RangeChange change) } } + /// + /// Executes the PerformClear operation. + /// protected override void PerformClear() { // Not using ItemsBuffer, because we already know the exact size we need, so we can allocate a fresh one and use it directly. @@ -998,6 +1251,10 @@ protected override void PerformClear() } } + /// + /// Executes the PerformMove operation. + /// + /// The change value. protected override void PerformMove(ItemChange change) { // We're not supporting propagation of move changes, but we do still need to process them, to keep ItemStates correct. @@ -1006,6 +1263,9 @@ protected override void PerformMove(ItemChange change) ItemStates.Insert(change.CurrentIndex, itemState); } + /// + /// Executes the PerformReFilter operation. + /// protected override void PerformReFilter() { var nextFilteredIndex = 0; @@ -1077,6 +1337,10 @@ protected override void PerformReFilter() } } + /// + /// Executes the PerformRefresh operation. + /// + /// The change value. protected override void PerformRefresh(ItemChange change) { var itemState = ItemStates[change.CurrentIndex]; @@ -1134,6 +1398,10 @@ protected override void PerformRefresh(ItemChange change) } } + /// + /// Executes the PerformRemove operation. + /// + /// The change value. protected override void PerformRemove(ItemChange change) { var itemState = ItemStates[change.CurrentIndex]; @@ -1162,6 +1430,10 @@ protected override void PerformRemove(ItemChange change) } } + /// + /// Executes the PerformRemoveRange operation. + /// + /// The change value. protected override void PerformRemoveRange(RangeChange change) { for (var index = change.Index; index < change.Index + change.Count; ++index) @@ -1192,6 +1464,10 @@ protected override void PerformRemoveRange(RangeChange change) ItemStates.RemoveRange(change.Index, change.Count); } + /// + /// Executes the PerformReplace operation. + /// + /// The change value. protected override void PerformReplace(ItemChange change) { var itemState = ItemStates[change.CurrentIndex]; diff --git a/src/DynamicData/List/Internal/FilterOnObservable.cs b/src/DynamicData/List/Internal/FilterOnObservable.cs index 1d2dae5e0..14c3cce82 100644 --- a/src/DynamicData/List/Internal/FilterOnObservable.cs +++ b/src/DynamicData/List/Internal/FilterOnObservable.cs @@ -1,23 +1,43 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the FilterOnObservable class. +/// +/// The type of the TObject value. +/// The source value. +/// The filter value. +/// The buffer value. +/// The scheduler value. internal sealed class FilterOnObservable(IObservable> source, Func> filter, TimeSpan? buffer = null, IScheduler? scheduler = null) where TObject : notnull { + /// + /// The _filter field. + /// private readonly Func> _filter = filter ?? throw new ArgumentNullException(nameof(filter)); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var allItems = new List(); @@ -47,35 +67,88 @@ public IObservable> Run() => Observable.Create + /// Executes the IndexOfMany operation. + /// + /// The type of the TObj value. + /// The type of the TObjectProp value. + /// The type of the TResult value. + /// The source value. + /// The itemsToFind value. + /// The objectPropertyFunc value. + /// The resultSelector value. + /// The result of the operation. private static IEnumerable IndexOfMany(IEnumerable source, IEnumerable itemsToFind, Func objectPropertyFunc, Func resultSelector) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - itemsToFind.ThrowArgumentNullExceptionIfNull(nameof(itemsToFind)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(itemsToFind); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); var indexed = source.Select((element, index) => new { Element = element, Index = index }); return itemsToFind.Join(indexed, objectPropertyFunc, right => objectPropertyFunc(right.Element), (left, right) => resultSelector(left, right.Index)); } + /// + /// Represents the ObjWithFilterValue value. + /// + /// The obj value. + /// The filter value. private readonly struct ObjWithFilterValue(TObject obj, bool filter) : IEquatable { + /// + /// The Obj field. + /// public readonly TObject Obj = obj; + /// + /// The Filter field. + /// public readonly bool Filter = filter; + /// + /// Gets the ObjComparer value. + /// private static IEqualityComparer ObjComparer { get; } = new ObjEqualityComparer(); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ObjWithFilterValue other) => ObjComparer.Equals(this, other); // default equality does _not_ include Filter value, as that would cause the Filter operator that is used later to fail + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is ObjWithFilterValue value && Equals(value); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => ObjComparer.GetHashCode(this); + /// + /// Provides members for the ObjEqualityComparer class. + /// private sealed class ObjEqualityComparer : IEqualityComparer { + /// + /// Executes the Equals operation. + /// + /// The x value. + /// The y value. + /// The result of the operation. public bool Equals(ObjWithFilterValue x, ObjWithFilterValue y) => EqualityComparer.Default.Equals(x.Obj, y.Obj); + /// + /// Executes the GetHashCode operation. + /// + /// The obj value. + /// The result of the operation. public int GetHashCode(ObjWithFilterValue obj) { unchecked diff --git a/src/DynamicData/List/Internal/FilterOnProperty.cs b/src/DynamicData/List/Internal/FilterOnProperty.cs index d73b8e238..d172dab50 100644 --- a/src/DynamicData/List/Internal/FilterOnProperty.cs +++ b/src/DynamicData/List/Internal/FilterOnProperty.cs @@ -1,16 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive.Concurrency; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the FilterOnProperty class. +/// +/// The type of the TObject value. +/// The type of the TProperty value. +/// The source value. +/// The propertySelector value. +/// The predicate value. +/// The throttle value. +/// The scheduler value. [Obsolete("Use AutoRefresh(), followed by Filter() instead")] internal sealed class FilterOnProperty(IObservable> source, Expression> propertySelector, Func predicate, TimeSpan? throttle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => source.AutoRefresh(propertySelector, propertyChangeThrottle: throttle, scheduler: scheduler).Filter(predicate); } diff --git a/src/DynamicData/List/Internal/FilterStatic.cs b/src/DynamicData/List/Internal/FilterStatic.cs index 23786400e..eca70a7ee 100644 --- a/src/DynamicData/List/Internal/FilterStatic.cs +++ b/src/DynamicData/List/Internal/FilterStatic.cs @@ -1,18 +1,37 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the FilterStatic class. +/// +/// The type of the T value. +/// The source value. +/// The predicate value. internal sealed class FilterStatic(IObservable> source, Func predicate) where T : notnull { + /// + /// The _predicate field. + /// private readonly Func _predicate = predicate ?? throw new ArgumentNullException(nameof(predicate)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Defer(() => _source.Scan( new ChangeAwareList(), (state, changes) => @@ -21,6 +40,11 @@ public IObservable> Run() => Observable.Defer(() => _source.Scan( return state; }).Select(filtered => filtered.CaptureChanges()).NotEmpty()); + /// + /// Executes the Process operation. + /// + /// The filtered value. + /// The changes value. private void Process(ChangeAwareList filtered, IChangeSet changes) { foreach (var item in changes) diff --git a/src/DynamicData/List/Internal/Group.cs b/src/DynamicData/List/Internal/Group.cs index d6cd72e2d..98739bb2f 100644 --- a/src/DynamicData/List/Internal/Group.cs +++ b/src/DynamicData/List/Internal/Group.cs @@ -1,26 +1,70 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Group class. +/// +/// The type of the TObject value. +/// The type of the TGroup value. +/// The groupKey value. internal sealed class Group(TGroup groupKey) : IGroup, IDisposable, IEquatable> where TObject : notnull { + /// + /// Gets the GroupKey value. + /// public TGroup GroupKey { get; } = groupKey; + /// + /// Gets the List value. + /// public IObservableList List => Source; + /// + /// Gets the Source value. + /// private SourceList Source { get; } = new(); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(Group left, Group right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(Group left, Group right) => !Equals(left, right); + /// + /// Executes the Dispose operation. + /// public void Dispose() => Source.Dispose(); + /// + /// Executes the Edit operation. + /// + /// The editAction value. public void Edit(Action> editAction) => Source.Edit(editAction); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(Group? other) { if (other is null) @@ -36,9 +80,22 @@ public bool Equals(Group? other) return EqualityComparer.Default.Equals(GroupKey, other.GroupKey); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is Group value && Equals(value); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => GroupKey is null ? 0 : EqualityComparer.Default.GetHashCode(GroupKey); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Group of {GroupKey} ({List.Count} records)"; } diff --git a/src/DynamicData/List/Internal/GroupOn.cs b/src/DynamicData/List/Internal/GroupOn.cs index 6ea7deccd..435e162fc 100644 --- a/src/DynamicData/List/Internal/GroupOn.cs +++ b/src/DynamicData/List/Internal/GroupOn.cs @@ -1,23 +1,45 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the GroupOn class. +/// +/// The type of the TObject value. +/// The type of the TGroupKey value. +/// The source value. +/// The groupSelector value. +/// The regrouper value. internal sealed class GroupOn(IObservable> source, Func groupSelector, IObservable? regrouper) where TObject : notnull where TGroupKey : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelector ?? throw new ArgumentNullException(nameof(groupSelector)); + /// + /// The _regrouper field. + /// private readonly IObservable? _regrouper = regrouper; + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable>> Run() => Observable.Create>>( observer => { @@ -27,7 +49,7 @@ public IObservable>> Run() => Observable.C // capture the grouping up front which has the benefit that the group key is only selected once var itemsWithGroup = _source.Transform((t, previous) => new ItemWithGroupKey(t, _groupSelector(t), previous.Convert(p => p.Group)), true); - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var shared = itemsWithGroup.Synchronize(locker).Publish(); var grouper = shared.Select(changes => Process(groupings, groupCache, changes)); @@ -42,6 +64,12 @@ public IObservable>> Run() => Observable.C return new CompositeDisposable(publisher, shared.Connect()); }); + /// + /// Executes the GetCache operation. + /// + /// The groupCaches value. + /// The key value. + /// The result of the operation. private static GroupWithAddIndicator GetCache(IDictionary> groupCaches, TGroupKey key) { var cache = groupCaches.Lookup(key); @@ -55,6 +83,13 @@ private static GroupWithAddIndicator GetCache(IDictionary + /// Executes the Process operation. + /// + /// The result value. + /// The groupCollection value. + /// The changes value. + /// The result of the operation. private static IChangeSet> Process(ChangeAwareList> result, IDictionary> groupCollection, IChangeSet changes) { foreach (var grouping in changes.Unified().GroupBy(change => change.Current.Group)) @@ -180,6 +215,13 @@ private static IChangeSet> Process(ChangeAwareList + /// Executes the Regroup operation. + /// + /// The result value. + /// The groupCollection value. + /// The currentItems value. + /// The result of the operation. private IChangeSet> Regroup(ChangeAwareList> result, IDictionary> groupCollection, IReadOnlyCollection currentItems) { // TODO: We need to update ItemWithValue> @@ -220,8 +262,16 @@ private IChangeSet> Regroup(ChangeAwareList + /// Represents the GroupWithAddIndicator value. + /// private readonly struct GroupWithAddIndicator { + /// + /// Initializes a new instance of the struct. + /// + /// The group value. + /// The wasCreated value. public GroupWithAddIndicator(Group group, bool wasCreated) : this() { @@ -229,31 +279,57 @@ public GroupWithAddIndicator(Group group, bool wasCreated) WasCreated = wasCreated; } + /// + /// Gets the Group value. + /// public Group Group { get; } + /// + /// Gets the WasCreated value. + /// public bool WasCreated { get; } } - private sealed class ItemWithGroupKey(TObject item, TGroupKey group, Optional previousGroup) : IEquatable + /// + /// Provides members for the ItemWithGroupKey class. + /// + /// The item value. + /// The group value. + /// The previousGroup value. + private sealed class ItemWithGroupKey(TObject item, TGroupKey group, ReactiveUI.Primitives.Optional previousGroup) : IEquatable { + /// + /// Gets or sets the Group value. + /// public TGroupKey Group { get; set; } = group; + /// + /// Gets the Item value. + /// public TObject Item { get; } = item; - public Optional PreviousGroup { get; } = previousGroup; + /// + /// Gets the PreviousGroup value. + /// + public ReactiveUI.Primitives.Optional PreviousGroup { get; } = previousGroup; - /// Returns a value that indicates whether the values of two objects are equal. + /// Returns a value that indicates whether the values of two GroupOn<TObject, TGroupKey>.ItemWithGroupKey objects are equal. /// The first value to compare. /// The second value to compare. /// true if the and parameters have the same value; otherwise, false. public static bool operator ==(ItemWithGroupKey left, ItemWithGroupKey right) => Equals(left, right); - /// Returns a value that indicates whether two objects have different values. + /// Returns a value that indicates whether two GroupOn<TObject, TGroupKey>.ItemWithGroupKey objects have different values. /// The first value to compare. /// The second value to compare. /// true if and are not equal; otherwise, false. public static bool operator !=(ItemWithGroupKey left, ItemWithGroupKey right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ItemWithGroupKey? other) { if (other is null) @@ -269,6 +345,11 @@ public bool Equals(ItemWithGroupKey? other) return EqualityComparer.Default.Equals(Item, other.Item); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -284,8 +365,16 @@ public override bool Equals(object? obj) return obj is ItemWithGroupKey value && Equals(value); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Item is null ? 0 : EqualityComparer.Default.GetHashCode(Item); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"{Item} ({Group})"; } } diff --git a/src/DynamicData/List/Internal/GroupOnImmutable.cs b/src/DynamicData/List/Internal/GroupOnImmutable.cs index 2b4a08be8..9eb5a652c 100644 --- a/src/DynamicData/List/Internal/GroupOnImmutable.cs +++ b/src/DynamicData/List/Internal/GroupOnImmutable.cs @@ -1,23 +1,45 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the GroupOnImmutable class. +/// +/// The type of the TObject value. +/// The type of the TGroupKey value. +/// The source value. +/// The groupSelector value. +/// The reGrouper value. internal sealed class GroupOnImmutable(IObservable> source, Func groupSelector, IObservable? reGrouper) where TObject : notnull where TGroupKey : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelector ?? throw new ArgumentNullException(nameof(groupSelector)); + /// + /// The _reGrouper field. + /// private readonly IObservable? _reGrouper = reGrouper; + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable>> Run() => Observable.Create>>( observer => { @@ -30,7 +52,7 @@ public IObservable>> Run() => Observabl // capture the grouping up front which has the benefit that the group key is only selected once var itemsWithGroup = _source.Transform((t, previous) => new ItemWithGroupKey(t, _groupSelector(t), previous.Convert(p => p.Group)), true); - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var shared = itemsWithGroup.Synchronize(locker).Publish(); var grouper = shared.Select(changes => Process(groupings, groupCache, changes)); @@ -44,6 +66,13 @@ public IObservable>> Run() => Observabl return new CompositeDisposable(publisher, shared.Connect()); }); + /// + /// Executes the CreateChangeSet operation. + /// + /// The result value. + /// The allGroupings value. + /// The initialStateOfGroups value. + /// The result of the operation. private static IChangeSet> CreateChangeSet(ChangeAwareList> result, IDictionary allGroupings, IDictionary> initialStateOfGroups) { // Now maintain target list @@ -77,6 +106,12 @@ private static IChangeSet> CreateChangeSet(ChangeA return result.CaptureChanges(); } + /// + /// Executes the GetGroup operation. + /// + /// The groupCaches value. + /// The key value. + /// The result of the operation. private static GroupContainer GetGroup(IDictionary groupCaches, TGroupKey key) { var cached = groupCaches.Lookup(key); @@ -90,10 +125,28 @@ private static GroupContainer GetGroup(IDictionary gr return newcache; } + /// + /// Executes the GetGroupState operation. + /// + /// The grouping value. + /// The result of the operation. private static ImmutableGroup GetGroupState(GroupContainer grouping) => new(grouping.Key, grouping.List); + /// + /// Executes the GetGroupState operation. + /// + /// The key value. + /// The list value. + /// The result of the operation. private static ImmutableGroup GetGroupState(TGroupKey key, IList list) => new(key, list); + /// + /// Executes the Process operation. + /// + /// The result value. + /// The allGroupings value. + /// The changes value. + /// The result of the operation. private static IChangeSet> Process(ChangeAwareList> result, IDictionary allGroupings, IChangeSet changes) { // need to keep track of effected groups to calculate correct notifications @@ -211,6 +264,13 @@ void GetInitialState() return CreateChangeSet(result, allGroupings, initialStateOfGroups); } + /// + /// Executes the Regroup operation. + /// + /// The result value. + /// The allGroupings value. + /// The currentItems value. + /// The result of the operation. private IChangeSet> Regroup(ChangeAwareList> result, IDictionary allGroupings, IReadOnlyCollection currentItems) { var initialStateOfGroups = new Dictionary>(); @@ -250,25 +310,67 @@ private IChangeSet> Regroup(ChangeAwareList + /// Provides members for the GroupContainer class. + /// + /// The key value. private sealed class GroupContainer(TGroupKey key) { + /// + /// Gets the Key value. + /// public TGroupKey Key { get; } = key; + /// + /// Gets the List value. + /// public IList List { get; } = new List(); } - private sealed class ItemWithGroupKey(TObject item, TGroupKey group, Optional previousGroup) : IEquatable + /// + /// Provides members for the ItemWithGroupKey class. + /// + /// The item value. + /// The group value. + /// The previousGroup value. + private sealed class ItemWithGroupKey(TObject item, TGroupKey group, ReactiveUI.Primitives.Optional previousGroup) : IEquatable { + /// + /// Gets or sets the Group value. + /// public TGroupKey Group { get; set; } = group; + /// + /// Gets the Item value. + /// public TObject Item { get; } = item; - public Optional PreviousGroup { get; } = previousGroup; - + /// + /// Gets the PreviousGroup value. + /// + public ReactiveUI.Primitives.Optional PreviousGroup { get; } = previousGroup; + + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(ItemWithGroupKey left, ItemWithGroupKey right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(ItemWithGroupKey left, ItemWithGroupKey right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ItemWithGroupKey? other) { if (other is null) @@ -284,10 +386,23 @@ public bool Equals(ItemWithGroupKey? other) return EqualityComparer.Default.Equals(Item, other.Item); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) => obj is ItemWithGroupKey value && Equals(value); + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Item is null ? 0 : EqualityComparer.Default.GetHashCode(Item); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"{Item} ({Group})"; } } diff --git a/src/DynamicData/List/Internal/GroupOnProperty.cs b/src/DynamicData/List/Internal/GroupOnProperty.cs index ab5998aed..433247ce5 100644 --- a/src/DynamicData/List/Internal/GroupOnProperty.cs +++ b/src/DynamicData/List/Internal/GroupOnProperty.cs @@ -1,21 +1,43 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive.Concurrency; -using System.Reactive.Linq; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the GroupOnProperty class. +/// +/// The type of the TObject value. +/// The type of the TGroup value. +/// The source value. +/// The groupSelectorKey value. +/// The throttle value. +/// The scheduler value. internal sealed class GroupOnProperty(IObservable> source, Expression> groupSelectorKey, TimeSpan? throttle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TGroup : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelectorKey.Compile(); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable>> Run() => _source.Publish( shared => { diff --git a/src/DynamicData/List/Internal/GroupOnPropertyWithImmutableState.cs b/src/DynamicData/List/Internal/GroupOnPropertyWithImmutableState.cs index 99d8b1d75..a1803817f 100644 --- a/src/DynamicData/List/Internal/GroupOnPropertyWithImmutableState.cs +++ b/src/DynamicData/List/Internal/GroupOnPropertyWithImmutableState.cs @@ -1,21 +1,43 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.ComponentModel; using System.Linq.Expressions; -using System.Reactive.Concurrency; -using System.Reactive.Linq; +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the GroupOnPropertyWithImmutableState class. +/// +/// The type of the TObject value. +/// The type of the TGroup value. +/// The source value. +/// The groupSelectorKey value. +/// The throttle value. +/// The scheduler value. internal sealed class GroupOnPropertyWithImmutableState(IObservable> source, Expression> groupSelectorKey, TimeSpan? throttle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TGroup : notnull { + /// + /// The _groupSelector field. + /// private readonly Func _groupSelector = groupSelectorKey.Compile(); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable>> Run() => _source.Publish( shared => { diff --git a/src/DynamicData/List/Internal/ImmutableGroup.cs b/src/DynamicData/List/Internal/ImmutableGroup.cs index 3ad76d595..784695796 100644 --- a/src/DynamicData/List/Internal/ImmutableGroup.cs +++ b/src/DynamicData/List/Internal/ImmutableGroup.cs @@ -1,29 +1,73 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ImmutableGroup class. +/// +/// The type of the TObject value. +/// The type of the TGroupKey value. internal sealed class ImmutableGroup : IGrouping, IEquatable> { + /// + /// The _items field. + /// private readonly IReadOnlyCollection _items; + /// + /// Initializes a new instance of the class. + /// + /// The key value. + /// The items value. internal ImmutableGroup(TGroupKey key, IList items) { Key = key; _items = new ReadOnlyCollectionLight(items); } + /// + /// Gets the Count value. + /// public int Count => _items.Count; + /// + /// Gets the Items value. + /// public IEnumerable Items => _items; + /// + /// Gets the Key value. + /// public TGroupKey Key { get; } + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(ImmutableGroup left, ImmutableGroup right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(ImmutableGroup left, ImmutableGroup right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(ImmutableGroup? other) { if (other is null) @@ -39,6 +83,11 @@ public bool Equals(ImmutableGroup? other) return EqualityComparer.Default.Equals(Key, other.Key); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -54,7 +103,15 @@ public override bool Equals(object? obj) return obj is ImmutableGroup value && Equals(value); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Key is null ? 0 : EqualityComparer.Default.GetHashCode(Key); + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Grouping for: {Key} ({Count} items)"; } diff --git a/src/DynamicData/List/Internal/LimitSizeTo.cs b/src/DynamicData/List/Internal/LimitSizeTo.cs index c2ed74896..a234b29af 100644 --- a/src/DynamicData/List/Internal/LimitSizeTo.cs +++ b/src/DynamicData/List/Internal/LimitSizeTo.cs @@ -1,23 +1,39 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - -#if NET9_0_OR_GREATER -internal sealed class LimitSizeTo(ISourceList sourceList, int sizeLimit, IScheduler scheduler, Lock locker) -#else -internal sealed class LimitSizeTo(ISourceList sourceList, int sizeLimit, IScheduler scheduler, object locker) #endif +/// +/// Provides members for the LimitSizeTo class. +/// +/// The type of the T value. +/// The sourceList value. +/// The sizeLimit value. +/// The scheduler value. +/// The locker value. +internal sealed class LimitSizeTo(ISourceList sourceList, int sizeLimit, IScheduler scheduler, object locker) where T : notnull { + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler)); + + /// + /// The _sourceList field. + /// private readonly ISourceList _sourceList = sourceList ?? throw new ArgumentNullException(nameof(sourceList)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() { var emptyResult = new List(); diff --git a/src/DynamicData/List/Internal/MergeChangeSets.cs b/src/DynamicData/List/Internal/MergeChangeSets.cs index 480c69b3a..eef807ded 100644 --- a/src/DynamicData/List/Internal/MergeChangeSets.cs +++ b/src/DynamicData/List/Internal/MergeChangeSets.cs @@ -1,27 +1,43 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif /// /// Operator that is similiar to Merge but intelligently handles List ChangeSets. /// +/// The type of the TObject value. +/// The source value. +/// The equalityComparer value. internal sealed class MergeChangeSets(IObservable>> source, IEqualityComparer? equalityComparer) where TObject : notnull { + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The equalityComparer value. + /// The completable value. + /// The scheduler value. public MergeChangeSets(IEnumerable>> source, IEqualityComparer? equalityComparer, bool completable, IScheduler? scheduler = null) : this(CreateObservable(source, completable, scheduler), equalityComparer) { } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); // This is manages all of the changes var changeTracker = new ChangeSetMergeTracker(); @@ -36,6 +52,13 @@ public IObservable> Run() => Observable.Create + /// Executes the CreateObservable operation. + /// + /// The source value. + /// The completable value. + /// The scheduler value. + /// The result of the operation. private static IObservable>> CreateObservable(IEnumerable>> source, bool completable, IScheduler? scheduler) { var obs = (scheduler != null) ? source.ToObservable(scheduler) : source.ToObservable(); @@ -48,21 +71,22 @@ private static IObservable>> CreateObservable(IE return obs; } - // Can optimize for the Add case because that's the only one that applies -#if NET9_0_OR_GREATER - private Change> CreateChange(IObservable> source, Lock locker) => - new(ListChangeReason.Add, new ClonedListChangeSet(source.Synchronize(locker), equalityComparer)); - - // Create a ChangeSet Observable that produces ChangeSets with a single Add event for each new sub-observable - private IObservable>> CreateClonedListObservable(IObservable>> source, Lock locker) => - source.Select(src => new ChangeSet>(new[] { CreateChange(src, locker) })); -#else + /// + /// Executes the CreateChange operation. + /// + /// The source value. + /// The locker value. + /// The result of the operation. private Change> CreateChange(IObservable> source, object locker) => new(ListChangeReason.Add, new ClonedListChangeSet(source.Synchronize(locker), equalityComparer)); - // Create a ChangeSet Observable that produces ChangeSets with a single Add event for each new sub-observable + + /// + /// Executes the CreateClonedListObservable operation. + /// + /// The source value. + /// The locker value. + /// The result of the operation. private IObservable>> CreateClonedListObservable(IObservable>> source, object locker) => source.Select(src => new ChangeSet>(new[] { CreateChange(src, locker) })); -#endif - } diff --git a/src/DynamicData/List/Internal/MergeMany.cs b/src/DynamicData/List/Internal/MergeMany.cs index 65b238068..11f17423a 100644 --- a/src/DynamicData/List/Internal/MergeMany.cs +++ b/src/DynamicData/List/Internal/MergeMany.cs @@ -1,53 +1,114 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the MergeMany class. +/// +/// The type of the T value. +/// The type of the TDestination value. +/// The source value. +/// The observableSelector value. internal sealed class MergeMany(IObservable> source, Func> observableSelector) where T : notnull { + /// + /// The _observableSelector field. + /// private readonly Func> _observableSelector = observableSelector ?? throw new ArgumentNullException(nameof(observableSelector)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable Run() => Observable.Create( observer => { var counter = new SubscriptionCounter(); - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var disposable = _source.Concat(counter.DeferCleanup) - .SubscribeMany(t => - { - counter.Added(); - return _observableSelector(t).Synchronize(locker).Finally(() => counter.Finally()).Subscribe(observer.OnNext, _ => { }, () => { }); - }) + .SubscribeMany(t => SubscribeChild(t, locker, counter, observer)) .Subscribe(_ => { }, observer.OnError, observer.OnCompleted); return new CompositeDisposable(disposable, counter); }); + /// + /// Executes the SubscribeChild operation. + /// + /// The item value. + /// The locker value. + /// The counter value. + /// The observer value. + /// The result of the operation. + private IDisposable SubscribeChild(T item, object locker, SubscriptionCounter counter, IObserver observer) + { + counter.Added(); + try + { + return _observableSelector(item).Synchronize(locker).Finally(counter.Finally).Subscribe(observer.OnNext, _ => { }, () => { }); + } + catch (ObjectDisposedException) + { + counter.Finally(); + return Disposable.Empty; + } + } + + /// + /// Provides members for the SubscriptionCounter class. + /// private sealed class SubscriptionCounter : IDisposable { - private readonly Subject> _subject = new(); + /// + /// The _subject field. + /// + private readonly Signal> _subject = new(); + + /// + /// The _subscriptionCount field. + /// private int _subscriptionCount = 1; + /// + /// Gets the DeferCleanup value. + /// public IObservable> DeferCleanup => Observable.Defer(() => { CheckCompleted(); return _subject.AsObservable(); }); + /// + /// Executes the Added operation. + /// public void Added() => _ = Interlocked.Increment(ref _subscriptionCount); + /// + /// Executes the Finally operation. + /// public void Finally() => CheckCompleted(); + /// + /// Executes the Dispose operation. + /// public void Dispose() => _subject.Dispose(); + /// + /// Executes the CheckCompleted operation. + /// private void CheckCompleted() { if (Interlocked.Decrement(ref _subscriptionCount) == 0) diff --git a/src/DynamicData/List/Internal/MergeManyCacheChangeSets.cs b/src/DynamicData/List/Internal/MergeManyCacheChangeSets.cs index 3b63ea231..2e9ef53ee 100644 --- a/src/DynamicData/List/Internal/MergeManyCacheChangeSets.cs +++ b/src/DynamicData/List/Internal/MergeManyCacheChangeSets.cs @@ -1,58 +1,410 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +using DynamicData.Reactive.Internal; +#else -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Cache.Internal; using DynamicData.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif /// /// Operator that is similiar to MergeMany but intelligently handles Cache ChangeSets. /// +/// The type of the TObject value. +/// The type of the TDestination value. +/// The type of the TDestinationKey value. +/// The source value. +/// The changeSetSelector value. +/// The equalityComparer value. +/// The comparer value. internal sealed class MergeManyCacheChangeSets(IObservable> source, Func>> changeSetSelector, IEqualityComparer? equalityComparer, IComparer? comparer) where TObject : notnull where TDestination : notnull where TDestinationKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( - observer => - { - var locker = InternalEx.NewLock(); - var list = new List>(); - var parentUpdate = false; - - // This is manages all of the changes - var changeTracker = new ChangeSetMergeTracker(() => list, comparer, equalityComparer); - - // Transform to a list changeset of child caches, synchronize, update the local copy, and publish. - var shared = source - .Transform(obj => new ChangeSetCache(changeSetSelector(obj).Synchronize(locker))) - .Synchronize(locker) - .Do(list.Clone) - .Do(_ => parentUpdate = true) - .Publish(); - - // Merge the child changeset changes together and apply to the tracker - var subMergeMany = shared - .MergeMany(chanceSetCache => chanceSetCache.Source) - .SubscribeSafe( - changes => changeTracker.ProcessChangeSet(changes, !parentUpdate ? observer : null), - observer.OnError, - observer.OnCompleted); - - // When a source item is removed, all of its sub-items need to be removed - var subRemove = shared - .OnItemRemoved(changeSetCache => changeTracker.RemoveItems(changeSetCache.Cache.KeyValues), invokeOnUnsubscribe: false) - .Do(_ => + observer => new Subscription(source, changeSetSelector, observer, equalityComparer, comparer)); + + /// + /// Maintains state for a single subscription. + /// + private sealed class Subscription : CacheParentSubscription, int, IChangeSet, IChangeSet> + { + /// + /// The _cache field. + /// + private readonly Cache, int> _cache = new(); + + /// + /// The _changeSetMergeTracker field. + /// + private readonly ChangeSetMergeTracker _changeSetMergeTracker; + + /// + /// The _changeSetSelector field. + /// + private readonly Func>> _changeSetSelector; + + /// + /// The _parents field. + /// + private readonly List _parents = []; + + /// + /// The _nextParentKey field. + /// + private int _nextParentKey; + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The changeSetSelector value. + /// The observer value. + /// The equalityComparer value. + /// The comparer value. + public Subscription( + IObservable> source, + Func>> changeSetSelector, + IObserver> observer, + IEqualityComparer? equalityComparer, + IComparer? comparer) + : base(observer) + { + _changeSetSelector = changeSetSelector; + _changeSetMergeTracker = new(() => _cache.Items, comparer, equalityComparer); + + CreateParentSubscription(source.Select(ConvertParentChanges).Where(static changes => changes.Count != 0)); + } + + /// + /// Executes the ParentOnNext operation. + /// + /// The changes value. + protected override void ParentOnNext(IChangeSet, int> changes) + { + foreach (var change in changes.ToConcreteType()) + { + switch (change.Reason) + { + case ChangeReason.Add or ChangeReason.Update: + _cache.AddOrUpdate(change.Current, change.Key); + AddChildSubscription(change.Current.Source, change.Key); + if (change.Previous.HasValue) + { + _changeSetMergeTracker.RemoveItems(change.Previous.Value.Cache.KeyValues); + } + + break; + + case ChangeReason.Remove: + _cache.Remove(change.Key); + _changeSetMergeTracker.RemoveItems(change.Current.Cache.KeyValues); + RemoveChildSubscription(change.Key); + break; + } + } + } + + /// + /// Executes the ChildOnNext operation. + /// + /// The changes value. + /// The parentKey value. + protected override void ChildOnNext(IChangeSet changes, int parentKey) => + _changeSetMergeTracker.ProcessChangeSet(changes, null); + + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. + protected override void EmitChanges(IObserver> observer) => + _changeSetMergeTracker.EmitChanges(observer); + + /// + /// Executes the ConvertParentChanges operation. + /// + /// The changes value. + /// The result of the operation. + private IChangeSet, int> ConvertParentChanges(IChangeSet changes) + { + var results = new ChangeSet, int>(changes.Count); + + foreach (var change in changes) + { + switch (change.Reason) + { + case ListChangeReason.Add: + AddParent(change.Item.Current, change.Item.CurrentIndex, results); + break; + + case ListChangeReason.AddRange: + AddParents(change.Range, results); + break; + + case ListChangeReason.Remove: + RemoveParent(change.Item.Current, change.Item.CurrentIndex, results); + break; + + case ListChangeReason.RemoveRange: + RemoveParents(change.Range, results); + break; + + case ListChangeReason.Replace: + ReplaceParent(change.Item.Previous.Value, change.Item.Current, change.Item.PreviousIndex, change.Item.CurrentIndex, results); + break; + + case ListChangeReason.Clear: + RemoveAllParents(results); + break; + + case ListChangeReason.Moved: + MoveParent(change.Item.Current, change.Item.CurrentIndex, change.Item.PreviousIndex); + break; + } + } + + return results; + } + + /// + /// Executes the AddParents operation. + /// + /// The range value. + /// The changes value. + private void AddParents(RangeChange range, ChangeSet, int> changes) + { + var index = range.Index; + foreach (var item in range) + { + AddParent(item, index, changes); + if (index >= 0) + { + index++; + } + } + } + + /// + /// Executes the AddParent operation. + /// + /// The item value. + /// The index value. + /// The changes value. + private void AddParent(TObject item, int index, ChangeSet, int> changes) + { + var key = ++_nextParentKey; + var child = CreateChild(item); + var parent = new ParentItem(item, key, child); + var insertIndex = NormalizeAddIndex(index); + + _parents.Insert(insertIndex, parent); + changes.Add(new Change, int>(ChangeReason.Add, key, child, insertIndex)); + } + + /// + /// Executes the ReplaceParent operation. + /// + /// The previous value. + /// The current value. + /// The previousIndex value. + /// The currentIndex value. + /// The changes value. + private void ReplaceParent(TObject previous, TObject current, int previousIndex, int currentIndex, ChangeSet, int> changes) + { + var replaceIndex = NormalizeExistingIndex(previousIndex); + if (replaceIndex < 0 || !ReferenceEquals(_parents[replaceIndex].Source, previous)) + { + replaceIndex = FindParentIndex(previous); + } + + if (replaceIndex < 0) + { + AddParent(current, currentIndex, changes); + return; + } + + var existing = _parents[replaceIndex]; + var child = CreateChild(current); + var updated = new ParentItem(current, existing.Key, child); + _parents[replaceIndex] = updated; + + var destinationIndex = NormalizeReplacementIndex(currentIndex, replaceIndex); + if (destinationIndex != replaceIndex) + { + _parents.RemoveAt(replaceIndex); + _parents.Insert(destinationIndex, updated); + } + + changes.Add(new Change, int>(ChangeReason.Update, existing.Key, child, existing.Child, destinationIndex, replaceIndex)); + } + + /// + /// Executes the RemoveParents operation. + /// + /// The range value. + /// The changes value. + private void RemoveParents(RangeChange range, ChangeSet, int> changes) + { + if (range.Index >= 0) + { + for (var i = 0; i < range.Count; i++) + { + RemoveParentAt(range.Index, changes); + } + + return; + } + + foreach (var item in range) + { + RemoveParent(item, -1, changes); + } + } + + /// + /// Executes the RemoveParent operation. + /// + /// The item value. + /// The index value. + /// The changes value. + private void RemoveParent(TObject item, int index, ChangeSet, int> changes) + { + var removeIndex = NormalizeExistingIndex(index); + if (removeIndex < 0 || !ReferenceEquals(_parents[removeIndex].Source, item)) + { + removeIndex = FindParentIndex(item); + } + + if (removeIndex >= 0) + { + RemoveParentAt(removeIndex, changes); + } + } + + /// + /// Executes the RemoveParentAt operation. + /// + /// The index value. + /// The changes value. + private void RemoveParentAt(int index, ChangeSet, int> changes) + { + if (index < 0 || index >= _parents.Count) + { + return; + } + + var parent = _parents[index]; + _parents.RemoveAt(index); + changes.Add(new Change, int>(ChangeReason.Remove, parent.Key, parent.Child, index)); + } + + /// + /// Executes the RemoveAllParents operation. + /// + /// The changes value. + private void RemoveAllParents(ChangeSet, int> changes) + { + for (var i = _parents.Count - 1; i >= 0; i--) + { + RemoveParentAt(i, changes); + } + } + + /// + /// Executes the MoveParent operation. + /// + /// The item value. + /// The currentIndex value. + /// The previousIndex value. + private void MoveParent(TObject item, int currentIndex, int previousIndex) + { + var from = NormalizeExistingIndex(previousIndex); + if (from < 0 || !ReferenceEquals(_parents[from].Source, item)) + { + from = FindParentIndex(item); + } + + if (from < 0) + { + return; + } + + var parent = _parents[from]; + _parents.RemoveAt(from); + _parents.Insert(NormalizeAddIndex(currentIndex), parent); + } + + /// + /// Executes the FindParentIndex operation. + /// + /// The item value. + /// The result of the operation. + private int FindParentIndex(TObject item) + { + var comparer = EqualityComparer.Default; + for (var i = 0; i < _parents.Count; i++) + { + if (ReferenceEquals(_parents[i].Source, item) || comparer.Equals(_parents[i].Source, item)) { - changeTracker.EmitChanges(observer); - parentUpdate = false; - }) - .Subscribe(); + return i; + } + } + + return -1; + } + + /// + /// Executes the NormalizeAddIndex operation. + /// + /// The index value. + /// The result of the operation. + private int NormalizeAddIndex(int index) => index < 0 || index > _parents.Count ? _parents.Count : index; + + /// + /// Executes the NormalizeExistingIndex operation. + /// + /// The index value. + /// The result of the operation. + private int NormalizeExistingIndex(int index) => index >= 0 && index < _parents.Count ? index : -1; + + /// + /// Executes the NormalizeReplacementIndex operation. + /// + /// The index value. + /// The fallbackIndex value. + /// The result of the operation. + private int NormalizeReplacementIndex(int index, int fallbackIndex) => index >= 0 && index < _parents.Count ? index : fallbackIndex; + + /// + /// Executes the CreateChild operation. + /// + /// The item value. + /// The result of the operation. + private ChangeSetCache CreateChild(TObject item) => + new(MakeChildObservable(_changeSetSelector(item))); - return new CompositeDisposable(shared.Connect(), subMergeMany, subRemove); - }); + /// + /// Stores a source item and its child container. + /// + /// The Source value. + /// The Key value. + /// The Child value. + private sealed record ParentItem(TObject Source, int Key, ChangeSetCache Child); + } } diff --git a/src/DynamicData/List/Internal/MergeManyListChangeSets.cs b/src/DynamicData/List/Internal/MergeManyListChangeSets.cs index 482c4f46b..37a2e788f 100644 --- a/src/DynamicData/List/Internal/MergeManyListChangeSets.cs +++ b/src/DynamicData/List/Internal/MergeManyListChangeSets.cs @@ -1,54 +1,401 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Internal; +#else -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif /// /// Operator that is similiar to MergeMany but intelligently handles List ChangeSets. /// +/// The type of the TObject value. +/// The type of the TDestination value. +/// The source value. +/// The selector value. +/// The equalityComparer value. internal sealed class MergeManyListChangeSets(IObservable> source, Func>> selector, IEqualityComparer? equalityComparer) where TObject : notnull where TDestination : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( - observer => - { - var locker = InternalEx.NewLock(); - var parentUpdate = false; - - // This is manages all of the changes - var changeTracker = new ChangeSetMergeTracker(); - - // Transform to a list changeset of child lists, synchronize, and publish. - var shared = source - .Transform(obj => new ClonedListChangeSet(selector(obj).Synchronize(locker), equalityComparer)) - .Synchronize(locker) - .Do(_ => parentUpdate = true) - .Publish(); - - // Merge the child changeset changes together and apply to the tracker - var subMergeMany = shared - .MergeMany(clonedList => clonedList.Source.RemoveIndex()) - .SubscribeSafe( - changes => changeTracker.ProcessChangeSet(changes, !parentUpdate ? observer : null), - observer.OnError, - observer.OnCompleted); - - // When a source item is removed, all of its sub-items need to be removed - var subRemove = shared - .OnItemRemoved(clonedList => changeTracker.RemoveItems(clonedList.List), invokeOnUnsubscribe: false) - .Do(_ => + observer => new Subscription(source, selector, observer, equalityComparer)); + + /// + /// Maintains state for a single subscription. + /// + private sealed class Subscription : CacheParentSubscription, int, IChangeSet, IChangeSet> + { + /// + /// The _changeSetMergeTracker field. + /// + private readonly ChangeSetMergeTracker _changeSetMergeTracker = new(); + + /// + /// The _parents field. + /// + private readonly List _parents = []; + + /// + /// The _selector field. + /// + private readonly Func>> _selector; + + /// + /// The _equalityComparer field. + /// + private readonly IEqualityComparer? _equalityComparer; + + /// + /// The _nextParentKey field. + /// + private int _nextParentKey; + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The selector value. + /// The observer value. + /// The equalityComparer value. + public Subscription( + IObservable> source, + Func>> selector, + IObserver> observer, + IEqualityComparer? equalityComparer) + : base(observer) + { + _selector = selector; + _equalityComparer = equalityComparer; + + CreateParentSubscription(source.Select(ConvertParentChanges).Where(static changes => changes.Count != 0)); + } + + /// + /// Executes the ParentOnNext operation. + /// + /// The changes value. + protected override void ParentOnNext(IChangeSet, int> changes) + { + foreach (var change in changes.ToConcreteType()) + { + switch (change.Reason) + { + case ChangeReason.Add or ChangeReason.Update: + AddChildSubscription(change.Current.Source, change.Key); + if (change.Previous.HasValue) + { + _changeSetMergeTracker.RemoveItems(change.Previous.Value.List); + } + + break; + + case ChangeReason.Remove: + _changeSetMergeTracker.RemoveItems(change.Current.List); + RemoveChildSubscription(change.Key); + break; + } + } + } + + /// + /// Executes the ChildOnNext operation. + /// + /// The child value. + /// The parentKey value. + protected override void ChildOnNext(IChangeSet child, int parentKey) => + _changeSetMergeTracker.ProcessChangeSet(child, null); + + /// + /// Executes the EmitChanges operation. + /// + /// The observer value. + protected override void EmitChanges(IObserver> observer) => + _changeSetMergeTracker.EmitChanges(observer); + + /// + /// Executes the ConvertParentChanges operation. + /// + /// The changes value. + /// The result of the operation. + private IChangeSet, int> ConvertParentChanges(IChangeSet changes) + { + var results = new ChangeSet, int>(changes.Count); + + foreach (var change in changes) + { + switch (change.Reason) + { + case ListChangeReason.Add: + AddParent(change.Item.Current, change.Item.CurrentIndex, results); + break; + + case ListChangeReason.AddRange: + AddParents(change.Range, results); + break; + + case ListChangeReason.Remove: + RemoveParent(change.Item.Current, change.Item.CurrentIndex, results); + break; + + case ListChangeReason.RemoveRange: + RemoveParents(change.Range, results); + break; + + case ListChangeReason.Replace: + ReplaceParent(change.Item.Previous.Value, change.Item.Current, change.Item.PreviousIndex, change.Item.CurrentIndex, results); + break; + + case ListChangeReason.Clear: + RemoveAllParents(results); + break; + + case ListChangeReason.Moved: + MoveParent(change.Item.Current, change.Item.CurrentIndex, change.Item.PreviousIndex); + break; + } + } + + return results; + } + + /// + /// Executes the AddParents operation. + /// + /// The range value. + /// The changes value. + private void AddParents(RangeChange range, ChangeSet, int> changes) + { + var index = range.Index; + foreach (var item in range) + { + AddParent(item, index, changes); + if (index >= 0) + { + index++; + } + } + } + + /// + /// Executes the AddParent operation. + /// + /// The item value. + /// The index value. + /// The changes value. + private void AddParent(TObject item, int index, ChangeSet, int> changes) + { + var key = ++_nextParentKey; + var child = CreateChild(item); + var parent = new ParentItem(item, key, child); + var insertIndex = NormalizeAddIndex(index); + + _parents.Insert(insertIndex, parent); + changes.Add(new Change, int>(ChangeReason.Add, key, child, insertIndex)); + } + + /// + /// Executes the ReplaceParent operation. + /// + /// The previous value. + /// The current value. + /// The previousIndex value. + /// The currentIndex value. + /// The changes value. + private void ReplaceParent(TObject previous, TObject current, int previousIndex, int currentIndex, ChangeSet, int> changes) + { + var replaceIndex = NormalizeExistingIndex(previousIndex); + if (replaceIndex < 0 || !ReferenceEquals(_parents[replaceIndex].Source, previous)) + { + replaceIndex = FindParentIndex(previous); + } + + if (replaceIndex < 0) + { + AddParent(current, currentIndex, changes); + return; + } + + var existing = _parents[replaceIndex]; + var child = CreateChild(current); + var updated = new ParentItem(current, existing.Key, child); + _parents[replaceIndex] = updated; + + var destinationIndex = NormalizeReplacementIndex(currentIndex, replaceIndex); + if (destinationIndex != replaceIndex) + { + _parents.RemoveAt(replaceIndex); + _parents.Insert(destinationIndex, updated); + } + + changes.Add(new Change, int>(ChangeReason.Update, existing.Key, child, existing.Child, destinationIndex, replaceIndex)); + } + + /// + /// Executes the RemoveParents operation. + /// + /// The range value. + /// The changes value. + private void RemoveParents(RangeChange range, ChangeSet, int> changes) + { + if (range.Index >= 0) + { + for (var i = 0; i < range.Count; i++) + { + RemoveParentAt(range.Index, changes); + } + + return; + } + + foreach (var item in range) + { + RemoveParent(item, -1, changes); + } + } + + /// + /// Executes the RemoveParent operation. + /// + /// The item value. + /// The index value. + /// The changes value. + private void RemoveParent(TObject item, int index, ChangeSet, int> changes) + { + var removeIndex = NormalizeExistingIndex(index); + if (removeIndex < 0 || !ReferenceEquals(_parents[removeIndex].Source, item)) + { + removeIndex = FindParentIndex(item); + } + + if (removeIndex >= 0) + { + RemoveParentAt(removeIndex, changes); + } + } + + /// + /// Executes the RemoveParentAt operation. + /// + /// The index value. + /// The changes value. + private void RemoveParentAt(int index, ChangeSet, int> changes) + { + if (index < 0 || index >= _parents.Count) + { + return; + } + + var parent = _parents[index]; + _parents.RemoveAt(index); + changes.Add(new Change, int>(ChangeReason.Remove, parent.Key, parent.Child, index)); + } + + /// + /// Executes the RemoveAllParents operation. + /// + /// The changes value. + private void RemoveAllParents(ChangeSet, int> changes) + { + for (var i = _parents.Count - 1; i >= 0; i--) + { + RemoveParentAt(i, changes); + } + } + + /// + /// Executes the MoveParent operation. + /// + /// The item value. + /// The currentIndex value. + /// The previousIndex value. + private void MoveParent(TObject item, int currentIndex, int previousIndex) + { + var from = NormalizeExistingIndex(previousIndex); + if (from < 0 || !ReferenceEquals(_parents[from].Source, item)) + { + from = FindParentIndex(item); + } + + if (from < 0) + { + return; + } + + var parent = _parents[from]; + _parents.RemoveAt(from); + _parents.Insert(NormalizeAddIndex(currentIndex), parent); + } + + /// + /// Executes the FindParentIndex operation. + /// + /// The item value. + /// The result of the operation. + private int FindParentIndex(TObject item) + { + var comparer = EqualityComparer.Default; + for (var i = 0; i < _parents.Count; i++) + { + if (ReferenceEquals(_parents[i].Source, item) || comparer.Equals(_parents[i].Source, item)) { - changeTracker.EmitChanges(observer); - parentUpdate = false; - }) - .Subscribe(); + return i; + } + } + + return -1; + } + + /// + /// Executes the NormalizeAddIndex operation. + /// + /// The index value. + /// The result of the operation. + private int NormalizeAddIndex(int index) => index < 0 || index > _parents.Count ? _parents.Count : index; + + /// + /// Executes the NormalizeExistingIndex operation. + /// + /// The index value. + /// The result of the operation. + private int NormalizeExistingIndex(int index) => index >= 0 && index < _parents.Count ? index : -1; + + /// + /// Executes the NormalizeReplacementIndex operation. + /// + /// The index value. + /// The fallbackIndex value. + /// The result of the operation. + private int NormalizeReplacementIndex(int index, int fallbackIndex) => index >= 0 && index < _parents.Count ? index : fallbackIndex; + + /// + /// Executes the CreateChild operation. + /// + /// The item value. + /// The result of the operation. + private ClonedListChangeSet CreateChild(TObject item) => + new(MakeChildObservable(_selector(item).RemoveIndex()), _equalityComparer); - return new CompositeDisposable(shared.Connect(), subMergeMany, subRemove); - }); + /// + /// Stores a source item and its child container. + /// + /// The Source value. + /// The Key value. + /// The Child value. + private sealed record ParentItem(TObject Source, int Key, ClonedListChangeSet Child); + } } diff --git a/src/DynamicData/List/Internal/OnItemAdded.cs b/src/DynamicData/List/Internal/OnItemAdded.cs index c99b48d92..b61e05b9f 100644 --- a/src/DynamicData/List/Internal/OnItemAdded.cs +++ b/src/DynamicData/List/Internal/OnItemAdded.cs @@ -1,41 +1,54 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Reactive.Linq; - -namespace DynamicData.List.Internal; - -internal static class OnItemAdded - where T : notnull -{ - public static IObservable> Create( - IObservable> source, - Action addAction) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - addAction.ThrowArgumentNullExceptionIfNull(nameof(addAction)); - - return source.Do(changeSet => - { - foreach (var change in changeSet) - { - switch (change.Reason) - { - case ListChangeReason.Add: - addAction.Invoke(change.Item.Current); - break; - - case ListChangeReason.AddRange: - foreach (var item in change.Range) - addAction.Invoke(item); - break; - - case ListChangeReason.Replace: - addAction.Invoke(change.Item.Current); - break; - } - } - }); - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else + +namespace DynamicData.List.Internal; +#endif + +/// +/// Provides members for the OnItemAdded class. +/// +/// The type of the T value. +internal static class OnItemAdded + where T : notnull +{ + /// + /// Executes the Create operation. + /// + /// The source value. + /// The addAction value. + /// The result of the operation. + public static IObservable> Create( + IObservable> source, + Action addAction) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(addAction); + + return source.Do(changeSet => + { + foreach (var change in changeSet) + { + switch (change.Reason) + { + case ListChangeReason.Add: + addAction.Invoke(change.Item.Current); + break; + + case ListChangeReason.AddRange: + foreach (var item in change.Range) + addAction.Invoke(item); + break; + + case ListChangeReason.Replace: + addAction.Invoke(change.Item.Current); + break; + } + } + }); + } +} diff --git a/src/DynamicData/List/Internal/OnItemRefreshed.cs b/src/DynamicData/List/Internal/OnItemRefreshed.cs index f12e68294..89cf81bd2 100644 --- a/src/DynamicData/List/Internal/OnItemRefreshed.cs +++ b/src/DynamicData/List/Internal/OnItemRefreshed.cs @@ -1,28 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Reactive.Linq; - -namespace DynamicData.List.Internal; - -internal static class OnItemRefreshed - where T : notnull -{ - public static IObservable> Create( - IObservable> source, - Action refreshAction) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - refreshAction.ThrowArgumentNullExceptionIfNull(nameof(refreshAction)); - - return source.Do(changeSet => - { - foreach (var change in changeSet) - { - if (change.Reason is ListChangeReason.Refresh) - refreshAction.Invoke(change.Item.Current); - } - }); - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else + +namespace DynamicData.List.Internal; +#endif + +/// +/// Provides members for the OnItemRefreshed class. +/// +/// The type of the T value. +internal static class OnItemRefreshed + where T : notnull +{ + /// + /// Executes the Create operation. + /// + /// The source value. + /// The refreshAction value. + /// The result of the operation. + public static IObservable> Create( + IObservable> source, + Action refreshAction) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(refreshAction); + + return source.Do(changeSet => + { + foreach (var change in changeSet) + { + if (change.Reason is ListChangeReason.Refresh) + refreshAction.Invoke(change.Item.Current); + } + }); + } +} diff --git a/src/DynamicData/List/Internal/OnItemRemoved.cs b/src/DynamicData/List/Internal/OnItemRemoved.cs index 178066bf2..31582e3f4 100644 --- a/src/DynamicData/List/Internal/OnItemRemoved.cs +++ b/src/DynamicData/List/Internal/OnItemRemoved.cs @@ -1,59 +1,73 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Reactive.Linq; - -namespace DynamicData.List.Internal; - -internal static class OnItemRemoved - where T : notnull -{ - public static IObservable> Create( - IObservable> source, - Action removeAction, - bool invokeOnUnsubscribe) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - removeAction.ThrowArgumentNullExceptionIfNull(nameof(removeAction)); - - var removalProcessor = source.Do(changeSet => - { - foreach (var change in changeSet) - { - switch (change.Reason) - { - case ListChangeReason.Clear: - case ListChangeReason.RemoveRange: - foreach (var item in change.Range) - removeAction.Invoke(item); - break; - - case ListChangeReason.Remove: - removeAction.Invoke(change.Item.Current); - break; - - case ListChangeReason.Replace: - removeAction.Invoke(change.Item.Previous.Value); - break; - } - } - }); - - return invokeOnUnsubscribe - ? Observable.Create>(observer => - { - var items = new List(); - - return removalProcessor - .Do(changeSet => items.Clone(changeSet)) - .Finally(() => - { - foreach (var item in items) - removeAction.Invoke(item); - }) - .SubscribeSafe(observer); - }) - : removalProcessor; - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else + +namespace DynamicData.List.Internal; +#endif + +/// +/// Provides members for the OnItemRemoved class. +/// +/// The type of the T value. +internal static class OnItemRemoved + where T : notnull +{ + /// + /// Executes the Create operation. + /// + /// The source value. + /// The removeAction value. + /// The invokeOnUnsubscribe value. + /// The result of the operation. + public static IObservable> Create( + IObservable> source, + Action removeAction, + bool invokeOnUnsubscribe) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(removeAction); + + var removalProcessor = source.Do(changeSet => + { + foreach (var change in changeSet) + { + switch (change.Reason) + { + case ListChangeReason.Clear: + case ListChangeReason.RemoveRange: + foreach (var item in change.Range) + removeAction.Invoke(item); + break; + + case ListChangeReason.Remove: + removeAction.Invoke(change.Item.Current); + break; + + case ListChangeReason.Replace: + removeAction.Invoke(change.Item.Previous.Value); + break; + } + } + }); + + return invokeOnUnsubscribe + ? Observable.Create>(observer => + { + var items = new List(); + + return removalProcessor + .Do(changeSet => items.Clone(changeSet)) + .Finally(() => + { + foreach (var item in items) + removeAction.Invoke(item); + }) + .SubscribeSafe(observer); + }) + : removalProcessor; + } +} diff --git a/src/DynamicData/List/Internal/Pager.cs b/src/DynamicData/List/Internal/Pager.cs index bd3238d2a..31fc84987 100644 --- a/src/DynamicData/List/Internal/Pager.cs +++ b/src/DynamicData/List/Internal/Pager.cs @@ -1,23 +1,41 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the Pager class. +/// +/// The type of the T value. +/// The source value. +/// The requests value. internal sealed class Pager(IObservable> source, IObservable requests) where T : notnull { + /// + /// The _requests field. + /// private readonly IObservable _requests = requests ?? throw new ArgumentNullException(nameof(requests)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var all = new List(); var paged = new ChangeAwareList(); @@ -41,6 +59,12 @@ public IObservable> Run() => Observable.Create + /// Executes the CalculatePages operation. + /// + /// The all value. + /// The request value. + /// The result of the operation. private static int CalculatePages(ICollection all, IPageRequest? request) { if (request is null || request.Size >= all.Count || request.Size == 0) @@ -59,6 +83,13 @@ private static int CalculatePages(ICollection all, IPageRequest? request) return pages + 1; } + /// + /// Executes the CheckParametersAndPage operation. + /// + /// The all value. + /// The paged value. + /// The request value. + /// The result of the operation. private static PageChangeSet? CheckParametersAndPage(List all, ChangeAwareList paged, IPageRequest? request) { if (request is null || request.Page < 0 || request.Size < 1) @@ -69,6 +100,14 @@ private static int CalculatePages(ICollection all, IPageRequest? request) return Page(all, paged, request); } + /// + /// Executes the Page operation. + /// + /// The all value. + /// The paged value. + /// The request value. + /// The changeSet value. + /// The result of the operation. private static PageChangeSet Page(List all, ChangeAwareList paged, IPageRequest request, IChangeSet? changeSet = null) { if (changeSet is not null) diff --git a/src/DynamicData/List/Internal/QueryWhenChanged.cs b/src/DynamicData/List/Internal/QueryWhenChanged.cs index ef58d4925..204e5c75f 100644 --- a/src/DynamicData/List/Internal/QueryWhenChanged.cs +++ b/src/DynamicData/List/Internal/QueryWhenChanged.cs @@ -1,16 +1,31 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the QueryWhenChanged class. +/// +/// The type of the T value. +/// The source value. internal sealed class QueryWhenChanged(IObservable> source) where T : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { var list = new List(); diff --git a/src/DynamicData/List/Internal/ReaderWriter.cs b/src/DynamicData/List/Internal/ReaderWriter.cs index 57b413867..a41d34677 100644 --- a/src/DynamicData/List/Internal/ReaderWriter.cs +++ b/src/DynamicData/List/Internal/ReaderWriter.cs @@ -1,22 +1,39 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ReaderWriter class. +/// +/// The type of the T value. internal sealed class ReaderWriter where T : notnull { -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + /// + /// The _data field. + /// private ChangeAwareList _data = new(); + /// + /// The _updateInProgress field. + /// private bool _updateInProgress; + /// + /// Gets the Count value. + /// public int Count { get @@ -28,6 +45,9 @@ public int Count } } + /// + /// Gets the Items value. + /// public T[] Items { get @@ -41,9 +61,14 @@ public T[] Items } } + /// + /// Executes the Write operation. + /// + /// The changes value. + /// The result of the operation. public IChangeSet Write(IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); IChangeSet result; @@ -56,9 +81,14 @@ public IChangeSet Write(IChangeSet changes) return result; } + /// + /// Executes the Write operation. + /// + /// The updateAction value. + /// The result of the operation. public IChangeSet Write(Action> updateAction) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); IChangeSet result; @@ -82,7 +112,7 @@ public IChangeSet Write(Action> updateAction) /// The action to perform on the list. public void WriteNested(Action> updateAction) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); lock (_locker) { @@ -95,10 +125,16 @@ public void WriteNested(Action> updateAction) } } + /// + /// Executes the WriteWithPreview operation. + /// + /// The updateAction value. + /// The previewHandler value. + /// The result of the operation. public IChangeSet WriteWithPreview(Action> updateAction, Action> previewHandler) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); - previewHandler.ThrowArgumentNullExceptionIfNull(nameof(previewHandler)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); + ArgumentExceptionHelper.ThrowIfNull(previewHandler); IChangeSet result; diff --git a/src/DynamicData/List/Internal/RefCount.cs b/src/DynamicData/List/Internal/RefCount.cs index b40036c3e..8333c9dc7 100644 --- a/src/DynamicData/List/Internal/RefCount.cs +++ b/src/DynamicData/List/Internal/RefCount.cs @@ -1,24 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the RefCount class. +/// +/// The type of the T value. +/// The source value. internal sealed class RefCount(IObservable> source) where T : notnull { -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + + /// + /// The _list field. + /// private IObservableList? _list; + /// + /// The _refCount field. + /// private int _refCount; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/List/Internal/ReferenceCountTracker.cs b/src/DynamicData/List/Internal/ReferenceCountTracker.cs index 6959b83eb..4b416e95b 100644 --- a/src/DynamicData/List/Internal/ReferenceCountTracker.cs +++ b/src/DynamicData/List/Internal/ReferenceCountTracker.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif /// /// Ripped and adapted from https://clinq.codeplex.com/. @@ -12,19 +17,30 @@ namespace DynamicData.List.Internal; internal sealed class ReferenceCountTracker where T : notnull { + /// + /// Gets the Items value. + /// public IEnumerable Items => ReferenceCounts.Keys; + /// + /// Gets the ReferenceCounts value. + /// private Dictionary ReferenceCounts { get; } = []; + /// + /// Gets or sets the indexed value. + /// + /// The item value. public int this[T item] => ReferenceCounts[item]; /// /// Increments the reference count for the item. Returns true when reference count goes from 0 to 1. /// /// The item to add. + /// The result of the operation. public bool Add(T item) { - item.ThrowArgumentNullExceptionIfNull(nameof(item)); + ArgumentExceptionHelper.ThrowIfNull(item); if (!ReferenceCounts.TryGetValue(item, out var currentCount)) { @@ -36,17 +52,26 @@ public bool Add(T item) return false; } + /// + /// Executes the Clear operation. + /// public void Clear() => ReferenceCounts.Clear(); + /// + /// Executes the Contains operation. + /// + /// The item value. + /// The result of the operation. public bool Contains(T item) => ReferenceCounts.ContainsKey(item); /// /// Decrements the reference count for the item. Returns true when reference count goes from 1 to 0. /// /// The item to remove. + /// The result of the operation. public bool Remove(T item) { - item.ThrowArgumentNullExceptionIfNull(nameof(item)); + ArgumentExceptionHelper.ThrowIfNull(item); var currentCount = ReferenceCounts[item]; diff --git a/src/DynamicData/List/Internal/Sort.cs b/src/DynamicData/List/Internal/Sort.cs index ff03e2e70..ade3e7f59 100644 --- a/src/DynamicData/List/Internal/Sort.cs +++ b/src/DynamicData/List/Internal/Sort.cs @@ -1,25 +1,55 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the Sort class. +/// +/// The type of the T value. +/// The source value. +/// The comparer value. +/// The sortOptions value. +/// The resort value. +/// The comparerObservable value. +/// The resetThreshold value. internal sealed class Sort(IObservable> source, IComparer? comparer, SortOptions sortOptions, IObservable? resort, IObservable>? comparerObservable, int resetThreshold) where T : notnull { + /// + /// The _comparerObservable field. + /// private readonly IObservable> _comparerObservable = comparerObservable ?? Observable.Never>(); + + /// + /// The _resort field. + /// private readonly IObservable _resort = resort ?? Observable.Never(); + + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _comparer field. + /// private IComparer _comparer = comparer ?? Comparer.Default; + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var original = new List(); var target = new ChangeAwareList(); @@ -39,6 +69,12 @@ public IObservable> Run() => Observable.Create>( return changeComparer.Merge(resortSync).Merge(dataChanged).Where(changes => changes.Count != 0).SubscribeSafe(observer); }); + /// + /// Executes the ChangeComparer operation. + /// + /// The target value. + /// The comparer value. + /// The result of the operation. private IChangeSet ChangeComparer(ChangeAwareList target, IComparer comparer) { _comparer = comparer; @@ -53,6 +89,12 @@ private IChangeSet ChangeComparer(ChangeAwareList target, IComparer com return target.CaptureChanges(); } + /// + /// Executes the GetCurrentPosition operation. + /// + /// The target value. + /// The item value. + /// The result of the operation. private int GetCurrentPosition(ChangeAwareList target, T item) { var index = sortOptions == SortOptions.UseBinarySearch ? target.BinarySearch(item, _comparer) : target.IndexOf(item); @@ -65,8 +107,20 @@ private int GetCurrentPosition(ChangeAwareList target, T item) return index; } + /// + /// Executes the GetInsertPosition operation. + /// + /// The target value. + /// The item value. + /// The result of the operation. private int GetInsertPosition(ChangeAwareList target, T item) => sortOptions == SortOptions.UseBinarySearch ? GetInsertPositionBinary(target, item) : GetInsertPositionLinear(target, item); + /// + /// Executes the GetInsertPositionBinary operation. + /// + /// The target value. + /// The item value. + /// The result of the operation. private int GetInsertPositionBinary(ChangeAwareList target, T item) { var index = target.BinarySearch(item, _comparer); @@ -81,6 +135,12 @@ private int GetInsertPositionBinary(ChangeAwareList target, T item) return insertIndex; } + /// + /// Executes the GetInsertPositionLinear operation. + /// + /// The target value. + /// The item value. + /// The result of the operation. private int GetInsertPositionLinear(ChangeAwareList target, T item) { for (var i = 0; i < target.Count; i++) @@ -94,12 +154,23 @@ private int GetInsertPositionLinear(ChangeAwareList target, T item) return target.Count; } + /// + /// Executes the Insert operation. + /// + /// The target value. + /// The item value. private void Insert(ChangeAwareList target, T item) { var index = GetInsertPosition(target, item); target.Insert(index, item); } + /// + /// Executes the Process operation. + /// + /// The target value. + /// The changes value. + /// The result of the operation. private IChangeSet Process(ChangeAwareList target, IChangeSet changes) { // if all removes and not Clear, then more efficient to try clear range @@ -113,6 +184,12 @@ private IChangeSet Process(ChangeAwareList target, IChangeSet changes) return ProcessImpl(target, changes); } + /// + /// Executes the ProcessImpl operation. + /// + /// The target value. + /// The changes value. + /// The result of the operation. private IChangeSet ProcessImpl(ChangeAwareList target, IChangeSet changes) { var refreshes = new List(changes.Refreshes); @@ -214,12 +291,22 @@ private IChangeSet ProcessImpl(ChangeAwareList target, IChangeSet chang return target.CaptureChanges(); } + /// + /// Executes the Remove operation. + /// + /// The target value. + /// The item value. private void Remove(ChangeAwareList target, T item) { var index = GetCurrentPosition(target, item); target.RemoveAt(index); } + /// + /// Executes the Reorder operation. + /// + /// The target value. + /// The result of the operation. private IChangeSet Reorder(ChangeAwareList target) { var index = -1; @@ -243,6 +330,12 @@ private IChangeSet Reorder(ChangeAwareList target) return target.CaptureChanges(); } + /// + /// Executes the Reset operation. + /// + /// The original value. + /// The target value. + /// The result of the operation. private IChangeSet Reset(List original, ChangeAwareList target) { var sorted = original.OrderBy(t => t, _comparer).ToList(); diff --git a/src/DynamicData/List/Internal/SubscribeMany.cs b/src/DynamicData/List/Internal/SubscribeMany.cs index 75075b04e..7ff5c1a71 100644 --- a/src/DynamicData/List/Internal/SubscribeMany.cs +++ b/src/DynamicData/List/Internal/SubscribeMany.cs @@ -1,20 +1,37 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the SubscribeMany class. +/// +/// The type of the T value. +/// The source value. +/// The subscriptionFactory value. internal sealed class SubscribeMany(IObservable> source, Func subscriptionFactory) where T : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _subscriptionFactory field. + /// private readonly Func _subscriptionFactory = subscriptionFactory ?? throw new ArgumentNullException(nameof(subscriptionFactory)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/List/Internal/Switch.cs b/src/DynamicData/List/Internal/Switch.cs index dcd20c283..0f6ba0d05 100644 --- a/src/DynamicData/List/Internal/Switch.cs +++ b/src/DynamicData/List/Internal/Switch.cs @@ -1,17 +1,31 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Switch class. +/// +/// The type of the T value. +/// The sources value. internal sealed class Switch(IObservable>> sources) where T : notnull { + /// + /// The _sources field. + /// private readonly IObservable>> _sources = sources ?? throw new ArgumentNullException(nameof(sources)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -31,7 +45,7 @@ public IObservable> Run() => Observable.Create>( var isSourceRunning = false; var areSourcesComplete = false; - var outer = _sources.SubscribeSafe( + var outer = _sources.SubscribeSafe(Observer.Create>>( source => { int id; @@ -50,7 +64,14 @@ public IObservable> Run() => Observable.Create>( // Subscribed outside the lock. The source may deliver synchronously, and that // delivery takes the lock for itself. - subscription.Disposable = source.SubscribeSafe( + if (id != Volatile.Read(ref active)) + { + return; + } + + var innerSubscription = new SingleAssignmentDisposable(); + subscription.Disposable = innerSubscription; + innerSubscription.Disposable = source.SubscribeSafe(Observer.Create>( changes => { using var scope = queue.AcquireLock(); @@ -93,7 +114,7 @@ public IObservable> Run() => Observable.Create>( { scope.EnqueueCompleted(); } - }); + })); }, queue.OnError, () => @@ -107,7 +128,7 @@ public IObservable> Run() => Observable.Create>( { scope.EnqueueCompleted(); } - }); + })); // Disposal order matters and CompositeDisposable does not specify one. The queue goes first // so that any delivery in flight is finished before the subscriptions feeding it are torn down. diff --git a/src/DynamicData/List/Internal/ToObservableChangeSet.cs b/src/DynamicData/List/Internal/ToObservableChangeSet.cs index 8d1f853d2..e9514a413 100644 --- a/src/DynamicData/List/Internal/ToObservableChangeSet.cs +++ b/src/DynamicData/List/Internal/ToObservableChangeSet.cs @@ -1,25 +1,36 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; - -using DynamicData.Internal; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the ToObservableChangeSet class. +/// +/// The type of the TObject value. internal static class ToObservableChangeSet where TObject : notnull { + /// + /// Executes the Create operation. + /// + /// The source value. + /// The expireAfter value. + /// The limitSizeTo value. + /// The scheduler value. + /// The result of the operation. public static IObservable> Create( IObservable source, Func? expireAfter, int limitSizeTo, IScheduler? scheduler) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>(downstreamObserver => { @@ -39,13 +50,21 @@ public static IObservable> Create( }); } + /// + /// Executes the Create operation. + /// + /// The source value. + /// The expireAfter value. + /// The limitSizeTo value. + /// The scheduler value. + /// The result of the operation. public static IObservable> Create( IObservable> source, Func? expireAfter, int limitSizeTo, IScheduler? scheduler) { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return Observable.Create>(downstreamObserver => new Subscription( downstreamObserver: downstreamObserver, @@ -55,26 +74,75 @@ public static IObservable> Create( source: source)); } - private sealed class Subscription +/// +/// Provides members for the Subscription class. +/// +private sealed class Subscription : IDisposable { + /// + /// The _downstreamItems field. + /// private readonly ChangeAwareList _downstreamItems; + + /// + /// The _downstreamObserver field. + /// private readonly IObserver> _downstreamObserver; + + /// + /// The _expireAfter field. + /// private readonly Func? _expireAfter; + + /// + /// The _expirationQueue field. + /// private readonly List _expirationQueue; + + /// + /// The _limitSizeTo field. + /// private readonly int _limitSizeTo; + + /// + /// The _scheduler field. + /// private readonly IScheduler _scheduler; + + /// + /// The _sourceSubscription field. + /// private readonly IDisposable _sourceSubscription; - #if NET9_0_OR_GREATER + + /// + /// The _synchronizationGate field. + /// private readonly Lock _synchronizationGate; - #else - private readonly object _synchronizationGate; - #endif + /// + /// The _hasInitialized field. + /// private bool _hasInitialized; + + /// + /// The _hasSourceCompleted field. + /// private bool _hasSourceCompleted; + + /// + /// The _scheduledExpiration field. + /// private ScheduledExpiration? _scheduledExpiration; + /// + /// Initializes a new instance of the class. + /// + /// The downstreamObserver value. + /// The expireAfter value. + /// The limitSizeTo value. + /// The scheduler value. + /// The source value. public Subscription( IObserver> downstreamObserver, Func? expireAfter, @@ -90,7 +158,8 @@ public Subscription( _scheduler = scheduler ?? GlobalConfig.DefaultScheduler; _synchronizationGate = new(); - _sourceSubscription = source.SubscribeSafe( + _sourceSubscription = PrimitivesLinqExtensions.SubscribeSafe( + source, onNext: OnSourceNext, onError: downstreamObserver.OnError, onCompleted: OnSourceCompleted); @@ -104,12 +173,20 @@ public Subscription( } } + /// + /// Executes the Dispose operation. + /// public void Dispose() { _sourceSubscription.Dispose(); _scheduledExpiration?.Cancellation.Dispose(); } + /// + /// Executes the OnScheduledExpirationInvoked operation. + /// + /// The intendedExpiration value. + /// The result of the operation. private IDisposable OnScheduledExpirationInvoked(Expiration intendedExpiration) { try @@ -171,6 +248,10 @@ private IDisposable OnScheduledExpirationInvoked(Expiration intendedExpiration) return Disposable.Empty; } + /// + /// Executes the OnSourceNext operation. + /// + /// The upstreamItems value. private void OnSourceNext(IEnumerable upstreamItems) { try @@ -183,10 +264,9 @@ private void OnSourceNext(IEnumerable upstreamItems) foreach (var item in upstreamItems) { - if (_limitSizeTo >= 0) + while (_limitSizeTo >= 0 && _downstreamItems.Count >= _limitSizeTo) { - while (_downstreamItems.Count >= _limitSizeTo) - _downstreamItems.RemoveAt(0); + _downstreamItems.RemoveAt(0); // Update indexes within the expiration queue, to keep them in-sync with _downstreamItems for (var i = 0; i < _expirationQueue.Count;) @@ -268,6 +348,9 @@ private void OnSourceNext(IEnumerable upstreamItems) } } + /// + /// Executes the OnSourceCompleted operation. + /// private void OnSourceCompleted() { lock (_synchronizationGate) @@ -277,13 +360,18 @@ private void OnSourceCompleted() TryPublishCompletion(); } } - // This method must NOT be invoked under the umbrella of _synchronizationGate, // as some IScheduler implementations perform locking internally, which can result in deadlocking if we invoke the scheduler within our own lock. // // Additionally, some IScheduler implementations can invoke actions synchronously, // so it's important that scheduler invocation is only performed AFTER downstream changes have been processed. // Otherwise, downstream notifications can end up published out-of-order. + + /// + /// Executes the FinishSchedulingExpiration operation. + /// + /// The unfinishedExpiration value. + /// The scheduler value. private void FinishSchedulingExpiration( ScheduledExpiration unfinishedExpiration, IScheduler scheduler) @@ -303,6 +391,9 @@ private void FinishSchedulingExpiration( return Disposable.Empty; }); + /// + /// Executes the TryPublishCompletion operation. + /// private void TryPublishCompletion() { // There needs to be no possibility of a new changeset being emitted before we can call the stream complete. @@ -310,6 +401,9 @@ private void TryPublishCompletion() _downstreamObserver.OnCompleted(); } + /// + /// Executes the TryPublishDownstreamChanges operation. + /// private void TryPublishDownstreamChanges() { var downstreamChanges = _downstreamItems.CaptureChanges(); @@ -321,6 +415,10 @@ private void TryPublishDownstreamChanges() } } + /// + /// Executes the TryBeginSchedulingExpiration operation. + /// + /// The result of the operation. private ScheduledExpiration? TryBeginSchedulingExpiration() { // If there's no expirations currently queued up, we don't need to schedule anything. @@ -346,20 +444,43 @@ private void TryPublishDownstreamChanges() } } - private readonly struct ScheduledExpiration +/// +/// Represents the ScheduledExpiration value. +/// +private readonly struct ScheduledExpiration { + /// + /// Gets or sets the Cancellation value. + /// public required SingleAssignmentDisposable Cancellation { get; init; } + /// + /// Gets or sets the Expiration value. + /// public required Expiration Expiration { get; init; } } - private readonly record struct Expiration +/// +/// Represents the Expiration record. +/// +private readonly record struct Expiration : IComparable { + /// + /// Gets or sets the ExpireAt value. + /// public required DateTimeOffset ExpireAt { get; init; } + /// + /// Gets or sets the Index value. + /// public required int Index { get; init; } + /// + /// Executes the CompareTo operation. + /// + /// The other value. + /// The result of the operation. public int CompareTo(Expiration other) => ExpireAt.CompareTo(other.ExpireAt); } diff --git a/src/DynamicData/List/Internal/TransformAsync.cs b/src/DynamicData/List/Internal/TransformAsync.cs index 31f45b1a4..507e6c9ab 100644 --- a/src/DynamicData/List/Internal/TransformAsync.cs +++ b/src/DynamicData/List/Internal/TransformAsync.cs @@ -1,26 +1,50 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the TransformAsync class. +/// +/// The type of the TSource value. +/// The type of the TDestination value. internal sealed class TransformAsync where TSource : notnull where TDestination : notnull { - private readonly Func, int, CancellationToken, Task.TransformedItemContainer>> _containerFactory; + /// + /// The _containerFactory field. + /// + private readonly Func, int, CancellationToken, Task.TransformedItemContainer>> _containerFactory; + /// + /// The _source field. + /// private readonly IObservable> _source; + + /// + /// The _transformOnRefresh field. + /// private readonly bool _transformOnRefresh; + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The factory value. + /// The transformOnRefresh value. public TransformAsync( IObservable> source, - Func, int, CancellationToken, Task> factory, + Func, int, CancellationToken, Task> factory, bool transformOnRefresh) { - factory.ThrowArgumentNullExceptionIfNull(nameof(factory)); + ArgumentExceptionHelper.ThrowIfNull(factory); _source = source ?? throw new ArgumentNullException(nameof(source)); _transformOnRefresh = transformOnRefresh; @@ -31,8 +55,16 @@ public TransformAsync( }; } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Defer(RunImpl); + /// + /// Executes the RunImpl operation. + /// + /// The result of the operation. private IObservable> RunImpl() { return Observable.Using( @@ -50,13 +82,13 @@ private IObservable> RunImpl() } catch (Exception e) when (e is ObjectDisposedException) { - return Optional.None.TransformedItemContainer>>(); + return ReactiveUI.Primitives.Optional.TransformedItemContainer>>.None; } try { await Transform(state, changes, cancel); - return Optional.Some(state); + return new ReactiveUI.Primitives.Optional.TransformedItemContainer>>(state); } finally { @@ -84,12 +116,19 @@ private IObservable> RunImpl() }); } + /// + /// Executes the Transform operation. + /// + /// The transformed value. + /// The changes value. + /// Cancels the asynchronous item transformation. + /// The result of the operation. private async Task Transform( ChangeAwareList.TransformedItemContainer> transformed, IChangeSet changes, CancellationToken cancel) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); foreach (var item in changes) { @@ -103,7 +142,7 @@ private async Task Transform( var container = await _containerFactory( item.Item.Current, - Optional.None, + ReactiveUI.Primitives.Optional.None, transformed.Count, cancel).ConfigureAwait(false); transformed.Add(container); @@ -113,7 +152,7 @@ await _containerFactory( var container = await _containerFactory( item.Item.Current, - Optional.None, + ReactiveUI.Primitives.Optional.None, change.CurrentIndex, cancel).ConfigureAwait(false); transformed.Insert(change.CurrentIndex, container); @@ -125,7 +164,7 @@ await _containerFactory( case ListChangeReason.AddRange: { var startIndex = item.Range.Index < 0 ? transformed.Count : item.Range.Index; - var tasks = item.Range.Select((t, idx) => _containerFactory(t, Optional.None, idx + startIndex, cancel)); + var tasks = item.Range.Select((t, idx) => _containerFactory(t, ReactiveUI.Primitives.Optional.None, idx + startIndex, cancel)); var containers = await Task.WhenAll(tasks).ConfigureAwait(false); transformed.AddOrInsertRange(containers, item.Range.Index); break; @@ -136,7 +175,7 @@ await _containerFactory( var change = item.Item; if (_transformOnRefresh) { - Optional previous = transformed[change.CurrentIndex].Destination; + ReactiveUI.Primitives.Optional previous = transformed[change.CurrentIndex].Destination; var container = await _containerFactory(change.Current, previous, change.CurrentIndex, cancel) .ConfigureAwait(false); transformed[change.CurrentIndex] = container; @@ -153,7 +192,7 @@ await _containerFactory( { var change = item.Item; - Optional previous = transformed[change.PreviousIndex].Destination; + ReactiveUI.Primitives.Optional previous = transformed[change.PreviousIndex].Destination; if (change.CurrentIndex == change.PreviousIndex) { transformed[change.CurrentIndex] = await _containerFactory(change.Current, previous, change.CurrentIndex, cancel); @@ -161,7 +200,7 @@ await _containerFactory( else { transformed.RemoveAt(change.PreviousIndex); - transformed.Insert(change.CurrentIndex, await _containerFactory(change.Current, Optional.None, change.CurrentIndex, cancel)); + transformed.Insert(change.CurrentIndex, await _containerFactory(change.Current, ReactiveUI.Primitives.Optional.None, change.CurrentIndex, cancel)); } break; @@ -178,7 +217,7 @@ await _containerFactory( } else { - var toRemove = transformed.FirstOrDefault(t => ReferenceEquals(t.Source, t)); + var toRemove = transformed.FirstOrDefault(t => ReferenceEquals(t.Source, change.Current)); if (toRemove is not null) { @@ -197,7 +236,7 @@ await _containerFactory( } else { - var toRemove = transformed.Where(t => ReferenceEquals(t.Source, t)).ToArray(); + var toRemove = transformed.Where(t => item.Range.Any(current => ReferenceEquals(t.Source, current))).ToArray(); transformed.RemoveMany(toRemove); } diff --git a/src/DynamicData/List/Internal/TransformMany.cs b/src/DynamicData/List/Internal/TransformMany.cs index d7bb2a69e..c65b6c9fc 100644 --- a/src/DynamicData/List/Internal/TransformMany.cs +++ b/src/DynamicData/List/Internal/TransformMany.cs @@ -1,238 +1,325 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Collections; -using System.Collections.ObjectModel; -using System.Reactive.Disposables; -using System.Reactive.Linq; - -using DynamicData.Binding; - -namespace DynamicData.List.Internal; - -internal sealed class TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null, Func>>? childChanges = null) - where TSource : notnull - where TDestination : notnull -{ - private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; - private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); - - public TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) - : this( - source, - manySelector, - equalityComparer, - t => Observable.Defer( - () => - { - var subsequentChanges = manySelector(t).ToObservableChangeSet(); - - if (manySelector(t).Count > 0) - { - return subsequentChanges; - } - - return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); - })) - { - } - - public TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) - : this( - source, - manySelector, - equalityComparer, - t => Observable.Defer( - () => - { - var subsequentChanges = manySelector(t).ToObservableChangeSet(); - - if (manySelector(t).Count > 0) - { - return subsequentChanges; - } - - return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); - })) - { - } - - public TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) - : this( - source, - s => new ManySelectorFunc(s, x => manySelector(x).Items), - equalityComparer, - t => Observable.Defer( - () => - { - var subsequentChanges = manySelector(t).Connect(); - - if (manySelector(t).Count > 0) - { - return subsequentChanges; - } - - return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); - })) - { - } - - public IObservable> Run() - { - if (childChanges is not null) - { - return CreateWithChangeSet(); - } - - return Observable.Create>( - observer => - { - // NB: ChangeAwareList is used internally by dd to capture changes to a list and ensure they can be replayed by subsequent operators - var result = new ChangeAwareList(); - - return _source.Transform(item => new ManyContainer(manySelector(item).ToArray()), true).Select( - changes => - { - var destinationChanges = new DestinationEnumerator(changes, _equalityComparer); - result.Clone(destinationChanges, _equalityComparer); - return result.CaptureChanges(); - }).NotEmpty().SubscribeSafe(observer); - }); - } - - private IObservable> CreateWithChangeSet() - { - if (childChanges is null) - { - throw new InvalidOperationException("_childChanges must not be null."); - } - - return Observable.Create>( - observer => - { - var result = new ChangeAwareList(); - - var transformed = _source.Transform( - t => - { - var locker = InternalEx.NewLock(); - var collection = manySelector(t); - var changes = childChanges(t).Synchronize(locker).Skip(1); - return new ManyContainer(collection, changes); - }).Publish(); - - var outerLock = new object(); - var initial = transformed.Synchronize(outerLock).Select(changes => new ChangeSet(new DestinationEnumerator(changes, _equalityComparer))); - - var subsequent = transformed.MergeMany(x => x.Changes).Synchronize(outerLock); - - var init = initial.Select( - changes => - { - result.Clone(changes, _equalityComparer); - return result.CaptureChanges(); - }); - - var subsequentSelection = subsequent.RemoveIndex().Select( - changes => - { - result.Clone(changes, _equalityComparer); - return result.CaptureChanges(); - }); - - var allChanges = init.Merge(subsequentSelection); - - return new CompositeDisposable(allChanges.SubscribeSafe(observer), transformed.Connect()); - }); - } - - // make this an instance - private sealed class DestinationEnumerator(IChangeSet changes, IEqualityComparer equalityComparer) : IEnumerable> - { - public IEnumerator> GetEnumerator() - { - foreach (var change in changes) - { - switch (change.Reason) - { - case ListChangeReason.Add: - case ListChangeReason.Remove: - foreach (var destination in change.Item.Current.Destination) - { - yield return new Change(change.Reason, destination); - } - - break; - - case ListChangeReason.AddRange: - case ListChangeReason.Clear: - { - var items = change.Range.SelectMany(m => m.Destination); - yield return new Change(change.Reason, items); - } - - break; - - case ListChangeReason.Replace: - case ListChangeReason.Refresh: - { - // this is difficult as we need to discover adds and removes (and perhaps replaced) - var currentItems = change.Item.Current.Destination.AsArray(); - var previousItems = change.Item.Previous.Value.Destination.AsArray(); - - var adds = currentItems.Except(previousItems, equalityComparer); - - // I am not sure whether it is possible to translate the original change into a replace - foreach (var destination in previousItems.Except(currentItems, equalityComparer)) - { - yield return new Change(ListChangeReason.Remove, destination); - } - - foreach (var destination in adds) - { - yield return new Change(ListChangeReason.Add, destination); - } - } - - break; - - case ListChangeReason.RemoveRange: - { - foreach (var destination in change.Range.SelectMany(m => m.Destination)) - { - yield return new Change(ListChangeReason.Remove, destination); - } - } - - break; - - case ListChangeReason.Moved: - // do nothing as the original index has no bearing on the destination index - break; - - default: - throw new IndexOutOfRangeException("Unknown list reason " + change); - } - } - } - - IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - } - - private sealed class ManyContainer(IEnumerable destination, IObservable>? changes = null) - { - public IObservable> Changes { get; } = changes ?? Observable.Empty>(); - - public IEnumerable Destination { get; } = destination; - } - - private sealed class ManySelectorFunc(TSource source, Func> selector) : IEnumerable - { - private readonly Func> _selector = selector ?? throw new ArgumentNullException(nameof(selector)); - - public IEnumerator GetEnumerator() => _selector(source).GetEnumerator(); - - IEnumerator IEnumerable.GetEnumerator() => _selector(source).GetEnumerator(); - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else + +using DynamicData.Binding; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else + +namespace DynamicData.List.Internal; +#endif + +/// +/// Provides members for the TransformMany class. +/// +/// The type of the TSource value. +/// The type of the TDestination value. +/// The source value. +/// The manySelector value. +/// The equalityComparer value. +/// The childChanges value. +internal sealed class TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null, Func>>? childChanges = null) + where TSource : notnull + where TDestination : notnull +{ + /// + /// The _equalityComparer field. + /// + private readonly IEqualityComparer _equalityComparer = equalityComparer ?? EqualityComparer.Default; + + /// + /// The _source field. + /// + private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + public TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) + : this( + source, + manySelector, + equalityComparer, + t => Observable.Defer( + () => + { + var subsequentChanges = manySelector(t).ToObservableChangeSet(); + + if (manySelector(t).Count > 0) + { + return subsequentChanges; + } + + return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); + })) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + public TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) + : this( + source, + manySelector, + equalityComparer, + t => Observable.Defer( + () => + { + var subsequentChanges = manySelector(t).ToObservableChangeSet(); + + if (manySelector(t).Count > 0) + { + return subsequentChanges; + } + + return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); + })) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + public TransformMany(IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) + : this( + source, + s => new ManySelectorFunc(s, x => manySelector(x).Items), + equalityComparer, + t => Observable.Defer( + () => + { + var subsequentChanges = manySelector(t).Connect(); + + if (manySelector(t).Count > 0) + { + return subsequentChanges; + } + + return Observable.Return(ChangeSet.Empty).Concat(subsequentChanges); + })) + { + } + + /// + /// Executes the Run operation. + /// + /// The result of the operation. + public IObservable> Run() + { + if (childChanges is not null) + { + return CreateWithChangeSet(); + } + + return Observable.Create>( + observer => + { + // NB: ChangeAwareList is used internally by dd to capture changes to a list and ensure they can be replayed by subsequent operators + var result = new ChangeAwareList(); + + return _source.Transform(item => new ManyContainer(manySelector(item).ToArray()), true).Select( + changes => + { + var destinationChanges = new DestinationEnumerator(changes, _equalityComparer); + result.Clone(destinationChanges, _equalityComparer); + return result.CaptureChanges(); + }).NotEmpty().SubscribeSafe(observer); + }); + } + + /// + /// Executes the CreateWithChangeSet operation. + /// + /// The result of the operation. + private IObservable> CreateWithChangeSet() + { + if (childChanges is null) + { + throw new InvalidOperationException("_childChanges must not be null."); + } + + return Observable.Create>( + observer => + { + var result = new ChangeAwareList(); + + var transformed = _source.Transform( + t => + { + var locker = InternalEx.NewMonitorGate(); + var collection = manySelector(t); + var changes = childChanges(t).Synchronize(locker).Skip(1); + return new ManyContainer(collection, changes); + }).Publish(); + + var outerLock = InternalEx.NewMonitorGate(); + var initial = transformed.Synchronize(outerLock).Select(changes => new ChangeSet(new DestinationEnumerator(changes, _equalityComparer))); + + var subsequent = transformed.MergeMany(x => x.Changes).Synchronize(outerLock); + + var init = initial.Select( + changes => + { + result.Clone(changes, _equalityComparer); + return result.CaptureChanges(); + }); + + var subsequentSelection = subsequent.RemoveIndex().Select( + changes => + { + result.Clone(changes, _equalityComparer); + return result.CaptureChanges(); + }); + + var allChanges = init.Merge(subsequentSelection); + + return new CompositeDisposable(allChanges.SubscribeSafe(observer), transformed.Connect()); + }); + } + // make this an instance + + /// + /// Provides members for the DestinationEnumerator class. + /// + /// The changes value. + /// The equalityComparer value. + private sealed class DestinationEnumerator(IChangeSet changes, IEqualityComparer equalityComparer) : IEnumerable> + { + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. + public IEnumerator> GetEnumerator() + { + foreach (var change in changes) + { + switch (change.Reason) + { + case ListChangeReason.Add: + case ListChangeReason.Remove: + foreach (var destination in change.Item.Current.Destination) + { + yield return new Change(change.Reason, destination); + } + + break; + + case ListChangeReason.AddRange: + case ListChangeReason.Clear: + { + var items = change.Range.SelectMany(m => m.Destination); + yield return new Change(change.Reason, items); + } + + break; + + case ListChangeReason.Replace: + case ListChangeReason.Refresh: + { + // this is difficult as we need to discover adds and removes (and perhaps replaced) + var currentItems = change.Item.Current.Destination.AsArray(); + var previousItems = change.Item.Previous.Value.Destination.AsArray(); + + var adds = currentItems.Except(previousItems, equalityComparer); + + // I am not sure whether it is possible to translate the original change into a replace + foreach (var destination in previousItems.Except(currentItems, equalityComparer)) + { + yield return new Change(ListChangeReason.Remove, destination); + } + + foreach (var destination in adds) + { + yield return new Change(ListChangeReason.Add, destination); + } + } + + break; + + case ListChangeReason.RemoveRange: + { + foreach (var destination in change.Range.SelectMany(m => m.Destination)) + { + yield return new Change(ListChangeReason.Remove, destination); + } + } + + break; + + case ListChangeReason.Moved: + // do nothing as the original index has no bearing on the destination index + break; + + default: + throw new IndexOutOfRangeException("Unknown list reason " + change); + } + } + } + + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); + } + + /// + /// Provides members for the ManyContainer class. + /// + /// The destination value. + /// The changes value. + private sealed class ManyContainer(IEnumerable destination, IObservable>? changes = null) + { + /// + /// Gets the Changes value. + /// + public IObservable> Changes { get; } = changes ?? Observable.Empty>(); + + /// + /// Gets the Destination value. + /// + public IEnumerable Destination { get; } = destination; + } + + /// + /// Provides members for the ManySelectorFunc class. + /// + /// The source value. + /// The selector value. + private sealed class ManySelectorFunc(TSource source, Func> selector) : IEnumerable + { + /// + /// The _selector field. + /// + private readonly Func> _selector = selector ?? throw new ArgumentNullException(nameof(selector)); + + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. + public IEnumerator GetEnumerator() => _selector(source).GetEnumerator(); + + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. + IEnumerator IEnumerable.GetEnumerator() => _selector(source).GetEnumerator(); + } +} diff --git a/src/DynamicData/List/Internal/Transformer.cs b/src/DynamicData/List/Internal/Transformer.cs index 69dbb11b2..10714662c 100644 --- a/src/DynamicData/List/Internal/Transformer.cs +++ b/src/DynamicData/List/Internal/Transformer.cs @@ -1,32 +1,64 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif +/// +/// Provides members for the Transformer class. +/// +/// The type of the TSource value. +/// The type of the TDestination value. internal sealed class Transformer where TSource : notnull where TDestination : notnull { - private readonly Func, int, TransformedItemContainer> _containerFactory; - + /// + /// The _containerFactory field. + /// + private readonly Func, int, TransformedItemContainer> _containerFactory; + + /// + /// The _source field. + /// private readonly IObservable> _source; + /// + /// The _transformOnRefresh field. + /// private readonly bool _transformOnRefresh; - public Transformer(IObservable> source, Func, int, TDestination> factory, bool transformOnRefresh) + /// + /// Initializes a new instance of the class. + /// + /// The source value. + /// The factory value. + /// The transformOnRefresh value. + public Transformer(IObservable> source, Func, int, TDestination> factory, bool transformOnRefresh) { - factory.ThrowArgumentNullExceptionIfNull(nameof(factory)); + ArgumentExceptionHelper.ThrowIfNull(factory); + ArgumentExceptionHelper.ThrowIfNull(source); - _source = source ?? throw new ArgumentNullException(nameof(source)); + _source = source; _transformOnRefresh = transformOnRefresh; _containerFactory = (item, prev, index) => new TransformedItemContainer(item, factory(item, prev, index)); } + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Defer(RunImpl); + /// + /// Executes the RunImpl operation. + /// + /// The result of the operation. private IObservable> RunImpl() => _source.Scan(new ChangeAwareList(), (state, changes) => { Transform(state, changes); @@ -38,9 +70,14 @@ private IObservable> RunImpl() => _source.Scan(new Chan return changed.Transform(container => container.Destination); }); + /// + /// Executes the Transform operation. + /// + /// The transformed value. + /// The changes value. private void Transform(ChangeAwareList transformed, IChangeSet changes) { - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); + ArgumentExceptionHelper.ThrowIfNull(changes); foreach (var item in changes) { @@ -51,11 +88,11 @@ private void Transform(ChangeAwareList transformed, IC var change = item.Item; if (change.CurrentIndex < 0 || change.CurrentIndex >= transformed.Count) { - transformed.Add(_containerFactory(change.Current, Optional.None, transformed.Count)); + transformed.Add(_containerFactory(change.Current, ReactiveUI.Primitives.Optional.None, transformed.Count)); } else { - var converted = _containerFactory(change.Current, Optional.None, change.CurrentIndex); + var converted = _containerFactory(change.Current, ReactiveUI.Primitives.Optional.None, change.CurrentIndex); transformed.Insert(change.CurrentIndex, converted); } @@ -66,7 +103,7 @@ private void Transform(ChangeAwareList transformed, IC { var startIndex = item.Range.Index < 0 ? transformed.Count : item.Range.Index; - transformed.AddOrInsertRange(item.Range.Select((t, idx) => _containerFactory(t, Optional.None, idx + startIndex)), item.Range.Index); + transformed.AddOrInsertRange(item.Range.Select((t, idx) => _containerFactory(t, ReactiveUI.Primitives.Optional.None, idx + startIndex)), item.Range.Index); break; } @@ -88,7 +125,7 @@ private void Transform(ChangeAwareList transformed, IC if (_transformOnRefresh) { - Optional previous = transformed[index].Destination; + ReactiveUI.Primitives.Optional previous = transformed[index].Destination; transformed[index] = _containerFactory(change.Current, previous, index); } else @@ -117,7 +154,7 @@ private void Transform(ChangeAwareList transformed, IC } else { - Optional previous = transformed[change.PreviousIndex].Destination; + ReactiveUI.Primitives.Optional previous = transformed[change.PreviousIndex].Destination; if (change.CurrentIndex == change.PreviousIndex) { transformed[change.CurrentIndex] = _containerFactory(change.Current, previous, change.CurrentIndex); @@ -125,7 +162,7 @@ private void Transform(ChangeAwareList transformed, IC else { transformed.RemoveAt(change.PreviousIndex); - transformed.Insert(change.CurrentIndex, _containerFactory(change.Current, Optional.None, change.CurrentIndex)); + transformed.Insert(change.CurrentIndex, _containerFactory(change.Current, ReactiveUI.Primitives.Optional.None, change.CurrentIndex)); } } @@ -194,16 +231,44 @@ private void Transform(ChangeAwareList transformed, IC } } - internal sealed class TransformedItemContainer(TSource source, TDestination destination) : IEquatable +/// +/// Provides members for the TransformedItemContainer class. +/// +/// The source value. +/// The destination value. +internal sealed class TransformedItemContainer(TSource source, TDestination destination) : IEquatable { + /// + /// Gets the Destination value. + /// public TDestination Destination { get; } = destination; + /// + /// Gets the Source value. + /// public TSource Source { get; } = source; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(TransformedItemContainer left, TransformedItemContainer right) => Equals(left, right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(TransformedItemContainer left, TransformedItemContainer right) => !Equals(left, right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(TransformedItemContainer? other) { if (other is null) @@ -219,6 +284,11 @@ public bool Equals(TransformedItemContainer? other) return EqualityComparer.Default.Equals(Source, other.Source); } + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -239,6 +309,10 @@ public override bool Equals(object? obj) return Equals((TransformedItemContainer)obj); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() => Source is null ? 0 : EqualityComparer.Default.GetHashCode(Source); } } diff --git a/src/DynamicData/List/Internal/UnifiedChange.cs b/src/DynamicData/List/Internal/UnifiedChange.cs index eb971b7ae..005631987 100644 --- a/src/DynamicData/List/Internal/UnifiedChange.cs +++ b/src/DynamicData/List/Internal/UnifiedChange.cs @@ -1,29 +1,77 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; +#endif -internal readonly struct UnifiedChange(ListChangeReason reason, T current, Optional previous) : IEquatable> +/// +/// Represents the UnifiedChange value. +/// +/// The type of the T value. +/// The reason value. +/// The current value. +/// The previous value. +internal readonly struct UnifiedChange(ListChangeReason reason, T current, ReactiveUI.Primitives.Optional previous) : IEquatable> where T : notnull { + /// + /// Initializes a new instance of the struct. + /// + /// The reason value. + /// The current value. public UnifiedChange(ListChangeReason reason, T current) - : this(reason, current, Optional.None()) + : this(reason, current, ReactiveUI.Primitives.Optional.None) { } + /// + /// Gets the Reason value. + /// public ListChangeReason Reason { get; } = reason; + /// + /// Gets the Current value. + /// public T Current { get; } = current; - public Optional Previous { get; } = previous; + /// + /// Gets the Previous value. + /// + public ReactiveUI.Primitives.Optional Previous { get; } = previous; + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator ==(in UnifiedChange left, in UnifiedChange right) => left.Equals(right); + /// + /// Executes the operator operation. + /// + /// The left value. + /// The right value. + /// The result of the operation. public static bool operator !=(in UnifiedChange left, in UnifiedChange right) => !left.Equals(right); + /// + /// Executes the Equals operation. + /// + /// The other value. + /// The result of the operation. public bool Equals(UnifiedChange other) => Reason == other.Reason && EqualityComparer.Default.Equals(Current, other.Current) && Previous.Equals(other.Previous); + /// + /// Executes the Equals operation. + /// + /// The obj value. + /// The result of the operation. public override bool Equals(object? obj) { if (obj is null) @@ -34,6 +82,10 @@ public override bool Equals(object? obj) return obj is UnifiedChange unifiedChange && Equals(unifiedChange); } + /// + /// Executes the GetHashCode operation. + /// + /// The result of the operation. public override int GetHashCode() { unchecked @@ -45,5 +97,9 @@ public override int GetHashCode() } } + /// + /// Executes the ToString operation. + /// + /// The result of the operation. public override string ToString() => $"Reason: {Reason}, Current: {Current}, Previous: {Previous}"; } diff --git a/src/DynamicData/List/Internal/Virtualiser.cs b/src/DynamicData/List/Internal/Virtualiser.cs index bb2f894c2..aeba4fbe8 100644 --- a/src/DynamicData/List/Internal/Virtualiser.cs +++ b/src/DynamicData/List/Internal/Virtualiser.cs @@ -1,22 +1,41 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Linq; +namespace DynamicData.Reactive.List.Internal; +#else namespace DynamicData.List.Internal; - +#endif + +/// +/// Provides members for the Virtualiser class. +/// +/// The type of the T value. +/// The source value. +/// The requests value. internal sealed class Virtualiser(IObservable> source, IObservable requests) where T : notnull { + /// + /// The _requests field. + /// private readonly IObservable _requests = requests ?? throw new ArgumentNullException(nameof(requests)); + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var all = new List(); var virtualised = new ChangeAwareList(); @@ -37,6 +56,13 @@ public IObservable> Run() => Observable.Create new VirtualChangeSet(changes, new VirtualResponse(virtualised.Count, parameters.StartIndex, all.Count))).SubscribeSafe(observer); }); + /// + /// Executes the CheckParamsAndVirtualise operation. + /// + /// The all value. + /// The virtualised value. + /// The request value. + /// The result of the operation. private static IChangeSet? CheckParamsAndVirtualise(IList all, ChangeAwareList virtualised, IVirtualRequest? request) { if (request is null || request.StartIndex < 0 || request.Size < 1) @@ -47,6 +73,14 @@ public IObservable> Run() => Observable.Create + /// Executes the Virtualise operation. + /// + /// The all value. + /// The virtualised value. + /// The request value. + /// The changeSet value. + /// The result of the operation. private static IChangeSet Virtualise(IList all, ChangeAwareList virtualised, IVirtualRequest request, IChangeSet? changeSet = null) { if (changeSet is not null) diff --git a/src/DynamicData/List/ItemChange.cs b/src/DynamicData/List/ItemChange.cs index 4b7d31a46..3ddf64a5a 100644 --- a/src/DynamicData/List/ItemChange.cs +++ b/src/DynamicData/List/ItemChange.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Container to describe a single change to a cache. @@ -18,14 +22,14 @@ namespace DynamicData; public static readonly ItemChange Empty; /// - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The reason. /// The current. /// The previous. /// Value of the current. /// Value of the previous. - public ItemChange(ListChangeReason reason, T current, in Optional previous, int currentIndex = -1, int previousIndex = -1) + public ItemChange(ListChangeReason reason, T current, in ReactiveUI.Primitives.Optional previous, int currentIndex = -1, int previousIndex = -1) : this() { Reason = reason; @@ -48,7 +52,7 @@ public ItemChange(ListChangeReason reason, T current, int currentIndex) Current = current; CurrentIndex = currentIndex; PreviousIndex = -1; - Previous = Optional.None; + Previous = ReactiveUI.Primitives.Optional.None; } /// @@ -70,7 +74,7 @@ public ItemChange(ListChangeReason reason, T current, int currentIndex) /// Gets the item from before the change. /// This is only when is . /// - public Optional Previous { get; } + public ReactiveUI.Primitives.Optional Previous { get; } /// /// Gets the previous index. diff --git a/src/DynamicData/List/Linq/AddKeyEnumerator.cs b/src/DynamicData/List/Linq/AddKeyEnumerator.cs index 150c7c4a6..bf8135839 100644 --- a/src/DynamicData/List/Linq/AddKeyEnumerator.cs +++ b/src/DynamicData/List/Linq/AddKeyEnumerator.cs @@ -1,24 +1,40 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive.List.Linq; +#else namespace DynamicData.List.Linq; - +#endif + +/// +/// Provides members for the AddKeyEnumerator class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The keySelector value. internal sealed class AddKeyEnumerator(IChangeSet source, Func keySelector) : IEnumerable> where TObject : notnull where TKey : notnull { + /// + /// The _keySelector field. + /// private readonly Func _keySelector = keySelector ?? throw new ArgumentNullException(nameof(keySelector)); + /// + /// The _source field. + /// private readonly IChangeSet _source = source ?? throw new ArgumentNullException(nameof(source)); /// /// Returns an enumerator that iterates through the collection. /// /// - /// A that can be used to iterate through the collection. + /// A IEnumerator<T> that can be used to iterate through the collection. /// public IEnumerator> GetEnumerator() { @@ -103,5 +119,9 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/List/Linq/ItemChangeEnumerator.cs b/src/DynamicData/List/Linq/ItemChangeEnumerator.cs index 53c975d0a..e9be3c55e 100644 --- a/src/DynamicData/List/Linq/ItemChangeEnumerator.cs +++ b/src/DynamicData/List/Linq/ItemChangeEnumerator.cs @@ -1,14 +1,26 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive.List.Linq; +#else namespace DynamicData.List.Linq; +#endif +/// +/// Provides members for the ItemChangeEnumerator class. +/// +/// The type of the T value. +/// The changeSet value. internal sealed class ItemChangeEnumerator(IChangeSet changeSet) : IEnumerable> where T : notnull { + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() { var lastKnownIndex = 0; @@ -48,5 +60,9 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/List/Linq/Reverser.cs b/src/DynamicData/List/Linq/Reverser.cs index 9be4b678a..9c02426a1 100644 --- a/src/DynamicData/List/Linq/Reverser.cs +++ b/src/DynamicData/List/Linq/Reverser.cs @@ -1,14 +1,31 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Linq; +#else namespace DynamicData.List.Linq; +#endif +/// +/// Provides members for the Reverser class. +/// +/// The type of the T value. internal sealed class Reverser where T : notnull { + /// + /// The _length field. + /// private int _length; + /// + /// Executes the Reverse operation. + /// + /// The changes value. + /// The result of the operation. public IEnumerable> Reverse(IChangeSet changes) { foreach (var change in changes) diff --git a/src/DynamicData/List/Linq/UnifiedChangeEnumerator.cs b/src/DynamicData/List/Linq/UnifiedChangeEnumerator.cs index 4a8d0c352..30aed895a 100644 --- a/src/DynamicData/List/Linq/UnifiedChangeEnumerator.cs +++ b/src/DynamicData/List/Linq/UnifiedChangeEnumerator.cs @@ -1,16 +1,33 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; +#endif +#if REACTIVE_SHIM + +namespace DynamicData.Reactive.List.Linq; +#else namespace DynamicData.List.Linq; +#endif +/// +/// Provides members for the UnifiedChangeEnumerator class. +/// +/// The type of the T value. +/// The changeSet value. internal sealed class UnifiedChangeEnumerator(IChangeSet changeSet) : IEnumerable> where T : notnull { + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() { foreach (var change in changeSet) @@ -45,5 +62,9 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/List/Linq/WithoutIndexEnumerator.cs b/src/DynamicData/List/Linq/WithoutIndexEnumerator.cs index 269bf2c2e..7d3a211ff 100644 --- a/src/DynamicData/List/Linq/WithoutIndexEnumerator.cs +++ b/src/DynamicData/List/Linq/WithoutIndexEnumerator.cs @@ -1,19 +1,27 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +namespace DynamicData.Reactive.List.Linq; +#else namespace DynamicData.List.Linq; +#endif /// -/// Index to remove the index. This is necessary for WhereReasonAre* operators. -/// Otherwise these operators could break subsequent operators when the subsequent operator relies on the index. +/// Removes mutation indices for WhereReasonAre* operators and omits moves. +/// Refresh notifications retain their required source index. /// /// The type of the item. +/// The changeSet value. internal sealed class WithoutIndexEnumerator(IEnumerable> changeSet) : IEnumerable> where T : notnull { + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() { foreach (var change in changeSet) @@ -24,7 +32,11 @@ public IEnumerator> GetEnumerator() continue; } - if (change.Type == ChangeType.Item) + if (change.Reason == ListChangeReason.Refresh) + { + yield return change; + } + else if (change.Type == ChangeType.Item) { yield return new Change(change.Reason, change.Item.Current, change.Item.Previous); } @@ -35,5 +47,9 @@ public IEnumerator> GetEnumerator() } } + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/List/ListChangeReason.cs b/src/DynamicData/List/ListChangeReason.cs index 89d8aa2dc..10fc0ea1c 100644 --- a/src/DynamicData/List/ListChangeReason.cs +++ b/src/DynamicData/List/ListChangeReason.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// The reason for an individual change to an observable list. diff --git a/src/DynamicData/List/ListEx.cs b/src/DynamicData/List/ListEx.cs index 7035b1d4d..b0f59a197 100644 --- a/src/DynamicData/List/ListEx.cs +++ b/src/DynamicData/List/ListEx.cs @@ -1,644 +1,661 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. -// Roland Pheasant licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Collections.ObjectModel; - -// ReSharper disable once CheckNamespace -namespace DynamicData; - -/// -/// Extensions to help with maintenance of a list. -/// -public static class ListEx -{ - /// - /// Adds the items to the specified list. - /// - /// The type of the item. - /// The source. - /// The items. - /// - /// source - /// or - /// items. - /// - public static void Add(this IList source, IEnumerable items) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - items.ThrowArgumentNullExceptionIfNull(nameof(items)); - - items.ForEach(source.Add); - } - - /// - /// Adds the range if a negative is specified, otherwise the range is added at the end of the list. - /// - /// The type of the item. - /// The source. - /// The items. - /// The index. - public static void AddOrInsertRange(this IList source, IEnumerable items, int index) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - items.ThrowArgumentNullExceptionIfNull(nameof(items)); - - switch (source) - { - case List list when index >= 0: - list.InsertRange(index, items); - break; - case List list: - list.AddRange(items); - break; - case IExtendedList extendedList when index >= 0: - extendedList.InsertRange(items, index); - break; - case IExtendedList extendedList: - extendedList.AddRange(items); - break; - default: - { - if (index >= 0) - { - // TODO: Why the hell reverse? Surely there must be as reason otherwise I would not have done it. - items.Reverse().ForEach(t => source.Insert(index, t)); - } - else - { - items.ForEach(source.Add); - } - - break; - } - } - } - - /// - /// Adds the range to the source list. - /// - /// The type of the item. - /// The source. - /// The items. - /// - /// source - /// or - /// items. - /// - public static void AddRange(this IList source, IEnumerable items) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - items.ThrowArgumentNullExceptionIfNull(nameof(items)); - - switch (source) - { - case List list: - list.AddRange(items); - break; - case IExtendedList extendedList: - extendedList.AddRange(items); - break; - default: - foreach (var t in items) - source.Add(t); - break; - } - } - - /// - /// Adds the range to the list. The starting range is at the specified index. - /// - /// The type of the item. - /// The source. - /// The items. - /// The index. - public static void AddRange(this IList source, IEnumerable items, int index) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - items.ThrowArgumentNullExceptionIfNull(nameof(items)); - - switch (source) - { - case List list: - list.InsertRange(index, items); - break; - case IExtendedList list: - list.InsertRange(items, index); - break; - default: - items.ForEach(source.Add); - break; - } - } - - /// - /// Performs a binary search on the specified collection. - /// - /// The type of the item. - /// The list to be searched. - /// The value to search for. - /// The index of the specified value in the specified array, if value is found; otherwise, a negative number. - public static int BinarySearch(this IList list, TItem value) => BinarySearch(list, value, Comparer.Default); - - /// - /// Performs a binary search on the specified collection. - /// - /// The type of the item. - /// The list to be searched. - /// The value to search for. - /// The comparer that is used to compare the value with the list items. - /// The index of the specified value in the specified array, if value is found; otherwise, a negative number. - public static int BinarySearch(this IList list, TItem value, IComparer comparer) - { - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); - - return list.BinarySearch(value, comparer.Compare); - } - - /// - /// Performs a binary search on the specified collection. - /// Thanks to https://stackoverflow.com/questions/967047/how-to-perform-a-binary-search-on-ilistt. - /// - /// The type of the item. - /// The type of the searched item. - /// The list to be searched. - /// The value to search for. - /// The comparer that is used to compare the value with the list items. - /// The index of the specified value in the specified array, if value is found; otherwise, a negative number. - public static int BinarySearch(this IList list, TSearch value, Func comparer) - { - list.ThrowArgumentNullExceptionIfNull(nameof(list)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); - - var lower = 0; - var upper = list.Count - 1; - - while (lower <= upper) - { - var middle = lower + ((upper - lower) / 2); - var comparisonResult = comparer(value, list[middle]); - if (comparisonResult < 0) - { - upper = middle - 1; - } - else if (comparisonResult > 0) - { - lower = middle + 1; - } - else - { - return middle; - } - } - - return ~lower; - } - - /// - /// Clones the list from the specified change set. - /// - /// The type of the item. - /// The source. - /// The changes. - /// - /// source - /// or - /// changes. - /// - public static void Clone(this IList source, IChangeSet changes) - where T : notnull => Clone(source, changes, null); - - /// - /// Clones the list from the specified change set. - /// - /// The type of the item. - /// The source. - /// The changes. - /// An equality comparer to match items in the changes. - /// - /// source - /// or - /// changes. - /// - public static void Clone(this IList source, IChangeSet changes, IEqualityComparer? equalityComparer) - where T : notnull => Clone(source, (IEnumerable>)changes, equalityComparer); - - /// - /// Clones the list from the specified enumerable of changes. - /// - /// The type of the item. - /// The source. - /// The changes. - /// An equality comparer to match items in the changes. - /// - /// source - /// or - /// changes. - /// - public static void Clone(this IList source, IEnumerable> changes, IEqualityComparer? equalityComparer) - where T : notnull - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - changes.ThrowArgumentNullExceptionIfNull(nameof(changes)); - - foreach (var item in changes) - { - Clone(source, item, equalityComparer ?? EqualityComparer.Default); - } - } - - /// - /// Finds the index of the current item using the specified equality comparer. - /// - /// The type of the item. - /// The source enumerable. - /// The item to get the index of. - /// The index. - public static int IndexOf(this IEnumerable source, T item) => IndexOf(source, item, EqualityComparer.Default); - - /// - /// Finds the index of the current item using the specified equality comparer. - /// - /// The type of the item. - /// The source enumerable. - /// The item to get the index of. - /// Use to determine object equality. - /// The index. - public static int IndexOf(this IEnumerable source, T item, IEqualityComparer equalityComparer) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - equalityComparer.ThrowArgumentNullExceptionIfNull(nameof(equalityComparer)); - - var i = 0; - foreach (var candidate in source) - { - if (equalityComparer.Equals(item, candidate)) - { - return i; - } - - i++; - } - - return -1; - } - - /// - /// Lookups the item using the specified comparer. If matched, the item's index is also returned. - /// - /// The type of the item. - /// The source. - /// The item. - /// The equality comparer. - /// The index of the item if available. - public static Optional> IndexOfOptional(this IEnumerable source, T item, IEqualityComparer? equalityComparer = null) - { - var comparer = equalityComparer ?? EqualityComparer.Default; - var index = source.IndexOf(item, comparer); - return index < 0 ? Optional>.None : new ItemWithIndex(item, index); - } - - /// - /// Removes the items from the specified list. - /// - /// The type of the item. - /// The source. - /// The items. - /// - /// source - /// or - /// items. - /// - public static void Remove(this IList source, IEnumerable items) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - items.ThrowArgumentNullExceptionIfNull(nameof(items)); - - items.ForEach(t => source.Remove(t)); - } - - /// - /// Removes many items from the collection in an optimal way. - /// - /// The type of the item. - /// The source. - /// The items to remove. - public static void RemoveMany(this IList source, IEnumerable itemsToRemove) - { - /* - This may seem OTT but for large sets of data where there are many removes scattered - across the source collection IndexOf lookups can result in very slow updates - (especially for subsequent operators) - */ - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - itemsToRemove.ThrowArgumentNullExceptionIfNull(nameof(itemsToRemove)); - - var toRemoveArray = itemsToRemove.AsArray(); - - // match all indexes and and remove in reverse as it is more efficient - var toRemove = source.IndexOfMany(toRemoveArray).OrderByDescending(x => x.Index).ToArray(); - - // if there are duplicates, it could be that an item exists in the - // source collection more than once - in that case the fast remove - // would remove each instance - var hasDuplicates = toRemove.Duplicates(t => t.Item).Any(); - - if (hasDuplicates) - { - // Slow remove but safe - toRemoveArray.ForEach(t => source.Remove(t)); - } - else - { - // Fast remove because we know the index of all and we remove in order - toRemove.ForEach(t => source.RemoveAt(t.Index)); - } - } - - /// - /// Replaces the specified item. - /// - /// The type of the item. - /// The source. - /// The original. - /// The value to replace with. - /// source - /// or - /// items. - public static void Replace(this IList source, T original, T replaceWith) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - original.ThrowArgumentNullExceptionIfNull(nameof(original)); - replaceWith.ThrowArgumentNullExceptionIfNull(nameof(replaceWith)); - - var index = source.IndexOf(original); - if (index == -1) - { - throw new ArgumentException("Cannot find index of original item. Either it does not exist in the list or the hashcode has mutated"); - } - - source[index] = replaceWith; - } - - /// - /// Replaces the specified item. - /// - /// The type of item. - /// The source. - /// The item which is to be replaced. If not in the list and argument exception will be thrown. - /// The new item. - /// The equality comparer to be used to find the original item in the list. - /// source - /// or - /// items. - public static void Replace(this IList source, T original, T replaceWith, IEqualityComparer comparer) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - original.ThrowArgumentNullExceptionIfNull(nameof(original)); - replaceWith.ThrowArgumentNullExceptionIfNull(nameof(replaceWith)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); - - var index = source.IndexOf(original); - if (index == -1) - { - throw new ArgumentException("Cannot find index of original item. Either it does not exist in the list or the hashcode has mutated"); - } - - if (comparer.Equals(source[index], replaceWith)) - { - source[index] = replaceWith; - } - } - - /// - /// Replaces the item if found, otherwise the item is added to the list. - /// - /// The type of the item. - /// The source. - /// The original. - /// The value to replace with. - public static void ReplaceOrAdd(this IList source, T original, T replaceWith) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - original.ThrowArgumentNullExceptionIfNull(nameof(original)); - replaceWith.ThrowArgumentNullExceptionIfNull(nameof(replaceWith)); - - var index = source.IndexOf(original); - if (index == -1) - { - source.Add(replaceWith); - } - else - { - source[index] = replaceWith; - } - } - - /// - /// Clears the collection if the number of items in the range is the same as the source collection. Otherwise a remove many operation is applied. - /// NB: This is because an observable change set may be a composite of multiple change sets in which case if one of them has clear operation applied it should not clear the entire result. - /// - /// The type of the item. - /// The source. - /// The change. - internal static void ClearOrRemoveMany(this IList source, Change change) - where T : notnull - { - // apply this to other operators - if (source.Count == change.Range.Count) - { - source.Clear(); - } - else - { - source.RemoveMany(change.Range); - } - } - - internal static bool MovedWithinRange(this Change source, int startIndex, int endIndex) - where T : notnull - { - if (source.Reason != ListChangeReason.Moved) - { - return false; - } - - var current = source.Item.CurrentIndex; - var previous = source.Item.PreviousIndex; - - return (current >= startIndex && current <= endIndex) || (previous >= startIndex && previous <= endIndex); - } - - private static void Clone(this IList source, Change item, IEqualityComparer equalityComparer) - where T : notnull - { - var changeAware = source as ChangeAwareList; - - switch (item.Reason) - { - case ListChangeReason.Add: - { - var change = item.Item; - var hasIndex = change.CurrentIndex >= 0; - if (hasIndex) - { - source.Insert(change.CurrentIndex, change.Current); - } - else - { - source.Add(change.Current); - } - - break; - } - - case ListChangeReason.AddRange: - { - source.AddOrInsertRange(item.Range, item.Range.Index); - break; - } - - case ListChangeReason.Clear: - { - source.ClearOrRemoveMany(item); - break; - } - - case ListChangeReason.Replace: - { - var change = item.Item; - if (change.CurrentIndex >= 0 && change.CurrentIndex == change.PreviousIndex) - { - source[change.CurrentIndex] = change.Current; - } - else - { - if (change.PreviousIndex == -1) - { - source.Remove(change.Previous.Value); - } - else - { - // is this best? or replace + move? - source.RemoveAt(change.PreviousIndex); - } - - if (change.CurrentIndex == -1) - { - source.Add(change.Current); - } - else - { - source.Insert(change.CurrentIndex, change.Current); - } - } - - break; - } - - case ListChangeReason.Refresh: - { - if (changeAware is not null) - { - changeAware.RefreshAt(item.Item.CurrentIndex); - } - else - { - source.RemoveAt(item.Item.CurrentIndex); - source.Insert(item.Item.CurrentIndex, item.Item.Current); - } - - break; - } - - case ListChangeReason.Remove: - { - var change = item.Item; - var hasIndex = change.CurrentIndex >= 0; - if (hasIndex) - { - source.RemoveAt(change.CurrentIndex); - } - else - { - var index = source.IndexOf(change.Current, equalityComparer); - if (index > -1) - { - source.RemoveAt(index); - } - } - - break; - } - - case ListChangeReason.RemoveRange: - { - // ignore this case because WhereReasonsAre removes the index [in which case call RemoveMany] - //// if (item.Range.Index < 0) - //// throw new UnspecifiedIndexException("ListChangeReason.RemoveRange should not have an index specified index"); - if (item.Range.Index >= 0 && (source is IExtendedList || source is List)) - { - source.RemoveRange(item.Range.Index, item.Range.Count); - } - else - { - source.RemoveMany(item.Range); - } - - break; - } - - case ListChangeReason.Moved: - { - var change = item.Item; - var hasIndex = change.CurrentIndex >= 0; - if (!hasIndex) - { - throw new UnspecifiedIndexException("Cannot move as an index was not specified"); - } - - if (source is IExtendedList extendedList) - { - extendedList.Move(change.PreviousIndex, change.CurrentIndex); - } - else if (source is ObservableCollection observableCollection) - { - observableCollection.Move(change.PreviousIndex, change.CurrentIndex); - } - else - { - // check this works whatever the index is - source.RemoveAt(change.PreviousIndex); - source.Insert(change.CurrentIndex, change.Current); - } - - break; - } - } - } - - /// - /// Removes the number of items, starting at the specified index. - /// - /// The type of the item. - /// The source. - /// The index. - /// The count. - /// Cannot remove range. - private static void RemoveRange(this IList source, int index, int count) - { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - switch (source) - { - case List list: - list.RemoveRange(index, count); - break; - case IExtendedList list: - list.RemoveRange(index, count); - break; - default: - throw new NotSupportedException($"Cannot remove range from {source.GetType().FullName}"); - } - } -} +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else +namespace DynamicData; +#endif + +/// +/// Extensions to help with maintenance of a list. +/// +public static class ListEx +{ + /// + /// Adds the items to the specified list. + /// + /// The type of the item. + /// The source. + /// The items. + /// + /// source + /// or + /// items. + /// + public static void Add(this IList source, IEnumerable items) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); + + items.ForEach(source.Add); + } + + /// + /// Adds the range if a negative is specified, otherwise the range is added at the end of the list. + /// + /// The type of the item. + /// The source. + /// The items. + /// The index. + public static void AddOrInsertRange(this IList source, IEnumerable items, int index) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); + + switch (source) + { + case List list when index >= 0: + list.InsertRange(index, items); + break; + case List list: + list.AddRange(items); + break; + case IExtendedList extendedList when index >= 0: + extendedList.InsertRange(items, index); + break; + case IExtendedList extendedList: + extendedList.AddRange(items); + break; + default: + { + if (index >= 0) + { + // TODO: Why the hell reverse? Surely there must be as reason otherwise I would not have done it. + items.Reverse().ForEach(t => source.Insert(index, t)); + } + else + { + items.ForEach(source.Add); + } + + break; + } + } + } + + /// + /// Adds the range to the source list. + /// + /// The type of the item. + /// The source. + /// The items. + /// + /// source + /// or + /// items. + /// + public static void AddRange(this IList source, IEnumerable items) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); + + switch (source) + { + case List list: + list.AddRange(items); + break; + case IExtendedList extendedList: + extendedList.AddRange(items); + break; + default: + foreach (var t in items) + source.Add(t); + break; + } + } + + /// + /// Adds the range to the list. The starting range is at the specified index. + /// + /// The type of the item. + /// The source. + /// The items. + /// The index. + public static void AddRange(this IList source, IEnumerable items, int index) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); + + switch (source) + { + case List list: + list.InsertRange(index, items); + break; + case IExtendedList list: + list.InsertRange(items, index); + break; + default: + items.ForEach(source.Add); + break; + } + } + + /// + /// Performs a binary search on the specified collection. + /// + /// The type of the item. + /// The list to be searched. + /// The value to search for. + /// The index of the specified value in the specified array, if value is found; otherwise, a negative number. + public static int BinarySearch(this IList list, TItem value) => BinarySearch(list, value, Comparer.Default); + + /// + /// Performs a binary search on the specified collection. + /// + /// The type of the item. + /// The list to be searched. + /// The value to search for. + /// The comparer that is used to compare the value with the list items. + /// The index of the specified value in the specified array, if value is found; otherwise, a negative number. + public static int BinarySearch(this IList list, TItem value, IComparer comparer) + { + ArgumentExceptionHelper.ThrowIfNull(comparer); + + return list.BinarySearch(value, comparer.Compare); + } + + /// + /// Performs a binary search on the specified collection. + /// Thanks to https://stackoverflow.com/questions/967047/how-to-perform-a-binary-search-on-ilistt. + /// + /// The type of the item. + /// The type of the searched item. + /// The list to be searched. + /// The value to search for. + /// The comparer that is used to compare the value with the list items. + /// The index of the specified value in the specified array, if value is found; otherwise, a negative number. + public static int BinarySearch(this IList list, TSearch value, Func comparer) + { + ArgumentExceptionHelper.ThrowIfNull(list); + ArgumentExceptionHelper.ThrowIfNull(comparer); + + var lower = 0; + var upper = list.Count - 1; + + while (lower <= upper) + { + var middle = lower + ((upper - lower) / 2); + var comparisonResult = comparer(value, list[middle]); + if (comparisonResult < 0) + { + upper = middle - 1; + } + else if (comparisonResult > 0) + { + lower = middle + 1; + } + else + { + return middle; + } + } + + return ~lower; + } + + /// + /// Clones the list from the specified change set. + /// + /// The type of the item. + /// The source. + /// The changes. + /// + /// source + /// or + /// changes. + /// + public static void Clone(this IList source, IChangeSet changes) + where T : notnull => Clone(source, changes, null); + + /// + /// Clones the list from the specified change set. + /// + /// The type of the item. + /// The source. + /// The changes. + /// An equality comparer to match items in the changes. + /// + /// source + /// or + /// changes. + /// + public static void Clone(this IList source, IChangeSet changes, IEqualityComparer? equalityComparer) + where T : notnull => Clone(source, (IEnumerable>)changes, equalityComparer); + + /// + /// Clones the list from the specified enumerable of changes. + /// + /// The type of the item. + /// The source. + /// The changes. + /// An equality comparer to match items in the changes. + /// + /// source + /// or + /// changes. + /// + public static void Clone(this IList source, IEnumerable> changes, IEqualityComparer? equalityComparer) + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(changes); + + foreach (var item in changes) + { + Clone(source, item, equalityComparer ?? EqualityComparer.Default); + } + } + + /// + /// Finds the index of the current item using the specified equality comparer. + /// + /// The type of the item. + /// The source enumerable. + /// The item to get the index of. + /// The index. + public static int IndexOf(this IEnumerable source, T item) => IndexOf(source, item, EqualityComparer.Default); + + /// + /// Finds the index of the current item using the specified equality comparer. + /// + /// The type of the item. + /// The source enumerable. + /// The item to get the index of. + /// Use to determine object equality. + /// The index. + public static int IndexOf(this IEnumerable source, T item, IEqualityComparer equalityComparer) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(equalityComparer); + + var i = 0; + foreach (var candidate in source) + { + if (equalityComparer.Equals(item, candidate)) + { + return i; + } + + i++; + } + + return -1; + } + + /// + /// Lookups the item using the specified comparer. If matched, the item's index is also returned. + /// + /// The type of the item. + /// The source. + /// The item. + /// The equality comparer. + /// The index of the item if available. + public static ReactiveUI.Primitives.Optional> IndexOfOptional(this IEnumerable source, T item, IEqualityComparer? equalityComparer = null) + { + var comparer = equalityComparer ?? EqualityComparer.Default; + var index = source.IndexOf(item, comparer); + return index < 0 ? ReactiveUI.Primitives.Optional>.None : new ItemWithIndex(item, index); + } + + /// + /// Removes the items from the specified list. + /// + /// The type of the item. + /// The source. + /// The items. + /// + /// source + /// or + /// items. + /// + public static void Remove(this IList source, IEnumerable items) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); + + items.ForEach(t => source.Remove(t)); + } + + /// + /// Removes many items from the collection in an optimal way. + /// + /// The type of the item. + /// The source. + /// The items to remove. + public static void RemoveMany(this IList source, IEnumerable itemsToRemove) + { + /* + This may seem OTT but for large sets of data where there are many removes scattered + across the source collection IndexOf lookups can result in very slow updates + (especially for subsequent operators) + */ + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(itemsToRemove); + + var toRemoveArray = itemsToRemove.AsArray(); + + // match all indexes and and remove in reverse as it is more efficient + var toRemove = source.IndexOfMany(toRemoveArray).OrderByDescending(x => x.Index).ToArray(); + + // if there are duplicates, it could be that an item exists in the + // source collection more than once - in that case the fast remove + // would remove each instance + var hasDuplicates = toRemove.Duplicates(t => t.Item).Any(); + + if (hasDuplicates) + { + // Slow remove but safe + toRemoveArray.ForEach(t => source.Remove(t)); + } + else + { + // Fast remove because we know the index of all and we remove in order + toRemove.ForEach(t => source.RemoveAt(t.Index)); + } + } + + /// + /// Replaces the specified item. + /// + /// The type of the item. + /// The source. + /// The original. + /// The value to replace with. + /// source + /// or + /// items. + public static void Replace(this IList source, T original, T replaceWith) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(original); + ArgumentExceptionHelper.ThrowIfNull(replaceWith); + + var index = source.IndexOf(original); + if (index == -1) + { + throw new ArgumentException("Cannot find index of original item. Either it does not exist in the list or the hashcode has mutated"); + } + + source[index] = replaceWith; + } + + /// + /// Replaces the specified item. + /// + /// The type of item. + /// The source. + /// The item which is to be replaced. If not in the list and argument exception will be thrown. + /// The new item. + /// The equality comparer to be used to find the original item in the list. + /// source + /// or + /// items. + public static void Replace(this IList source, T original, T replaceWith, IEqualityComparer comparer) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(original); + ArgumentExceptionHelper.ThrowIfNull(replaceWith); + ArgumentExceptionHelper.ThrowIfNull(comparer); + + var index = source.IndexOf(original); + if (index == -1) + { + throw new ArgumentException("Cannot find index of original item. Either it does not exist in the list or the hashcode has mutated"); + } + + if (comparer.Equals(source[index], replaceWith)) + { + source[index] = replaceWith; + } + } + + /// + /// Replaces the item if found, otherwise the item is added to the list. + /// + /// The type of the item. + /// The source. + /// The original. + /// The value to replace with. + public static void ReplaceOrAdd(this IList source, T original, T replaceWith) + { + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(original); + ArgumentExceptionHelper.ThrowIfNull(replaceWith); + + var index = source.IndexOf(original); + if (index == -1) + { + source.Add(replaceWith); + } + else + { + source[index] = replaceWith; + } + } + + /// + /// Clears the collection if the number of items in the range is the same as the source collection. Otherwise a remove many operation is applied. + /// NB: This is because an observable change set may be a composite of multiple change sets in which case if one of them has clear operation applied it should not clear the entire result. + /// + /// The type of the item. + /// The source. + /// The change. + internal static void ClearOrRemoveMany(this IList source, Change change) + where T : notnull + { + // apply this to other operators + if (source.Count == change.Range.Count) + { + source.Clear(); + } + else + { + source.RemoveMany(change.Range); + } + } + + /// + /// Executes the MovedWithinRange operation. + /// + /// The type of the T value. + /// The source value. + /// The startIndex value. + /// The endIndex value. + /// The result of the operation. + internal static bool MovedWithinRange(this Change source, int startIndex, int endIndex) + where T : notnull + { + if (source.Reason != ListChangeReason.Moved) + { + return false; + } + + var current = source.Item.CurrentIndex; + var previous = source.Item.PreviousIndex; + + return (current >= startIndex && current <= endIndex) || (previous >= startIndex && previous <= endIndex); + } + + /// + /// Executes the Clone operation. + /// + /// The type of the T value. + /// The source value. + /// The item value. + /// The equalityComparer value. + private static void Clone(this IList source, Change item, IEqualityComparer equalityComparer) + where T : notnull + { + var changeAware = source as ChangeAwareList; + + switch (item.Reason) + { + case ListChangeReason.Add: + { + var change = item.Item; + var hasIndex = change.CurrentIndex >= 0; + if (hasIndex) + { + source.Insert(change.CurrentIndex, change.Current); + } + else + { + source.Add(change.Current); + } + + break; + } + + case ListChangeReason.AddRange: + { + source.AddOrInsertRange(item.Range, item.Range.Index); + break; + } + + case ListChangeReason.Clear: + { + source.ClearOrRemoveMany(item); + break; + } + + case ListChangeReason.Replace: + { + var change = item.Item; + if (change.CurrentIndex >= 0 && change.CurrentIndex == change.PreviousIndex) + { + source[change.CurrentIndex] = change.Current; + } + else + { + if (change.PreviousIndex == -1) + { + source.Remove(change.Previous.Value); + } + else + { + // is this best? or replace + move? + source.RemoveAt(change.PreviousIndex); + } + + if (change.CurrentIndex == -1) + { + source.Add(change.Current); + } + else + { + source.Insert(change.CurrentIndex, change.Current); + } + } + + break; + } + + case ListChangeReason.Refresh: + { + if (changeAware is not null) + { + changeAware.RefreshAt(item.Item.CurrentIndex); + } + else + { + source.RemoveAt(item.Item.CurrentIndex); + source.Insert(item.Item.CurrentIndex, item.Item.Current); + } + + break; + } + + case ListChangeReason.Remove: + { + var change = item.Item; + var hasIndex = change.CurrentIndex >= 0; + if (hasIndex) + { + source.RemoveAt(change.CurrentIndex); + } + else + { + var index = source.IndexOf(change.Current, equalityComparer); + if (index > -1) + { + source.RemoveAt(index); + } + } + + break; + } + + case ListChangeReason.RemoveRange: + { + // ignore this case because WhereReasonsAre removes the index [in which case call RemoveMany] + //// if (item.Range.Index < 0) + //// throw new UnspecifiedIndexException("ListChangeReason.RemoveRange should not have an index specified index"); + if (item.Range.Index >= 0 && (source is IExtendedList || source is List)) + { + source.RemoveRange(item.Range.Index, item.Range.Count); + } + else + { + source.RemoveMany(item.Range); + } + + break; + } + + case ListChangeReason.Moved: + { + var change = item.Item; + var hasIndex = change.CurrentIndex >= 0; + if (!hasIndex) + { + throw new UnspecifiedIndexException("Cannot move as an index was not specified"); + } + + if (source is IExtendedList extendedList) + { + extendedList.Move(change.PreviousIndex, change.CurrentIndex); + } + else if (source is ObservableCollection observableCollection) + { + observableCollection.Move(change.PreviousIndex, change.CurrentIndex); + } + else + { + // check this works whatever the index is + source.RemoveAt(change.PreviousIndex); + source.Insert(change.CurrentIndex, change.Current); + } + + break; + } + } + } + + /// + /// Removes the number of items, starting at the specified index. + /// + /// The type of the item. + /// The source. + /// The index. + /// The count. + /// Cannot remove range. + private static void RemoveRange(this IList source, int index, int count) + { + ArgumentExceptionHelper.ThrowIfNull(source); + + switch (source) + { + case List list: + list.RemoveRange(index, count); + break; + case IExtendedList list: + list.RemoveRange(index, count); + break; + default: + throw new NotSupportedException($"Cannot remove range from {source.GetType().FullName}"); + } + } +} diff --git a/src/DynamicData/List/ListFilterPolicy.cs b/src/DynamicData/List/ListFilterPolicy.cs index 8b347a765..943ead2cf 100644 --- a/src/DynamicData/List/ListFilterPolicy.cs +++ b/src/DynamicData/List/ListFilterPolicy.cs @@ -1,8 +1,13 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Specifies which filter strategy should be used when the filter predicate is changed. diff --git a/src/DynamicData/List/ObservableListEx.Adapt.cs b/src/DynamicData/List/ObservableListEx.Adapt.cs index 942d943c7..a9338b0a7 100644 --- a/src/DynamicData/List/ObservableListEx.Adapt.cs +++ b/src/DynamicData/List/ObservableListEx.Adapt.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,31 +22,31 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Injects a side effect into a changeset stream via an . + /// Injects a side effect into a changeset stream via an IChangeSetAdaptor<T>. /// The adaptor's Adapt method is invoked for each changeset before it is forwarded downstream unchanged. /// /// The type of items in the list. - /// The source to observe and adapt. - /// The adaptor whose Adapt method is invoked for each changeset. + /// The source IObservable<IChangeSet<T>> to observe and adapt. + /// The IChangeSetAdaptor<T> adaptor whose Adapt method is invoked for each changeset. /// A list changeset stream identical to the source, with the adaptor side effect applied. /// or is . /// /// - /// This is the primary extension point for custom UI binding adaptors (e.g., + /// This is the primary extension point for custom UI binding adaptors (e.g., Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, BindingOptions) /// delegates to this operator). If the adaptor throws, the exception propagates downstream as OnError. /// /// - /// + /// Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, BindingOptions) public static IObservable> Adapt(this IObservable> source, IChangeSetAdaptor adaptor) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - adaptor.ThrowArgumentNullExceptionIfNull(nameof(adaptor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(adaptor); return Observable.Create>( observer => { - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); return source.Synchronize(locker).Select( changes => { diff --git a/src/DynamicData/List/ObservableListEx.AddKey.cs b/src/DynamicData/List/ObservableListEx.AddKey.cs index 0ead13a87..c2e894bd6 100644 --- a/src/DynamicData/List/ObservableListEx.AddKey.cs +++ b/src/DynamicData/List/ObservableListEx.AddKey.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Linq; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,9 +26,9 @@ public static partial class ObservableListEx /// /// The type of items in the list. /// The type of the key. - /// The source to add keys to, converting to a cache changeset. - /// A function to extract a unique key from each item. - /// A cache changeset stream with keyed items. + /// The source IObservable<IChangeSet<TObject>> to add keys to, converting to a cache changeset. + /// A Func<T, TResult> function to extract a unique key from each item. + /// A cache IObservable<IChangeSet<TObject, TKey>> changeset stream with keyed items. /// or is . /// /// @@ -38,13 +36,13 @@ public static partial class ObservableListEx /// Use this when you need to transition from list-based pipelines to cache-based operators (Filter by key, Join, Group, etc.). /// /// - /// + /// ObservableCacheEx.RemoveKey<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable> AddKey(this IObservable> source, Func keySelector) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return source.Select(changes => new ChangeSet(new AddKeyEnumerator(changes, keySelector))); } diff --git a/src/DynamicData/List/ObservableListEx.And.cs b/src/DynamicData/List/ObservableListEx.And.cs index 2dee36d90..764233ad9 100644 --- a/src/DynamicData/List/ObservableListEx.And.cs +++ b/src/DynamicData/List/ObservableListEx.And.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +26,8 @@ public static partial class ObservableListEx /// Only items present in ALL sources appear in the result. /// /// The type of items in the lists. - /// The first source to intersect. - /// The additional changeset streams to intersect with. + /// The first source IObservable<IChangeSet<T>> to intersect. + /// The additional IObservable<IChangeSet<T>> changeset streams to intersect with. /// A list changeset stream containing items that exist in every source. /// is . /// @@ -47,50 +45,66 @@ public static partial class ObservableListEx /// /// Worth noting: Item identity uses object equality, not position. Duplicate items in a single source are reference-counted independently. /// - /// - /// - /// - /// + /// Or<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Except<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Xor<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// ObservableCacheEx.And<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) public static IObservable> And(this IObservable> source, params IObservable>[] others) where T : notnull { - others.ThrowArgumentNullExceptionIfNull(nameof(others)); + ArgumentExceptionHelper.ThrowIfNull(others); return source.Combine(CombineOperator.And, others); } - /// - /// A of changeset streams to intersect. + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// A ICollection<T> of changeset streams to intersect. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// This overload accepts a pre-built collection of sources instead of a params array. /// public static IObservable> And(this ICollection>> sources) where T : notnull => sources.Combine(CombineOperator.And); - /// - /// An of changeset streams. Sources can be added or removed dynamically. + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// An IObservableList<T> of changeset streams. Sources can be added or removed dynamically. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// This overload supports dynamic source management: adding or removing changeset streams from the observable list triggers re-evaluation. /// public static IObservable> And(this IObservableList>> sources) where T : notnull => sources.Combine(CombineOperator.And); - /// - /// An of . Each inner list's changes are connected automatically. + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// An IObservableList<IObservableList<T>> of IObservableList<IObservableList<T>>. Each inner list's changes are connected automatically. + /// The resulting observable sequence. /// - /// - /// This overload accepts instances directly, calling Connect() internally. + /// This overload follows the same core behavior as the related overload. + /// This overload accepts IObservableList<T> instances directly, calling Connect() internally. /// public static IObservable> And(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.And); - /// - /// An of . Each inner list's changes are connected automatically. + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// An IObservableList<ISourceList<T>> of ISourceList<T>. Each inner list's changes are connected automatically. + /// The resulting observable sequence. /// - /// - /// This overload accepts instances directly, calling Connect() internally. + /// This overload follows the same core behavior as the related overload. + /// This overload accepts ISourceList<T> instances directly, calling Connect() internally. /// public static IObservable> And(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.And); diff --git a/src/DynamicData/List/ObservableListEx.AsObservableList.cs b/src/DynamicData/List/ObservableListEx.AsObservableList.cs index 478ae5b63..471219da6 100644 --- a/src/DynamicData/List/ObservableListEx.AsObservableList.cs +++ b/src/DynamicData/List/ObservableListEx.AsObservableList.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,40 +22,40 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Wraps a as a read-only , hiding mutation methods. + /// Wraps a ISourceList<T> as a read-only IObservableList<T>, hiding mutation methods. /// /// The type of items in the list. - /// The mutable source list to wrap. + /// The ISourceList<T> mutable source list to wrap. /// A read-only observable list that mirrors the source. /// is . public static IObservableList AsObservableList(this ISourceList source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new AnonymousObservableList(source); } /// - /// Materializes a changeset stream into a read-only . + /// Materializes a changeset stream into a read-only IObservableList<T>. /// The list is kept in sync with the source stream for the lifetime of the subscription. /// /// The type of items in the list. - /// The source to materialize into a read-only list. + /// The source IObservable<IChangeSet<T>> to materialize into a read-only list. /// A read-only observable list reflecting the current state of the stream. /// is . /// /// - /// This is the primary way to multicast a changeset pipeline. Materializing once into an , + /// This is the primary way to multicast a changeset pipeline. Materializing once into an IObservableList<T>, /// then calling Connect() on the result for each downstream consumer, ensures the upstream operators are evaluated only once /// regardless of how many subscribers consume the result. /// /// - /// + /// AsObservableList<T>(ISourceList<T>) public static IObservableList AsObservableList(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new AnonymousObservableList(source); } diff --git a/src/DynamicData/List/ObservableListEx.AutoRefresh.cs b/src/DynamicData/List/ObservableListEx.AutoRefresh.cs index d5e0660f8..40f03e7b3 100644 --- a/src/DynamicData/List/ObservableListEx.AutoRefresh.cs +++ b/src/DynamicData/List/ObservableListEx.AutoRefresh.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,7 +26,7 @@ public static partial class ObservableListEx /// changes when any property changes, causing downstream operators to re-evaluate. /// /// The type of items, which must implement . - /// The source to monitor for property-driven refresh signals. + /// The source IObservable<IChangeSet<TObject>> to monitor for property-driven refresh signals. /// An optional buffer duration to batch multiple refresh signals into a single changeset. /// An optional throttle applied to each item's property change notifications. /// The scheduler for throttle and buffer timing. Defaults to . @@ -36,8 +34,8 @@ public static partial class ObservableListEx /// is . /// /// - /// Wraps using WhenAnyPropertyChanged() as the re-evaluator. - /// Pair with or + /// Wraps AutoRefreshOnObservable<TObject, TAny> using WhenAnyPropertyChanged() as the re-evaluator. + /// Pair with Filter<T>(IObservable<IChangeSet<T>>, Func<T, bool>) or Sort<T>(IObservable<IChangeSet<T>>, IComparer<T>, SortOptions, IObservable<Unit>?, IObservable<IComparer<T>>?, int) /// to get reactive re-evaluation on property changes. /// /// @@ -50,14 +48,14 @@ public static partial class ObservableListEx /// /// Worth noting: Each item generates a subscription. For large lists with frequent property changes, use and to reduce churn. /// - /// - /// - /// - /// + /// AutoRefresh<TObject, TProperty>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TProperty>>, TimeSpan?, TimeSpan?, IScheduler?) + /// AutoRefreshOnObservable<TObject, TAny>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<TAny>>, TimeSpan?, IScheduler?) + /// SuppressRefresh<T>(IObservable<IChangeSet<T>>) + /// ObservableCacheEx.AutoRefresh<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, TimeSpan?, TimeSpan?, IScheduler?) public static IObservable> AutoRefresh(this IObservable> source, TimeSpan? changeSetBuffer = null, TimeSpan? propertyChangeThrottle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.AutoRefreshOnObservable( t => @@ -78,12 +76,20 @@ public static IObservable> AutoRefresh(this IObserv /// and emits Refresh changes when that property changes, causing downstream operators to re-evaluate. More efficient than /// the all-properties overload when only one property (of type ) affects downstream behavior. /// - /// + /// The type of the TObject value. + /// The type of the TProperty value. + /// This overload follows the same core behavior as the related overload. + /// The source value. + /// The propertyAccessor value. + /// The changeSetBuffer value. + /// The propertyChangeThrottle value. + /// The scheduler value. + /// The resulting observable sequence. public static IObservable> AutoRefresh(this IObservable> source, Expression> propertyAccessor, TimeSpan? changeSetBuffer = null, TimeSpan? propertyChangeThrottle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); return source.AutoRefreshOnObservable( t => diff --git a/src/DynamicData/List/ObservableListEx.AutoRefreshOnObservable.cs b/src/DynamicData/List/ObservableListEx.AutoRefreshOnObservable.cs index dc3ede92c..58658fe13 100644 --- a/src/DynamicData/List/ObservableListEx.AutoRefreshOnObservable.cs +++ b/src/DynamicData/List/ObservableListEx.AutoRefreshOnObservable.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,15 +27,15 @@ public static partial class ObservableListEx /// /// The type of items in the list. /// The type emitted by the re-evaluator observable (value is ignored). - /// The source to monitor for observable-driven refresh signals. - /// A factory that, given an item, returns an observable whose emissions trigger a Refresh for that item. + /// The source IObservable<IChangeSet<TObject>> to monitor for observable-driven refresh signals. + /// A Func<T, TResult> factory that, given an item, returns an observable whose emissions trigger a Refresh for that item. /// An optional buffer duration to batch refresh signals into a single changeset. /// The for buffering. /// A list changeset stream with additional Refresh changes injected when per-item observables fire. /// or is . /// /// - /// This is the general-purpose refresh mechanism. + /// This is the general-purpose refresh mechanism. AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) /// is a convenience wrapper that uses WhenAnyPropertyChanged() as the re-evaluator. /// /// @@ -49,14 +47,14 @@ public static partial class ObservableListEx /// Re-evaluator firesThe item's current index is looked up and a Refresh change is emitted. /// /// - /// - /// - /// + /// AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) + /// SuppressRefresh<T>(IObservable<IChangeSet<T>>) + /// ObservableCacheEx.AutoRefreshOnObservable<TObject, TKey, TAny>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TAny>>, TimeSpan?, IScheduler?) public static IObservable> AutoRefreshOnObservable(this IObservable> source, Func> reevaluator, TimeSpan? changeSetBuffer = null, IScheduler? scheduler = null) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - reevaluator.ThrowArgumentNullExceptionIfNull(nameof(reevaluator)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(reevaluator); return new AutoRefresh(source, reevaluator, changeSetBuffer, scheduler).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.Bind.cs b/src/DynamicData/List/ObservableListEx.Bind.cs index fe14bece5..15b26aa0b 100644 --- a/src/DynamicData/List/ObservableListEx.Bind.cs +++ b/src/DynamicData/List/ObservableListEx.Bind.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,17 +22,17 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Applies changeset mutations to a target for UI data binding. + /// Applies changeset mutations to a target IObservableCollection<T> for UI data binding. /// /// The type of items in the list. - /// The source to bind to a collection. - /// The target collection to keep in sync. + /// The source IObservable<IChangeSet<T>> to bind to a collection. + /// The IObservableCollection<T> target collection to keep in sync. /// When a changeset exceeds this many changes, the collection is reset instead of applying individual changes. /// A continuation of the source changeset stream (allows further chaining). /// or is . /// /// - /// Delegates to with an internal collection adaptor. + /// Delegates to Adapt<T>(IObservable<IChangeSet<T>>, IChangeSetAdaptor<T>) with an internal collection adaptor. /// Each changeset is applied to the target collection on the calling thread. For UI binding, ensure the source is /// observed on the UI thread (e.g., via ObserveOn). /// @@ -49,16 +47,16 @@ public static partial class ObservableListEx /// RefreshDepends on the adaptor implementation. /// /// - /// - /// - /// - /// - /// + /// Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, BindingOptions) + /// Bind<T>(IObservable<IChangeSet<T>>, out ReadOnlyObservableCollection<T>, int) + /// Clone<T>(IObservable<IChangeSet<T>>, IList<T>) + /// Adapt<T>(IObservable<IChangeSet<T>>, IChangeSetAdaptor<T>) + /// ObservableCacheEx.Bind<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservableCollection<TObject>, int) public static IObservable> Bind(this IObservable> source, IObservableCollection targetCollection, int resetThreshold = BindingOptions.DefaultResetThreshold) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - targetCollection.ThrowArgumentNullExceptionIfNull(nameof(targetCollection)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(targetCollection); // if user has not specified different defaults, use system wide defaults instead. // This is a hack to retro fit system wide defaults which override the hard coded defaults above @@ -74,31 +72,41 @@ public static IObservable> Bind(this IObservable> /// /// Binds the source changeset stream to , with fine-grained control over reset threshold and other behaviors. /// - /// + /// The type of the T value. + /// This overload follows the same core behavior as the related overload. + /// The source value. + /// The targetCollection value. + /// The options value. + /// The resulting observable sequence. public static IObservable> Bind(this IObservable> source, IObservableCollection targetCollection, BindingOptions options) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - targetCollection.ThrowArgumentNullExceptionIfNull(nameof(targetCollection)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(targetCollection); var adaptor = new ObservableCollectionAdaptor(targetCollection, options); return source.Adapt(adaptor); } /// - /// Constructs a and binds the changeset stream to it. + /// Constructs a ReadOnlyObservableCollection<T> and binds the changeset stream to it. /// Use this overload when you need a read-only view (typically for UI binding) without managing the backing collection yourself. /// The created collection is returned via the output parameter. /// - /// + /// The type of the T value. + /// This overload follows the same core behavior as the related overload. + /// The source value. + /// The readOnlyObservableCollection value. + /// The resetThreshold value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// The created collection is backed by an internal ObservableCollectionExtended<T>. Callers receive only the read-only wrapper. /// public static IObservable> Bind(this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, int resetThreshold = BindingOptions.DefaultResetThreshold) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); // if user has not specified different defaults, use system wide defaults instead. // This is a hack to retro fit system wide defaults which override the hard coded defaults above @@ -111,19 +119,24 @@ public static IObservable> Bind(this IObservable> } /// - /// Constructs a and binds the changeset stream to it, + /// Constructs a ReadOnlyObservableCollection<T> and binds the changeset stream to it, /// with fine-grained control over reset threshold and other behaviors. /// The created collection is returned via the output parameter. /// - /// + /// The type of the T value. + /// This overload follows the same core behavior as the related overload. + /// The source value. + /// The readOnlyObservableCollection value. + /// The options value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// The created collection is backed by an internal ObservableCollectionExtended<T>. Callers receive only the read-only wrapper. /// public static IObservable> Bind(this IObservable> source, out ReadOnlyObservableCollection readOnlyObservableCollection, BindingOptions options) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); var target = new ObservableCollectionExtended(); var result = new ReadOnlyObservableCollection(target); @@ -131,17 +144,22 @@ public static IObservable> Bind(this IObservable> readOnlyObservableCollection = result; return source.Adapt(adaptor); } - #if SUPPORTS_BINDINGLIST + /// - /// Binds the source changeset stream to a WinForms , keeping in sync. + /// Binds the source changeset stream to a WinForms BindingList<T>, keeping in sync. /// - /// + /// The type of the T value. + /// This overload follows the same core behavior as the related overload. + /// The source value. + /// The bindingList value. + /// The resetThreshold value. + /// The resulting observable sequence. public static IObservable> Bind<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this IObservable> source, BindingList bindingList, int resetThreshold = BindingOptions.DefaultResetThreshold) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - bindingList.ThrowArgumentNullExceptionIfNull(nameof(bindingList)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(bindingList); return source.Adapt(new BindingListAdaptor(bindingList, resetThreshold)); } diff --git a/src/DynamicData/List/ObservableListEx.BufferIf.cs b/src/DynamicData/List/ObservableListEx.BufferIf.cs index 37224290f..d97e8032e 100644 --- a/src/DynamicData/List/ObservableListEx.BufferIf.cs +++ b/src/DynamicData/List/ObservableListEx.BufferIf.cs @@ -1,53 +1,74 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. /// public static partial class ObservableListEx { - /// + /// + /// Provides an overload of BufferIf for the supplied arguments. + /// + /// The type of the T value. + /// The source value. + /// The pauseIfTrueSelector value. + /// The scheduler value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// This overload starts unpaused and has no timeout. /// public static IObservable> BufferIf(this IObservable> source, IObservable pauseIfTrueSelector, IScheduler? scheduler = null) where T : notnull => BufferIf(source, pauseIfTrueSelector, false, scheduler); - /// + /// + /// Provides an overload of BufferIf for the supplied arguments. + /// + /// The type of the T value. + /// The source value. + /// The pauseIfTrueSelector value. + /// The initialPauseState value. + /// The scheduler value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// This overload allows setting the initial pause state but has no timeout. /// public static IObservable> BufferIf(this IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState, IScheduler? scheduler = null) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pauseIfTrueSelector.ThrowArgumentNullExceptionIfNull(nameof(pauseIfTrueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pauseIfTrueSelector); return BufferIf(source, pauseIfTrueSelector, initialPauseState, null, scheduler); } - /// + /// + /// Provides an overload of BufferIf for the supplied arguments. + /// + /// The type of the T value. + /// The source value. + /// The pauseIfTrueSelector value. + /// The timeOut value. + /// The scheduler value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// This overload starts unpaused and accepts a timeout but not an explicit initial pause state. /// public static IObservable> BufferIf(this IObservable> source, IObservable pauseIfTrueSelector, TimeSpan? timeOut, IScheduler? scheduler = null) @@ -57,8 +78,8 @@ public static IObservable> BufferIf(this IObservable /// The type of items in the list. - /// The source to conditionally buffer. - /// An of that controls buffering: pauses (buffers), resumes (flushes). + /// The source IObservable<IChangeSet<T>> to conditionally buffer. + /// An IObservable<bool> of that controls buffering: pauses (buffers), resumes (flushes). /// The initial pause state. When , buffering starts immediately. /// An optional maximum duration to keep the buffer open. After this time, the buffer is flushed regardless of pause state. /// The for timeout scheduling. @@ -84,8 +105,8 @@ public static IObservable> BufferIf(this IObservable> BufferIf(this IObservable> source, IObservable pauseIfTrueSelector, bool initialPauseState, TimeSpan? timeOut, IScheduler? scheduler = null) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - pauseIfTrueSelector.ThrowArgumentNullExceptionIfNull(nameof(pauseIfTrueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(pauseIfTrueSelector); return new BufferIf(source, pauseIfTrueSelector, initialPauseState, timeOut, scheduler).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.BufferInitial.cs b/src/DynamicData/List/ObservableListEx.BufferInitial.cs index 17ad6d43b..2db1b3e34 100644 --- a/src/DynamicData/List/ObservableListEx.BufferInitial.cs +++ b/src/DynamicData/List/ObservableListEx.BufferInitial.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,7 +18,7 @@ public static partial class ObservableListEx /// Buffers changesets during an initial time window, then emits a single combined changeset and passes through subsequent changes. /// /// The type of items in the list. - /// The source to buffer during the initial loading period. + /// The source IObservable<IChangeSet<TObject>> to buffer during the initial loading period. /// The time period (measured from first emission) during which changes are buffered. /// The for timing the buffer window. /// A list changeset stream where the initial burst is combined into one changeset. @@ -37,8 +28,8 @@ public static partial class ObservableListEx /// After this initial window, subsequent changesets pass through immediately. /// /// - /// - /// + /// DeferUntilLoaded<T>(IObservable<IChangeSet<T>>) + /// FlattenBufferResult<T>(IObservable<IList<IChangeSet<T>>>) public static IObservable> BufferInitial(this IObservable> source, TimeSpan initialBuffer, IScheduler? scheduler = null) where TObject : notnull => source.DeferUntilLoaded().Publish( shared => diff --git a/src/DynamicData/List/ObservableListEx.Cast.cs b/src/DynamicData/List/ObservableListEx.Cast.cs index 7c0f9aad7..dadbc1117 100644 --- a/src/DynamicData/List/ObservableListEx.Cast.cs +++ b/src/DynamicData/List/ObservableListEx.Cast.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,15 +18,15 @@ public static partial class ObservableListEx /// Casts each item in the changeset from object to using a direct cast. /// /// The target type to cast to. - /// The source of object items. + /// The source IObservable<IChangeSet<object>> of object items. /// A list changeset stream of cast items. /// is . - /// - /// + /// Cast<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>) + /// CastToObject<T>(IObservable<IChangeSet<T>>) public static IObservable> Cast(this IObservable> source) where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Select(changes => changes.Transform(t => (TDestination)t)); } @@ -45,20 +36,19 @@ public static IObservable> Cast(this IObs /// /// The source item type. /// The destination item type. - /// The source to cast. - /// A function to convert each item from to . + /// The source IObservable<IChangeSet<TSource>> to cast. + /// A Func<T, TResult> function to convert each item from to . /// A list changeset stream of converted items. /// or is . - /// Use this overload when type inference requires explicit specification of both source and destination types. Alternatively, call first, then the single-type-parameter overload. - /// - /// + /// Use this overload when type inference requires explicit specification of both source and destination types. Alternatively, call CastToObject<T> first, then the single-type-parameter Cast<TDestination> overload. + /// Cast<TDestination>(IObservable<IChangeSet<object>>) + /// Transform<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>, bool) public static IObservable> Cast(this IObservable> source, Func conversionFactory) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - conversionFactory.ThrowArgumentNullExceptionIfNull(nameof(conversionFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(conversionFactory); return source.Select(changes => changes.Transform(conversionFactory)); } diff --git a/src/DynamicData/List/ObservableListEx.CastToObject.cs b/src/DynamicData/List/ObservableListEx.CastToObject.cs index 4695297da..6e0601e46 100644 --- a/src/DynamicData/List/ObservableListEx.CastToObject.cs +++ b/src/DynamicData/List/ObservableListEx.CastToObject.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,12 +15,16 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Casts each item in the changeset to object. Typically used before to work around type inference limitations. + /// Casts each item in the changeset to object. Typically used before Cast<TDestination>(IObservable<IChangeSet<object>>) to work around type inference limitations. /// /// The source item type (must be a reference type). - /// The source to cast to object. + /// The source IObservable<IChangeSet<T>> to cast to object. /// A list changeset stream of object items. - /// + /// Cast<TDestination>(IObservable<IChangeSet<object>>) public static IObservable> CastToObject(this IObservable> source) - where T : class => source.Select(changes => changes.Transform(t => (object)t)); + where T : class + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.Select(changes => changes.Transform(t => (object)t)); + } } diff --git a/src/DynamicData/List/ObservableListEx.Clone.cs b/src/DynamicData/List/ObservableListEx.Clone.cs index 2588c8927..fb2742b74 100644 --- a/src/DynamicData/List/ObservableListEx.Clone.cs +++ b/src/DynamicData/List/ObservableListEx.Clone.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,19 +25,19 @@ public static partial class ObservableListEx /// Applies each changeset to the target list as a side effect, keeping it synchronized with the source. /// /// The type of items in the list. - /// The source to clone. - /// The target list to clone changes into. + /// The source IObservable<IChangeSet<T>> to clone. + /// The IList<T> target list to clone changes into. /// A continuation of the source changeset stream. /// is . /// - /// Lower-level than . Uses .Clone() to apply all changeset operations directly. + /// Lower-level than Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, int). Uses IList<T>.Clone() to apply all changeset operations directly. /// - /// - /// + /// Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, int) + /// PopulateInto<T>(IObservable<IChangeSet<T>>, ISourceList<T>) public static IObservable> Clone(this IObservable> source, IList target) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Do(target.Clone); } diff --git a/src/DynamicData/List/ObservableListEx.Combine.cs b/src/DynamicData/List/ObservableListEx.Combine.cs index 13a617439..82dd3f381 100644 --- a/src/DynamicData/List/ObservableListEx.Combine.cs +++ b/src/DynamicData/List/ObservableListEx.Combine.cs @@ -1,41 +1,59 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. /// public static partial class ObservableListEx { + /// + /// Executes the Combine operation. + /// + /// The type of the T value. + /// The sources value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this ICollection>> sources, CombineOperator type) where T : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return new Combiner(sources, type).Run(); } + /// + /// Executes the Combine operation. + /// + /// The type of the T value. + /// The source value. + /// The type value. + /// The others value. + /// The result of the operation. private static IObservable> Combine(this IObservable> source, CombineOperator type, params IObservable>[] others) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - others.ThrowArgumentNullExceptionIfNull(nameof(others)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(others); if (others.Length == 0) { @@ -46,10 +64,17 @@ private static IObservable> Combine(this IObservable(items, type).Run(); } + /// + /// Executes the Combine operation. + /// + /// The type of the T value. + /// The sources value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this IObservableList> sources, CombineOperator type) where T : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return Observable.Create>( observer => @@ -60,10 +85,17 @@ private static IObservable> Combine(this IObservableList + /// Executes the Combine operation. + /// + /// The type of the T value. + /// The sources value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this IObservableList> sources, CombineOperator type) where T : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return Observable.Create>( observer => @@ -74,10 +106,17 @@ private static IObservable> Combine(this IObservableList + /// Executes the Combine operation. + /// + /// The type of the T value. + /// The sources value. + /// The type value. + /// The result of the operation. private static IObservable> Combine(this IObservableList>> sources, CombineOperator type) where T : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return new DynamicCombiner(sources, type).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.Convert.cs b/src/DynamicData/List/ObservableListEx.Convert.cs index 4380c296d..1d3af140b 100644 --- a/src/DynamicData/List/ObservableListEx.Convert.cs +++ b/src/DynamicData/List/ObservableListEx.Convert.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,17 +20,16 @@ public static partial class ObservableListEx /// /// The type of items in the list. /// The type of the destination items. - /// The source to convert. - /// The conversion factory. + /// The source IObservable<IChangeSet<TObject>> to convert. + /// The Func<T, TResult> conversion factory. /// An observable which emits the change set. [Obsolete("Prefer Cast as it is does the same thing but is semantically correct")] public static IObservable> Convert(this IObservable> source, Func conversionFactory) where TObject : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - conversionFactory.ThrowArgumentNullExceptionIfNull(nameof(conversionFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(conversionFactory); return source.Select(changes => changes.Transform(conversionFactory)); } diff --git a/src/DynamicData/List/ObservableListEx.DeferUntilLoaded.cs b/src/DynamicData/List/ObservableListEx.DeferUntilLoaded.cs index 1e6b5d037..2d1b0ee88 100644 --- a/src/DynamicData/List/ObservableListEx.DeferUntilLoaded.cs +++ b/src/DynamicData/List/ObservableListEx.DeferUntilLoaded.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,7 +25,7 @@ public static partial class ObservableListEx /// Defers downstream delivery until the source emits its first changeset, then forwards all subsequent changesets. /// /// The type of the object. - /// The source to defer until the first changeset arrives. + /// The source IObservable<IChangeSet<T>> to defer until the first changeset arrives. /// A list changeset stream that begins emitting only after the source has produced its first changeset. /// is . /// @@ -36,25 +34,30 @@ public static partial class ObservableListEx /// the initial data and all subsequent changesets. This is useful when downstream consumers should not receive an empty initial state. /// /// - /// - /// + /// SkipInitial<T>(IObservable<IChangeSet<T>>) + /// StartWithEmpty<T>(IObservable<IChangeSet<T>>) public static IObservable> DeferUntilLoaded(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DeferUntilLoaded(source).Run(); } - /// + /// + /// Provides an overload of DeferUntilLoaded for the supplied arguments. + /// + /// The type of the T value. + /// The source value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// Convenience overload that calls source.Connect().DeferUntilLoaded(). /// public static IObservable> DeferUntilLoaded(this IObservableList source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Connect().DeferUntilLoaded(); } diff --git a/src/DynamicData/List/ObservableListEx.DisposeMany.cs b/src/DynamicData/List/ObservableListEx.DisposeMany.cs index ec463f21d..0f7187779 100644 --- a/src/DynamicData/List/ObservableListEx.DisposeMany.cs +++ b/src/DynamicData/List/ObservableListEx.DisposeMany.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,7 +26,7 @@ public static partial class ObservableListEx /// All remaining tracked items are disposed when the stream finalizes (OnCompleted, OnError, or subscription disposal). /// /// The type of the object. - /// The source to track for disposal on removal. + /// The source IObservable<IChangeSet<T>> to track for disposal on removal. /// A continuation of the source changeset stream with disposal side effects applied. /// is . /// @@ -47,13 +45,13 @@ public static partial class ObservableListEx /// /// Worth noting: Disposal happens after the changeset is delivered downstream, so subscribers see the change before items are disposed. /// - /// - /// - /// + /// OnItemRemoved<T>(IObservable<IChangeSet<T>>, Action<T>, bool) + /// SubscribeMany<T>(IObservable<IChangeSet<T>>, Func<T, IDisposable>) + /// ObservableCacheEx.DisposeMany<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable> DisposeMany(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new DisposeMany(source).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.DistinctValues.cs b/src/DynamicData/List/ObservableListEx.DistinctValues.cs index 39181d6c8..35fa24102 100644 --- a/src/DynamicData/List/ObservableListEx.DistinctValues.cs +++ b/src/DynamicData/List/ObservableListEx.DistinctValues.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +26,8 @@ public static partial class ObservableListEx /// /// The type of items in the source list. /// The type of distinct values produced. - /// The source to extract distinct values. - /// A function that extracts the value to track from each source item. + /// The source IObservable<IChangeSet<TObject>> to extract distinct values. + /// A Func<T, TResult> function that extracts the value to track from each source item. /// A list changeset stream of distinct values. /// or is . /// @@ -46,14 +44,13 @@ public static partial class ObservableListEx /// ClearAll reference counts cleared. Remove emitted for every tracked distinct value. /// /// - /// + /// ObservableCacheEx.DistinctValues<TObject, TKey, TValue>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, TValue>) public static IObservable> DistinctValues(this IObservable> source, Func valueSelector) where TObject : notnull where TValue : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - valueSelector.ThrowArgumentNullExceptionIfNull(nameof(valueSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(valueSelector); return new Distinct(source, valueSelector).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.Except.cs b/src/DynamicData/List/ObservableListEx.Except.cs index 7c19912d8..b4f7d2fc0 100644 --- a/src/DynamicData/List/ObservableListEx.Except.cs +++ b/src/DynamicData/List/ObservableListEx.Except.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +26,8 @@ public static partial class ObservableListEx /// Items present in the first source but not in any of the are included in the result. /// /// The type of the item. - /// The primary from which other streams are subtracted. - /// The other changeset streams to exclude from the result. + /// The primary IObservable<IChangeSet<T>> from which other streams are subtracted. + /// The other IObservable<IChangeSet<T>> changeset streams to exclude from the result. /// A list changeset stream containing items from that are not in any of . /// is . /// @@ -48,48 +46,68 @@ public static partial class ObservableListEx /// MovedIgnored by the set logic (no positional semantics). /// RefreshForwarded if the item is currently in the result set. /// - /// Worth noting: Unlike , the first source is asymmetric: only its items can appear in the result. + /// Worth noting: Unlike Or<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]), the first source is asymmetric: only its items can appear in the result. /// - /// - /// - /// - /// + /// And<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Or<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Xor<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// ObservableCacheEx.Except<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) public static IObservable> Except(this IObservable> source, params IObservable>[] others) where T : notnull { - others.ThrowArgumentNullExceptionIfNull(nameof(others)); + ArgumentExceptionHelper.ThrowIfNull(others); return source.Combine(CombineOperator.Except, others); } - /// + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. /// - /// + /// This overload follows the same core behavior as the related overload. /// Static overload accepting a pre-built collection of sources. The first item in the collection is the primary source. /// public static IObservable> Except(this ICollection>> sources) where T : notnull => sources.Combine(CombineOperator.Except); - /// + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. /// - /// - /// Dynamic overload: sources can be added or removed from the at runtime. The first source in the list acts as the primary. + /// This overload follows the same core behavior as the related overload. + /// Dynamic overload: sources can be added or removed from the IObservableList<T> at runtime. The first source in the list acts as the primary. /// public static IObservable> Except(this IObservableList>> sources) where T : notnull => sources.Combine(CombineOperator.Except); - /// + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. /// - /// - /// Dynamic overload accepting of . Each inner list's Connect() is used as a source. + /// This overload follows the same core behavior as the related overload. + /// Dynamic overload accepting IObservableList<T> of IObservableList<T>. Each inner list's Connect() is used as a source. /// public static IObservable> Except(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.Except); - /// + /// + /// Provides an overload of Combine for the supplied arguments. + /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. /// - /// - /// Dynamic overload accepting of . Each inner list's Connect() is used as a source. + /// This overload follows the same core behavior as the related overload. + /// Dynamic overload accepting IObservableList<T> of ISourceList<T>. Each inner list's Connect() is used as a source. /// public static IObservable> Except(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.Except); diff --git a/src/DynamicData/List/ObservableListEx.ExpireAfter.cs b/src/DynamicData/List/ObservableListEx.ExpireAfter.cs index 4df348372..a92c0da88 100644 --- a/src/DynamicData/List/ObservableListEx.ExpireAfter.cs +++ b/src/DynamicData/List/ObservableListEx.ExpireAfter.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,14 +19,14 @@ public static partial class ObservableListEx /// Returns an observable of the items that were expired and removed. /// /// The type of the item. - /// The source list to apply time-based expiration to. - /// A function returning the time-to-live for each item. Return for items that should never expire. + /// The ISourceList<T> source list to apply time-based expiration to. + /// A Func<T, TResult> function returning the time-to-live for each item. Return for items that should never expire. /// An optional polling interval to batch expiry checks. If omitted, a separate timer is created for each unique expiry time. /// The scheduler for scheduling expiry timers. Defaults to . /// An observable that emits collections of items each time expired items are removed from the source list. /// /// - /// This operator acts directly on an , not on a changeset stream. It monitors items as they are added, + /// This operator acts directly on an ISourceList<T>, not on a changeset stream. It monitors items as they are added, /// schedules their removal, and physically removes them from the source list when their time expires. /// /// @@ -44,8 +35,8 @@ public static partial class ObservableListEx /// /// Worth noting: The returned observable emits the expired items (not changesets). Subscribe to this observable to trigger the expiry mechanism; if not subscribed, no items will be removed. /// - /// - /// + /// LimitSizeTo<T>(ISourceList<T>, int, IScheduler?) + /// ToObservableChangeSet<T>(IObservable<T>, Func<T, TimeSpan?>, IScheduler?) public static IObservable> ExpireAfter( this ISourceList source, Func timeSelector, diff --git a/src/DynamicData/List/ObservableListEx.Filter.cs b/src/DynamicData/List/ObservableListEx.Filter.cs index 2165375b0..764e05237 100644 --- a/src/DynamicData/List/ObservableListEx.Filter.cs +++ b/src/DynamicData/List/ObservableListEx.Filter.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +19,8 @@ public static partial class ObservableListEx /// Only items satisfying are included downstream. /// /// The type of items in the list. - /// The source to filter. - /// A predicate that determines which items are included. Items returning appear downstream; items returning are excluded. + /// The source IObservable<IChangeSet<T>> to filter. + /// A Func<T, TResult> predicate that determines which items are included. Items returning appear downstream; items returning are excluded. /// A list changeset stream containing only items that satisfy . /// Thrown when or is . /// @@ -50,12 +41,12 @@ public static partial class ObservableListEx /// RefreshThe predicate is re-evaluated. If the item now passes but previously did not, an Add is emitted. If it previously passed but no longer does, a Remove is emitted. If still passes, the Refresh is forwarded. If still fails, dropped. /// ClearAll downstream items are cleared. /// - /// Worth noting: Refresh events trigger re-evaluation, which can promote or demote items (turning a Refresh into an Add or Remove). Pair with for property-change-driven filtering. + /// Worth noting: Refresh events trigger re-evaluation, which can promote or demote items (turning a Refresh into an Add or Remove). Pair with AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) for property-change-driven filtering. /// - /// - /// - /// - /// + /// Filter<T>(IObservable<IChangeSet<T>>, IObservable<Func<T, bool>>, ListFilterPolicy) + /// FilterOnObservable<TObject>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<bool>>, TimeSpan?, IScheduler?) + /// AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableCacheEx.Filter<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, bool>, bool) public static IObservable> Filter( this IObservable> source, Func predicate) @@ -70,8 +61,8 @@ public static IObservable> Filter( /// When emits a new function, all items are re-evaluated. /// /// The type of the item. - /// The source to filter. - /// An that emits new predicate functions. Each emission triggers a full re-evaluation of all items. + /// The source IObservable<IChangeSet<T>> to filter. + /// An IObservable<Func<T, bool>> that emits new predicate functions. Each emission triggers a full re-evaluation of all items. /// The that controls re-filtering behavior when the predicate changes. /// A list changeset stream containing only items that satisfy the most recent predicate. /// @@ -92,14 +83,14 @@ public static IObservable> Filter( /// Worth noting: No items are included until emits its first function. /// /// or is . - /// - /// + /// Filter<T>(IObservable<IChangeSet<T>>, Func<T, bool>) + /// FilterOnObservable<TObject>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<bool>>, TimeSpan?, IScheduler?) public static IObservable> Filter(this IObservable> source, IObservable> predicate, ListFilterPolicy filterPolicy = ListFilterPolicy.CalculateDiff) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); + ArgumentExceptionHelper.ThrowIfNull(predicate); return new List.Internal.Filter.Dynamic(source, predicate, filterPolicy).Run(); } @@ -110,9 +101,9 @@ public static IObservable> Filter(this IObservable /// The type of the item. /// The type of state value required by . - /// The source to filter. - /// An stream of state values to be passed to . - /// A static predicate receiving the current state and an item, returning to include or to exclude. The function itself does not change; only the state value passed to it changes. + /// The source IObservable<IChangeSet<T>> to filter. + /// An IObservable<TState> stream of state values to be passed to . + /// A static Func<T, TResult> predicate receiving the current state and an item, returning to include or to exclude. The function itself does not change; only the state value passed to it changes. /// The that controls re-filtering behavior when the state changes. /// When (default), empty changesets are suppressed. Set to to publish empty changesets (useful for monitoring loading status). /// A list changeset stream containing only items satisfying with the current state. @@ -132,8 +123,8 @@ public static IObservable> Filter(this IObservableState changedAll items are re-evaluated with the new state value. The output is shaped by . /// /// - /// - /// + /// Filter<T>(IObservable<IChangeSet<T>>, Func<T, bool>) + /// Filter<T>(IObservable<IChangeSet<T>>, IObservable<Func<T, bool>>, ListFilterPolicy) public static IObservable> Filter( this IObservable> source, IObservable predicateState, diff --git a/src/DynamicData/List/ObservableListEx.FilterOnObservable.cs b/src/DynamicData/List/ObservableListEx.FilterOnObservable.cs index bd49bf1db..ca3146b56 100644 --- a/src/DynamicData/List/ObservableListEx.FilterOnObservable.cs +++ b/src/DynamicData/List/ObservableListEx.FilterOnObservable.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,11 +22,11 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Filters each item using a per-item of that dynamically controls inclusion. + /// Filters each item using a per-item IObservable<T> of that dynamically controls inclusion. /// When an item's observable emits the item enters the result; when it emits the item is removed. /// /// The type of items in the list. - /// The source to filter by property value. + /// The source IObservable<IChangeSet<TObject>> to filter by property value. /// A function that returns an observable of for each item, controlling its inclusion. /// An optional throttle duration applied to each per-item observable to reduce re-evaluation frequency. /// The used when throttling. Defaults to the system default scheduler. @@ -52,14 +50,14 @@ public static partial class ObservableListEx /// Emits If currently included, a Remove is emitted downstream. /// /// - /// - /// - /// - /// + /// Filter<T>(IObservable<IChangeSet<T>>, Func<T, bool>) + /// Filter<T>(IObservable<IChangeSet<T>>, IObservable<Func<T, bool>>, ListFilterPolicy) + /// AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableCacheEx.FilterOnObservable<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<bool>>, TimeSpan?, IScheduler?) public static IObservable> FilterOnObservable(this IObservable> source, Func> objectFilterObservable, TimeSpan? propertyChangedThrottle = null, IScheduler? scheduler = null) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new FilterOnObservable(source, objectFilterObservable, propertyChangedThrottle, scheduler).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.FilterOnProperty.cs b/src/DynamicData/List/ObservableListEx.FilterOnProperty.cs index b9b297d77..a82032922 100644 --- a/src/DynamicData/List/ObservableListEx.FilterOnProperty.cs +++ b/src/DynamicData/List/ObservableListEx.FilterOnProperty.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,26 +26,24 @@ public static partial class ObservableListEx /// /// The type of the object. Must implement . /// The type of the property. - /// The source to filter by property value. - /// selecting the property to monitor for changes. - /// A predicate evaluated against the item to determine inclusion. + /// The source IObservable<IChangeSet<TObject>> to filter by property value. + /// Expression<TDelegate> selecting the property to monitor for changes. + /// A Func<T, TResult> predicate evaluated against the item to determine inclusion. /// An optional throttle duration for property change notifications. /// The used when throttling. /// A list changeset stream of items satisfying the predicate, re-evaluated on property changes. /// - /// Deprecated. Use followed by instead. + /// Deprecated. Use AutoRefresh<TObject, TProperty>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TProperty>>, TimeSpan?, TimeSpan?, IScheduler?) followed by Filter<T>(IObservable<IChangeSet<T>>, Func<T, bool>) instead. /// - /// - /// + /// AutoRefresh<TObject, TProperty>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TProperty>>, TimeSpan?, TimeSpan?, IScheduler?) + /// Filter<T>(IObservable<IChangeSet<T>>, Func<T, bool>) [Obsolete("Use AutoRefresh(), followed by Filter() instead")] public static IObservable> FilterOnProperty(this IObservable> source, Expression> propertySelector, Func predicate, TimeSpan? propertyChangedThrottle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - propertySelector.ThrowArgumentNullExceptionIfNull(nameof(propertySelector)); - - predicate.ThrowArgumentNullExceptionIfNull(nameof(predicate)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertySelector); + ArgumentExceptionHelper.ThrowIfNull(predicate); return new FilterOnProperty(source, propertySelector, predicate, propertyChangedThrottle, scheduler).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.FlattenBufferResult.cs b/src/DynamicData/List/ObservableListEx.FlattenBufferResult.cs index 667a494ad..40f1fdf12 100644 --- a/src/DynamicData/List/ObservableListEx.FlattenBufferResult.cs +++ b/src/DynamicData/List/ObservableListEx.FlattenBufferResult.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,17 +15,21 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Flattens buffered changesets (e.g. from ) back into single changesets. + /// Flattens buffered changesets back into single changesets. /// Empty buffers are dropped. /// /// The type of the item. - /// The of buffered changeset lists. + /// The IObservable<T> of buffered changeset lists. /// A list changeset stream with all buffered changes concatenated into single changesets. /// /// Use this after applying Observable.Buffer() to a changeset stream to re-merge the batched changesets into a single stream. /// - /// - /// + /// BufferIf<T>(IObservable<IChangeSet<T>>, IObservable<bool>, IScheduler?) + /// BufferInitial<T>(IObservable<IChangeSet<T>>, TimeSpan, IScheduler?) public static IObservable> FlattenBufferResult(this IObservable>> source) - where T : notnull => source.Where(x => x.Count != 0).Select(updates => new ChangeSet(updates.SelectMany(u => u))); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + return source.Where(x => x.Count != 0).Select(updates => new ChangeSet(updates.SelectMany(u => u))); + } } diff --git a/src/DynamicData/List/ObservableListEx.ForEachChange.cs b/src/DynamicData/List/ObservableListEx.ForEachChange.cs index f4066e413..e850acac9 100644 --- a/src/DynamicData/List/ObservableListEx.ForEachChange.cs +++ b/src/DynamicData/List/ObservableListEx.ForEachChange.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,34 +15,33 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Invokes once for every in each changeset. Range changes - /// (AddRange, RemoveRange, Clear) are delivered as a single ; they are not flattened into per-item changes. + /// Invokes once for every Change<T> in each changeset. Range changes + /// (AddRange, RemoveRange, Clear) are delivered as a single Change<T>; they are not flattened into per-item changes. /// The changeset is forwarded downstream unchanged. /// /// The type of items in the list. - /// The source to observe each change in. - /// The action invoked for each . + /// The source IObservable<IChangeSet<TObject>> to observe each change in. + /// The action invoked for each Change<T>. /// A continuation of the source changeset stream. /// or is . /// - /// This is a side-effect operator. It does not modify the changeset. If you need each individual item from range operations flattened out, use instead. + /// This is a side-effect operator. It does not modify the changeset. If you need each individual item from range operations flattened out, use ForEachItemChange<TObject>(IObservable<IChangeSet<TObject>>, Action<ItemChange<TObject>>) instead. /// /// EventBehavior - /// Add/Replace/Remove/Moved/RefreshCallback invoked with the (single-item change). Changeset forwarded. - /// AddRange/RemoveRange/ClearCallback invoked once with the containing the range (accessible via Range property). Changeset forwarded. + /// Add/Replace/Remove/Moved/RefreshCallback invoked with the Change<T> (single-item change). Changeset forwarded. + /// AddRange/RemoveRange/ClearCallback invoked once with the Change<T> containing the range (accessible via Range property). Changeset forwarded. /// OnErrorIf the callback throws, the exception propagates as OnError. /// /// - /// - /// - /// - /// + /// ForEachItemChange<TObject>(IObservable<IChangeSet<TObject>>, Action<ItemChange<TObject>>) + /// OnItemAdded<T>(IObservable<IChangeSet<T>>, Action<T>) + /// OnItemRemoved<T>(IObservable<IChangeSet<T>>, Action<T>, bool) + /// ObservableCacheEx.ForEachChange<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<Change<TObject, TKey>>) public static IObservable> ForEachChange(this IObservable> source, Action> action) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(action); return source.Do(changes => changes.ForEach(action)); } diff --git a/src/DynamicData/List/ObservableListEx.ForEachItemChange.cs b/src/DynamicData/List/ObservableListEx.ForEachItemChange.cs index f39760fac..52093167d 100644 --- a/src/DynamicData/List/ObservableListEx.ForEachItemChange.cs +++ b/src/DynamicData/List/ObservableListEx.ForEachItemChange.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,27 +15,26 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Invokes for every individual in each changeset. + /// Invokes for every individual ItemChange<TObject> in each changeset. /// Range changes are flattened into individual item changes first, so the callback only receives Add, Replace, Remove, and Refresh. /// /// The type of items in the list. - /// The source to observe each item-level change in. - /// The action invoked for each individual item change. + /// The source IObservable<IChangeSet<TObject>> to observe each item-level change in. + /// The Action<ItemChange<TObject>> action invoked for each individual item change. /// A continuation of the source changeset stream. /// or is . /// /// - /// Unlike , this operator flattens - /// AddRange, RemoveRange, and Clear into individual entries before invoking the callback. + /// Unlike ForEachChange<TObject>(IObservable<IChangeSet<TObject>>, Action<Change<TObject>>), this operator flattens + /// AddRange, RemoveRange, and Clear into individual ItemChange<TObject> entries before invoking the callback. /// /// - /// + /// ForEachChange<TObject>(IObservable<IChangeSet<TObject>>, Action<Change<TObject>>) public static IObservable> ForEachItemChange(this IObservable> source, Action> action) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - action.ThrowArgumentNullExceptionIfNull(nameof(action)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(action); return source.Do(changes => changes.Flatten().ForEach(action)); } diff --git a/src/DynamicData/List/ObservableListEx.GroupOn.cs b/src/DynamicData/List/ObservableListEx.GroupOn.cs index 180c98ff6..873b9b0b8 100644 --- a/src/DynamicData/List/ObservableListEx.GroupOn.cs +++ b/src/DynamicData/List/ObservableListEx.GroupOn.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,15 +22,15 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Groups source items by the value returned by . Each group is an + /// Groups source items by the value returned by . Each group is an IGroup<TObject, TGroup> /// containing an inner observable list of its members. /// /// The type of items in the list. /// The type of the group key. - /// The source to group. - /// A function that returns the group key for each item. - /// An optional of that forces all items to be re-evaluated against when it fires. Useful for time-based groupings (e.g., "Last Hour", "Today"). - /// A list changeset stream of objects, each containing the items belonging to that group. + /// The source IObservable<IChangeSet<TObject>> to group. + /// A Func<T, TResult> function that returns the group key for each item. + /// An optional IObservable<Unit> of that forces all items to be re-evaluated against when it fires. Useful for time-based groupings (e.g., "Last Hour", "Today"). + /// A list changeset stream of IGroup<TObject, TGroup> objects, each containing the items belonging to that group. /// or is . /// /// @@ -48,16 +46,15 @@ public static partial class ObservableListEx /// Regrouper firesAll items re-evaluated. Items that changed group key are moved between groups. Empty groups removed, new groups added. /// /// - /// - /// - /// + /// GroupOnProperty<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TGroup>>, TimeSpan?, IScheduler?) + /// GroupWithImmutableState<TObject, TGroupKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TGroupKey>, IObservable<Unit>?) + /// Transform<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>, bool) public static IObservable>> GroupOn(this IObservable> source, Func groupSelector, IObservable? regrouper = null) where TObject : notnull where TGroup : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - groupSelector.ThrowArgumentNullExceptionIfNull(nameof(groupSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(groupSelector); return new GroupOn(source, groupSelector, regrouper).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.GroupOnProperty.cs b/src/DynamicData/List/ObservableListEx.GroupOnProperty.cs index 4bf1bb98a..b17ccfc98 100644 --- a/src/DynamicData/List/ObservableListEx.GroupOnProperty.cs +++ b/src/DynamicData/List/ObservableListEx.GroupOnProperty.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,11 +27,11 @@ public static partial class ObservableListEx /// /// The type of the object. Must implement . /// The type of the group key. - /// The source to group by property value. - /// selecting the property whose value determines the group key. + /// The source IObservable<IChangeSet<TObject>> to group by property value. + /// Expression<TDelegate> selecting the property whose value determines the group key. /// An optional throttle duration for property change notifications. /// The used when throttling. - /// A list changeset stream of objects. + /// A list changeset stream of IGroup<TObject, TGroup> objects. /// or is . /// /// @@ -41,16 +39,15 @@ public static partial class ObservableListEx /// Property changes trigger re-evaluation of the group key, potentially moving items between groups. /// /// - /// - /// - /// + /// GroupOn<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Func<TObject, TGroup>, IObservable<Unit>?) + /// GroupOnPropertyWithImmutableState<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TGroup>>, TimeSpan?, IScheduler?) + /// AutoRefresh<TObject, TProperty>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TProperty>>, TimeSpan?, TimeSpan?, IScheduler?) public static IObservable>> GroupOnProperty(this IObservable> source, Expression> propertySelector, TimeSpan? propertyChangedThrottle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TGroup : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - propertySelector.ThrowArgumentNullExceptionIfNull(nameof(propertySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertySelector); return new GroupOnProperty(source, propertySelector, propertyChangedThrottle, scheduler).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.GroupOnPropertyWithImmutableState.cs b/src/DynamicData/List/ObservableListEx.GroupOnPropertyWithImmutableState.cs index dad726079..182834fda 100644 --- a/src/DynamicData/List/ObservableListEx.GroupOnPropertyWithImmutableState.cs +++ b/src/DynamicData/List/ObservableListEx.GroupOnPropertyWithImmutableState.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,29 +27,28 @@ public static partial class ObservableListEx /// /// The type of the object. Must implement . /// The type of the group key. - /// The source to group by property value with immutable snapshots. - /// selecting the property whose value determines the group key. + /// The source IObservable<IChangeSet<TObject>> to group by property value with immutable snapshots. + /// Expression<TDelegate> selecting the property whose value determines the group key. /// An optional throttle duration for property change notifications. /// The used when throttling. - /// A list changeset stream of immutable group snapshots. + /// A list changeset stream of List.IGrouping<TObject, TGroup> immutable group snapshots. /// or is . /// /// - /// Combines - /// with . - /// Unlike , + /// Combines AutoRefresh<TObject, TProperty>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TProperty>>, TimeSpan?, TimeSpan?, IScheduler?) + /// with GroupWithImmutableState<TObject, TGroupKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TGroupKey>, IObservable<Unit>?). + /// Unlike GroupOnProperty<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TGroup>>, TimeSpan?, IScheduler?), /// this produces immutable snapshots per group rather than live inner observable lists. /// /// - /// - /// + /// GroupOnProperty<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TGroup>>, TimeSpan?, IScheduler?) + /// GroupWithImmutableState<TObject, TGroupKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TGroupKey>, IObservable<Unit>?) public static IObservable>> GroupOnPropertyWithImmutableState(this IObservable> source, Expression> propertySelector, TimeSpan? propertyChangedThrottle = null, IScheduler? scheduler = null) where TObject : INotifyPropertyChanged where TGroup : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - propertySelector.ThrowArgumentNullExceptionIfNull(nameof(propertySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertySelector); return new GroupOnPropertyWithImmutableState(source, propertySelector, propertyChangedThrottle, scheduler).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.GroupWithImmutableState.cs b/src/DynamicData/List/ObservableListEx.GroupWithImmutableState.cs index b607a56f4..5d3250878 100644 --- a/src/DynamicData/List/ObservableListEx.GroupWithImmutableState.cs +++ b/src/DynamicData/List/ObservableListEx.GroupWithImmutableState.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,27 +27,27 @@ public static partial class ObservableListEx /// /// The type of items in the list. /// The type of the group key. - /// The source to group with immutable snapshots. - /// A function that returns the group key for each item. - /// An optional of that forces all items to be re-evaluated when it fires. - /// A list changeset stream of immutable snapshots. + /// The source IObservable<IChangeSet<TObject>> to group with immutable snapshots. + /// A Func<T, TResult> function that returns the group key for each item. + /// An optional IObservable<Unit> of that forces all items to be re-evaluated when it fires. + /// A list changeset stream of List.IGrouping<TObject, TGroupKey> immutable snapshots. /// or is . /// /// - /// Works like + /// Works like GroupOn<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Func<TObject, TGroup>, IObservable<Unit>?) /// but each affected group emits a new immutable snapshot on every change rather than updating a live inner list. /// This is useful when consumers need thread-safe, point-in-time snapshots of each group. /// /// - /// - /// + /// GroupOn<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Func<TObject, TGroup>, IObservable<Unit>?) + /// GroupOnPropertyWithImmutableState<TObject, TGroup>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TGroup>>, TimeSpan?, IScheduler?) public static IObservable>> GroupWithImmutableState(this IObservable> source, Func groupSelectorKey, IObservable? regrouper = null) where TObject : notnull where TGroupKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); - groupSelectorKey.ThrowArgumentNullExceptionIfNull(nameof(groupSelectorKey)); + ArgumentExceptionHelper.ThrowIfNull(groupSelectorKey); return new GroupOnImmutable(source, groupSelectorKey, regrouper).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.LimitSizeTo.cs b/src/DynamicData/List/ObservableListEx.LimitSizeTo.cs index fd01dcfa6..26cafdcac 100644 --- a/src/DynamicData/List/ObservableListEx.LimitSizeTo.cs +++ b/src/DynamicData/List/ObservableListEx.LimitSizeTo.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,7 +27,7 @@ public static partial class ObservableListEx /// Returns an observable of the items that were removed. /// /// The type of the item. - /// The source list to apply size limits to. + /// The ISourceList<T> source list to apply size limits to. /// The maximum number of items allowed. Must be greater than zero. /// The scheduler for scheduling size checks. Defaults to . /// An observable that emits collections of items each time excess items are removed from the source list. @@ -37,24 +35,24 @@ public static partial class ObservableListEx /// is zero or negative. /// /// - /// This operator acts directly on an . It subscribes to the source's changes, + /// This operator acts directly on an ISourceList<T>. It subscribes to the source's changes, /// tracks insertion order using an internal Transform, and removes the oldest items when the size limit is exceeded. /// /// Worth noting: The returned observable emits the removed items (not changesets). Subscribe to this observable to activate the size-limiting mechanism. Removal is performed synchronously under a lock shared with the change tracking. /// - /// - /// + /// ExpireAfter<T>(ISourceList<T>, Func<T, TimeSpan?>, TimeSpan?, IScheduler?) + /// Top<T>(IObservable<IChangeSet<T>>, int) public static IObservable> LimitSizeTo(this ISourceList source, int sizeLimit, IScheduler? scheduler = null) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (sizeLimit <= 0) { throw new ArgumentException("sizeLimit cannot be zero", nameof(sizeLimit)); } - var locker = InternalEx.NewLock(); + var locker = InternalEx.NewMonitorGate(); var limiter = new LimitSizeTo(source, sizeLimit, scheduler ?? GlobalConfig.DefaultScheduler, locker); return limiter.Run().Synchronize(locker).Do(source.RemoveMany); diff --git a/src/DynamicData/List/ObservableListEx.MergeChangeSets.cs b/src/DynamicData/List/ObservableListEx.MergeChangeSets.cs index 4f58c05cc..905a5f92f 100644 --- a/src/DynamicData/List/ObservableListEx.MergeChangeSets.cs +++ b/src/DynamicData/List/ObservableListEx.MergeChangeSets.cs @@ -1,93 +1,97 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. /// public static partial class ObservableListEx { - /// + /// This overload follows the same core behavior as the related overload. /// /// Merges multiple list changeset streams from an observable-of-observables into a single unified changeset stream. - /// Unlike , list merging performs no key-based deduplication. + /// Unlike ObservableCacheEx.MergeChangeSets<TObject, TKey>(IObservable<IObservable<IChangeSet<TObject, TKey>>>, IEqualityComparer<TObject>), list merging performs no key-based deduplication. /// - /// The source of nested changeset observables. - /// An optional used by the merge tracker to compare items. + /// The type of the TObject value. + /// The source IObservable<T> of nested changeset observables. + /// An optional IEqualityComparer<TObject> used by the merge tracker to compare items. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservable>> source, IEqualityComparer? equalityComparer = null) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new MergeChangeSets(source, equalityComparer).Run(); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Merges two list changeset streams into a single unified stream. /// - /// The first to merge. - /// The second to merge with. - /// An optional used to compare items. + /// The type of the TObject value. + /// The first IObservable<IChangeSet<TObject>> to merge. + /// The second IObservable<IChangeSet<TObject>> to merge with. + /// An optional IEqualityComparer<TObject> used to compare items. /// An optional for scheduling enumeration. /// When (default), the result completes when all sources complete. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservable> source, IObservable> other, IEqualityComparer? equalityComparer = null, IScheduler? scheduler = null, bool completable = true) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - other.ThrowArgumentNullExceptionIfNull(nameof(other)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(other); return new[] { source, other }.MergeChangeSets(equalityComparer, scheduler, completable); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Merges the source list changeset stream with additional changeset streams into a single unified stream. /// - /// The primary source to merge. - /// The additional of list changeset streams to merge with. - /// An optional used to compare items. + /// The type of the TObject value. + /// The primary source IObservable<IChangeSet<TObject>> to merge. + /// The additional IEnumerable<T> of list changeset streams to merge with. + /// An optional IEqualityComparer<TObject> used to compare items. /// An optional for scheduling enumeration. /// When (default), the result completes when all sources complete. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservable> source, IEnumerable>> others, IEqualityComparer? equalityComparer = null, IScheduler? scheduler = null, bool completable = true) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - others.ThrowArgumentNullExceptionIfNull(nameof(others)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(others); return source.EnumerateOne().Concat(others).MergeChangeSets(equalityComparer, scheduler, completable); } /// /// Merges a collection of list changeset streams into a single unified changeset stream. - /// This is the canonical list MergeChangeSets overload: other overloads accepting , , or pair/params variants ultimately produce equivalent behavior. + /// This is the canonical list MergeChangeSets overload: other overloads accepting IObservable<T>, IObservableList<T>, or pair/params variants ultimately produce equivalent behavior. /// /// The type of items in the list. - /// The collection of list changeset streams to merge. - /// An optional used by the merge tracker to compare items. Defaults to when . + /// The IEnumerable<T> collection of list changeset streams to merge. + /// An optional IEqualityComparer<TObject> used by the merge tracker to compare items. Defaults to EqualityComparer<T>.Default when . /// An optional for scheduling enumeration. /// When (default), the result completes when all sources complete. /// A single list changeset stream containing all changes from all sources. /// is . /// /// - /// All changes from inner streams are forwarded to the output. There is no key-based deduplication (unlike ): if the same item appears in multiple inner streams, it will appear multiple times in the merged output. + /// All changes from inner streams are forwarded to the output. There is no key-based deduplication (unlike ObservableCacheEx.MergeChangeSets<TObject, TKey>(IObservable<IObservable<IChangeSet<TObject, TKey>>>, IEqualityComparer<TObject>)): if the same item appears in multiple inner streams, it will appear multiple times in the merged output. /// /// /// EventBehavior @@ -98,51 +102,59 @@ public static IObservable> MergeChangeSets(this IOb /// MovedIgnored. /// /// - /// - /// - /// - /// + /// MergeChangeSets<TObject>(IObservable<IObservable<IChangeSet<TObject>>>, IEqualityComparer<TObject>?) + /// MergeManyChangeSets<TObject, TDestination>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination>>>, IEqualityComparer<TDestination>?) + /// Or<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// ObservableCacheEx.MergeChangeSets<TObject, TKey>(IObservable<IObservable<IChangeSet<TObject, TKey>>>, IEqualityComparer<TObject>) public static IObservable> MergeChangeSets(this IEnumerable>> source, IEqualityComparer? equalityComparer = null, IScheduler? scheduler = null, bool completable = true) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new MergeChangeSets(source, equalityComparer, completable, scheduler).Run(); } - /// + /// This overload follows the same core behavior as the related overload. /// - /// Merges list changeset streams from an into a single stream. Sources can be added or removed dynamically. + /// Merges list changeset streams from an IObservableList<T> into a single stream. Sources can be added or removed dynamically. /// + /// The type of the TObject value. + /// The source value. + /// The equalityComparer value. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservableList>> source, IEqualityComparer? equalityComparer = null) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Connect().MergeChangeSets(equalityComparer); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Merges list changeset streams from a list-of-list-changeset-observables into a single stream. /// Each inner list changeset observable in the source list is merged, and parent item removal triggers child cleanup. /// + /// The type of the TObject value. + /// The source value. + /// The equalityComparer value. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservable>>> source, IEqualityComparer? equalityComparer = null) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.MergeManyChangeSets(static src => src, equalityComparer); } /// - /// Merges cache changeset streams from an into a single cache changeset stream. + /// Merges cache changeset streams from an IObservableList<T> into a single cache changeset stream. /// Uses to resolve conflicts when the same key appears in multiple child streams. /// /// The type of items in the list. /// The type of the object key. - /// The of cache changeset observables. - /// to resolve which value wins when the same key appears in multiple sources. + /// The IObservableList<T> of cache changeset observables. + /// IComparer<TObject> to resolve which value wins when the same key appears in multiple sources. /// A single cache changeset stream with key-based deduplication. /// is . /// @@ -157,60 +169,69 @@ public static IObservable> MergeChangeSets(this IOb /// Source list RemoveDisposes that source's subscription. All keys it contributed are removed. For keys also contributed by other sources, the next-best value (per ) is promoted as an Update, not an Add. /// /// - /// - /// + /// MergeChangeSets<TObject, TKey>(IObservableList<IObservable<IChangeSet<TObject, TKey>>>, IEqualityComparer<TObject>?, IComparer<TObject>?) + /// MergeManyChangeSets<TObject, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IEqualityComparer<TDestination>?, IComparer<TDestination>?) public static IObservable> MergeChangeSets(this IObservableList>> source, IComparer comparer) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Connect().MergeChangeSets(comparer); } - /// + /// This overload follows the same core behavior as the related overload. /// - /// Merges cache changeset streams from an into a single cache changeset stream, with optional equality and ordering comparers. + /// Merges cache changeset streams from an IObservableList<T> into a single cache changeset stream, with optional equality and ordering comparers. /// - /// The of cache changeset observables. - /// An optional to determine if two elements are the same. - /// An optional to resolve conflicts when the same key appears in multiple sources. + /// The type of the TObject value. + /// The type of the TKey value. + /// The IObservableList<T> of cache changeset observables. + /// An optional IEqualityComparer<TObject> to determine if two elements are the same. + /// An optional IComparer<TObject> to resolve conflicts when the same key appears in multiple sources. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservableList>> source, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Connect().MergeChangeSets(equalityComparer, comparer); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Merges cache changeset streams from a list changeset of cache changeset observables, using a comparer for conflict resolution. /// - /// The source whose items are cache changeset observables. - /// to resolve which value wins when the same key appears in multiple sources. + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<T> whose items are cache changeset observables. + /// IComparer<TObject> to resolve which value wins when the same key appears in multiple sources. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservable>>> source, IComparer comparer) where TObject : notnull where TKey : notnull { - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(comparer); return source.MergeChangeSets(comparer); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Merges cache changeset streams from a list changeset of cache changeset observables, with optional equality and ordering comparers. /// - /// The source whose items are cache changeset observables. - /// An optional to determine if two elements are the same. - /// An optional to resolve conflicts when the same key appears in multiple sources. + /// The type of the TObject value. + /// The type of the TKey value. + /// The source IObservable<T> whose items are cache changeset observables. + /// An optional IEqualityComparer<TObject> to determine if two elements are the same. + /// An optional IComparer<TObject> to resolve conflicts when the same key appears in multiple sources. + /// The resulting observable sequence. public static IObservable> MergeChangeSets(this IObservable>>> source, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.MergeManyChangeSets(static src => src, equalityComparer, comparer); } diff --git a/src/DynamicData/List/ObservableListEx.MergeMany.cs b/src/DynamicData/List/ObservableListEx.MergeMany.cs index 55dfa4f19..3b7125a12 100644 --- a/src/DynamicData/List/ObservableListEx.MergeMany.cs +++ b/src/DynamicData/List/ObservableListEx.MergeMany.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,13 +22,13 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Subscribes to a per-item observable for each item in the source and merges all emissions into a single stream. + /// Subscribes to a per-item observable for each item in the source and merges all emissions into a single IObservable<TDestination> stream. /// This is NOT a changeset operator: it returns a flat observable of values. /// /// The type of items in the source list. /// The type of values emitted by per-item observables. - /// The source whose items each produce an observable. - /// A function that returns an observable for each source item. + /// The source IObservable<IChangeSet<T>> whose items each produce an observable. + /// A Func<T, TResult> function that returns an observable for each source item. /// An observable that emits values from all per-item observables, merged together. /// or is . /// @@ -43,16 +41,15 @@ public static partial class ObservableListEx /// OnCompleted (source)Completes only after the source and all active inner observables have completed. /// /// - /// - /// - /// - /// + /// SubscribeMany<T>(IObservable<IChangeSet<T>>, Func<T, IDisposable>) + /// MergeManyChangeSets<TObject, TDestination>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination>>>, IEqualityComparer<TDestination>?) + /// WhenPropertyChanged<TObject, TValue>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TValue>>, bool) + /// ObservableCacheEx.MergeMany<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<TDestination>>) public static IObservable MergeMany(this IObservable> source, Func> observableSelector) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeMany(source, observableSelector).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.MergeManyChangeSets.cs b/src/DynamicData/List/ObservableListEx.MergeManyChangeSets.cs index e10118cef..e6fb3171c 100644 --- a/src/DynamicData/List/ObservableListEx.MergeManyChangeSets.cs +++ b/src/DynamicData/List/ObservableListEx.MergeManyChangeSets.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,9 +27,9 @@ public static partial class ObservableListEx /// /// The type of items in the source list. /// The type of items in the child changeset streams. - /// The source whose items each produce a child changeset stream. - /// A function that returns a child list changeset stream for each source item. - /// An optional used to compare child items. + /// The source IObservable<IChangeSet<TObject>> whose items each produce a child changeset stream. + /// A Func<T, TResult> function that returns a child list changeset stream for each source item. + /// An optional IEqualityComparer<TDestination> used to compare child items. /// A single list changeset stream containing all items from all child streams. /// or is . /// @@ -46,10 +44,10 @@ public static partial class ObservableListEx /// Remove/RemoveRange/ClearChild subscription disposed. All child items from that parent are removed. /// /// - /// - /// - /// - /// + /// MergeChangeSets<TObject>(IEnumerable<IObservable<IChangeSet<TObject>>>, IEqualityComparer<TObject>?, IScheduler?, bool) + /// MergeManyChangeSets<TObject, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IEqualityComparer<TDestination>?, IComparer<TDestination>?) + /// TransformMany<TDestination, TSource>(IObservable<IChangeSet<TSource>>, Func<TSource, IEnumerable<TDestination>>, IEqualityComparer<TDestination>?) + /// ObservableCacheEx.MergeManyChangeSets<TObject, TKey, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IEqualityComparer<TDestination>, IComparer<TDestination>) public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IEqualityComparer? equalityComparer = null) where TObject : notnull where TDestination : notnull @@ -74,24 +72,24 @@ public static IObservable> MergeManyChangeSetsThe type of items in the source list. /// The type of items in the child cache changeset streams. /// The type of the key in the child cache changesets. - /// The source whose items each produce a child changeset stream. - /// A function that returns a child cache changeset stream for each source item. - /// to resolve which value wins when the same key appears from multiple children. + /// The source IObservable<IChangeSet<TObject>> whose items each produce a child changeset stream. + /// A Func<T, TResult> function that returns a child cache changeset stream for each source item. + /// IComparer<TDestination> to resolve which value wins when the same key appears from multiple children. /// A single cache changeset stream with key-based deduplication. /// , , or is . /// - /// - /// Delegates to with a equality comparer. + /// This overload follows the same core behavior as the related overload. + /// Delegates to MergeManyChangeSets<TObject, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IEqualityComparer<TDestination>?, IComparer<TDestination>?) with a equality comparer. /// - /// + /// MergeManyChangeSets<TObject, TDestination, TDestinationKey>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination, TDestinationKey>>>, IEqualityComparer<TDestination>?, IComparer<TDestination>?) public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IComparer comparer) where TObject : notnull where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); + ArgumentExceptionHelper.ThrowIfNull(comparer); return source.MergeManyChangeSets(observableSelector, equalityComparer: null, comparer: comparer); } @@ -103,10 +101,10 @@ public static IObservable> MergeManyCh /// The type of items in the source list. /// The type of items in the child cache changeset streams. /// The type of the key in the child cache changesets. - /// The source whose items each produce a child changeset stream. - /// A function that returns a child cache changeset stream for each source item. - /// An optional to determine if two elements are the same. - /// An optional to resolve conflicts when the same key appears from multiple children. + /// The source IObservable<IChangeSet<TObject>> whose items each produce a child changeset stream. + /// A Func<T, TResult> function that returns a child cache changeset stream for each source item. + /// An optional IEqualityComparer<TDestination> to determine if two elements are the same. + /// An optional IComparer<TDestination> to resolve conflicts when the same key appears from multiple children. /// A single cache changeset stream with key-based deduplication. /// or is . /// @@ -127,19 +125,19 @@ public static IObservable> MergeManyCh /// /// /// EventBehavior - /// OnErrorAn error from the source (parent) stream or from any child changeset stream terminates the entire output. Unlike , child errors are NOT swallowed. + /// OnErrorAn error from the source (parent) stream or from any child changeset stream terminates the entire output. Unlike MergeMany<T, TDestination>(IObservable<IChangeSet<T>>, Func<T, IObservable<TDestination>>), child errors are NOT swallowed. /// OnCompletedThe output completes when the source (parent) stream completes and all active child changeset streams have also completed. /// /// - /// - /// + /// MergeManyChangeSets<TObject, TDestination>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination>>>, IEqualityComparer<TDestination>?) + /// MergeChangeSets<TObject, TKey>(IObservableList<IObservable<IChangeSet<TObject, TKey>>>, IComparer<TObject>) public static IObservable> MergeManyChangeSets(this IObservable> source, Func>> observableSelector, IEqualityComparer? equalityComparer = null, IComparer? comparer = null) where TObject : notnull where TDestination : notnull where TDestinationKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - observableSelector.ThrowArgumentNullExceptionIfNull(nameof(observableSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(observableSelector); return new MergeManyCacheChangeSets(source, observableSelector, equalityComparer, comparer).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.NotEmpty.cs b/src/DynamicData/List/ObservableListEx.NotEmpty.cs index efc183cb6..71f9a308e 100644 --- a/src/DynamicData/List/ObservableListEx.NotEmpty.cs +++ b/src/DynamicData/List/ObservableListEx.NotEmpty.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,15 +18,15 @@ public static partial class ObservableListEx /// Suppresses empty changesets from the stream. Only changesets with at least one change are forwarded. /// /// The type of the item. - /// The source to suppress empty changesets. + /// The source IObservable<IChangeSet<T>> to suppress empty changesets. /// A list changeset stream with empty changesets filtered out. /// is . - /// - /// + /// StartWithEmpty<T>(IObservable<IChangeSet<T>>) + /// WhereReasonsAre<T>(IObservable<IChangeSet<T>>, ListChangeReason[]) public static IObservable> NotEmpty(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Where(s => s.Count != 0); } diff --git a/src/DynamicData/List/ObservableListEx.OnItemAdded.cs b/src/DynamicData/List/ObservableListEx.OnItemAdded.cs index f07beed67..e28b9bf00 100644 --- a/src/DynamicData/List/ObservableListEx.OnItemAdded.cs +++ b/src/DynamicData/List/ObservableListEx.OnItemAdded.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +19,8 @@ public static partial class ObservableListEx /// Triggers on , , and the new item of . /// /// The type of items in the list. - /// The source to observe item additions in. - /// The action to invoke for each added item. + /// The source IObservable<IChangeSet<T>> to observe item additions in. + /// The Action<T> action to invoke for each added item. /// A continuation of the source changeset stream, with the side effect applied before forwarding. /// or is . /// @@ -44,15 +35,18 @@ public static partial class ObservableListEx /// OnErrorIf the callback throws, the exception propagates as OnError. /// /// - /// - /// - /// - /// + /// OnItemRemoved<T>(IObservable<IChangeSet<T>>, Action<T>, bool) + /// OnItemRefreshed<T>(IObservable<IChangeSet<T>>, Action<T>) + /// ForEachItemChange<TObject>(IObservable<IChangeSet<TObject>>, Action<ItemChange<TObject>>) + /// ObservableCacheEx.OnItemAdded<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject>) public static IObservable> OnItemAdded( this IObservable> source, Action addAction) where T : notnull - => List.Internal.OnItemAdded.Create( - source: source, - addAction: addAction); + { + ArgumentExceptionHelper.ThrowIfNull(source); + return List.Internal.OnItemAdded.Create( + source: source, + addAction: addAction); + } } diff --git a/src/DynamicData/List/ObservableListEx.OnItemRefreshed.cs b/src/DynamicData/List/ObservableListEx.OnItemRefreshed.cs index 53824aba0..827ffab00 100644 --- a/src/DynamicData/List/ObservableListEx.OnItemRefreshed.cs +++ b/src/DynamicData/List/ObservableListEx.OnItemRefreshed.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,19 +18,22 @@ public static partial class ObservableListEx /// Invokes for every item with a change in the source stream. /// /// The type of items in the list. - /// The source to observe item refresh events in. - /// The action to invoke for each refreshed item. + /// The source IObservable<IChangeSet<T>> to observe item refresh events in. + /// The Action<T> action to invoke for each refreshed item. /// A continuation of the source changeset stream, with the side effect applied before forwarding. /// or is . - /// - /// - /// - /// + /// OnItemAdded<T>(IObservable<IChangeSet<T>>, Action<T>) + /// OnItemRemoved<T>(IObservable<IChangeSet<T>>, Action<T>, bool) + /// AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableCacheEx.OnItemRefreshed<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject>) public static IObservable> OnItemRefreshed( this IObservable> source, Action refreshAction) where T : notnull - => List.Internal.OnItemRefreshed.Create( - source: source, - refreshAction: refreshAction); + { + ArgumentExceptionHelper.ThrowIfNull(source); + return List.Internal.OnItemRefreshed.Create( + source: source, + refreshAction: refreshAction); + } } diff --git a/src/DynamicData/List/ObservableListEx.OnItemRemoved.cs b/src/DynamicData/List/ObservableListEx.OnItemRemoved.cs index 7a63f9247..0f7a85e67 100644 --- a/src/DynamicData/List/ObservableListEx.OnItemRemoved.cs +++ b/src/DynamicData/List/ObservableListEx.OnItemRemoved.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +19,8 @@ public static partial class ObservableListEx /// Triggers on , , , and the old item of . /// /// The type of items in the list. - /// The source to observe item removals in. - /// The action to invoke for each removed item. + /// The source IObservable<IChangeSet<T>> to observe item removals in. + /// The Action<T> action to invoke for each removed item. /// When (default), is also invoked for all remaining tracked items upon stream disposal, completion, or error. /// A continuation of the source changeset stream, with the side effect applied before forwarding. /// or is . @@ -50,17 +41,20 @@ public static partial class ObservableListEx /// /// Worth noting: When is (the default), disposing the subscription also invokes the callback for every item still in the list, not just items that were explicitly removed during the subscription. Exceptions in are not caught. /// - /// - /// - /// - /// + /// OnItemAdded<T>(IObservable<IChangeSet<T>>, Action<T>) + /// DisposeMany<T>(IObservable<IChangeSet<T>>) + /// SubscribeMany<T>(IObservable<IChangeSet<T>>, Func<T, IDisposable>) + /// ObservableCacheEx.OnItemRemoved<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Action<TObject>, bool) public static IObservable> OnItemRemoved( this IObservable> source, Action removeAction, bool invokeOnUnsubscribe = true) where T : notnull - => List.Internal.OnItemRemoved.Create( - source: source, - removeAction: removeAction, - invokeOnUnsubscribe: invokeOnUnsubscribe); + { + ArgumentExceptionHelper.ThrowIfNull(source); + return List.Internal.OnItemRemoved.Create( + source: source, + removeAction: removeAction, + invokeOnUnsubscribe: invokeOnUnsubscribe); + } } diff --git a/src/DynamicData/List/ObservableListEx.Or.cs b/src/DynamicData/List/ObservableListEx.Or.cs index b47acd986..6a1d4a783 100644 --- a/src/DynamicData/List/ObservableListEx.Or.cs +++ b/src/DynamicData/List/ObservableListEx.Or.cs @@ -1,33 +1,34 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. /// public static partial class ObservableListEx { - /// + /// This overload follows the same core behavior as the related overload. /// /// Applies a logical OR (union) between a pre-built collection of list changeset sources. Items present in any source are included. /// - /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. + /// ObservableCacheEx.Or<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) public static IObservable> Or(this ICollection>> sources) where T : notnull => sources.Combine(CombineOperator.Or); @@ -36,8 +37,8 @@ public static IObservable> Or(this ICollection /// The type of the item. - /// The primary source to union. - /// The other changeset streams to combine with. + /// The primary source IObservable<IChangeSet<T>> to union. + /// The other IObservable<IChangeSet<T>> changeset streams to combine with. /// A list changeset stream containing items that exist in at least one source. /// is . /// @@ -54,36 +55,45 @@ public static IObservable> Or(this ICollectionMovedIgnored. /// /// - /// - /// - /// - /// + /// And<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Except<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Xor<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// MergeChangeSets<TObject>(IEnumerable<IObservable<IChangeSet<TObject>>>, IEqualityComparer<TObject>?, IScheduler?, bool) public static IObservable> Or(this IObservable> source, params IObservable>[] others) where T : notnull { - others.ThrowArgumentNullExceptionIfNull(nameof(others)); + ArgumentExceptionHelper.ThrowIfNull(others); return source.Combine(CombineOperator.Or, others); } - /// + /// This overload follows the same core behavior as the related overload. /// - /// Dynamic OR: sources can be added or removed from the at runtime. + /// Dynamic OR: sources can be added or removed from the IObservableList<T> at runtime. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Or(this IObservableList>> sources) where T : notnull => sources.Combine(CombineOperator.Or); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Dynamic OR accepting of . Each inner list's Connect() is used as a source. + /// Dynamic OR accepting IObservableList<T> of IObservableList<T>. Each inner list's Connect() is used as a source. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Or(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.Or); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Dynamic OR accepting of . Each inner list's Connect() is used as a source. + /// Dynamic OR accepting IObservableList<T> of ISourceList<T>. Each inner list's Connect() is used as a source. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Or(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.Or); } diff --git a/src/DynamicData/List/ObservableListEx.Page.cs b/src/DynamicData/List/ObservableListEx.Page.cs index da8dc2c3d..436ec7b61 100644 --- a/src/DynamicData/List/ObservableListEx.Page.cs +++ b/src/DynamicData/List/ObservableListEx.Page.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,9 +25,9 @@ public static partial class ObservableListEx /// Applies page-based windowing to the source list. Only items within the current page (determined by page number and page size from ) are included downstream. /// /// The type of the item. - /// The source to page. + /// The source IObservable<IChangeSet<T>> to page. /// An observable of controlling which page to display (page number and page size). - /// An stream containing only items within the current page window. + /// An IPageChangeSet<T> stream containing only items within the current page window. /// or is . /// /// @@ -39,14 +37,14 @@ public static partial class ObservableListEx /// /// Worth noting: Duplicate items are removed from the result via Distinct() using the default equality comparer for , regardless of source order. The source should ideally be sorted before paging, since list order determines which items fall within each page window. /// - /// - /// - /// + /// Virtualise<T>(IObservable<IChangeSet<T>>, IObservable<IVirtualRequest>) + /// Top<T>(IObservable<IChangeSet<T>>, int) + /// Sort<T>(IObservable<IChangeSet<T>>, IComparer<T>, SortOptions, IObservable<Unit>?, IObservable<IComparer<T>>?, int) public static IObservable> Page(this IObservable> source, IObservable requests) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - requests.ThrowArgumentNullExceptionIfNull(nameof(requests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(requests); return new Pager(source, requests).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.PopulateInto.cs b/src/DynamicData/List/ObservableListEx.PopulateInto.cs index d5431ff4a..969744086 100644 --- a/src/DynamicData/List/ObservableListEx.PopulateInto.cs +++ b/src/DynamicData/List/ObservableListEx.PopulateInto.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,24 +22,24 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Subscribes to the source changeset stream and pipes all changes into the . + /// Subscribes to the source changeset stream and pipes all changes into the ISourceList<T>. /// /// The type of the object. - /// The source to pipe into a target list. - /// The destination to receive all changes. + /// The source IObservable<IChangeSet<T>> to pipe into a target list. + /// The destination ISourceList<T> to receive all changes. /// An representing the subscription. Dispose to stop piping changes. /// or is . /// /// Each changeset is applied to the destination using Clone() inside an Edit() call, producing a single batch update per changeset. /// - /// - /// - /// + /// Clone<T>(IObservable<IChangeSet<T>>, IList<T>) + /// Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, BindingOptions) + /// ObservableCacheEx.PopulateInto<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, ISourceCache<TObject, TKey>) public static IDisposable PopulateInto(this IObservable> source, ISourceList destination) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - destination.ThrowArgumentNullExceptionIfNull(nameof(destination)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(destination); return source.Subscribe(changes => destination.Edit(updater => updater.Clone(changes))); } diff --git a/src/DynamicData/List/ObservableListEx.QueryWhenChanged.cs b/src/DynamicData/List/ObservableListEx.QueryWhenChanged.cs index 0e9984894..45831cdeb 100644 --- a/src/DynamicData/List/ObservableListEx.QueryWhenChanged.cs +++ b/src/DynamicData/List/ObservableListEx.QueryWhenChanged.cs @@ -1,22 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -25,48 +28,48 @@ public static partial class ObservableListEx { /// /// Emits a projected value from the current list snapshot after every changeset. - /// The receives an representing the current state. + /// The receives an IReadOnlyCollection<T> representing the current state. /// /// The type of items in the list. /// The type of the projected result. - /// The source to project on each change. - /// A function projecting the current list snapshot to a result value. + /// The source IObservable<IChangeSet<TObject>> to project on each change. + /// A Func<T, TResult> function projecting the current list snapshot to a result value. /// An observable emitting the projected value after each changeset. /// or is . /// - /// Delegates to and applies via Select. + /// Delegates to QueryWhenChanged<T>(IObservable<IChangeSet<T>>) and applies via Select. /// - /// - /// - /// + /// QueryWhenChanged<T>(IObservable<IChangeSet<T>>) + /// ToCollection<TObject>(IObservable<IChangeSet<TObject>>) + /// ObservableCacheEx.QueryWhenChanged<TObject, TKey, TDestination>(IObservable<IChangeSet<TObject, TKey>>, Func<IQuery<TObject, TKey>, TDestination>) public static IObservable QueryWhenChanged(this IObservable> source, Func, TDestination> resultSelector) where TObject : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - resultSelector.ThrowArgumentNullExceptionIfNull(nameof(resultSelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(resultSelector); return source.QueryWhenChanged().Select(resultSelector); } /// - /// Emits an snapshot of the current list state after every changeset. + /// Emits an IReadOnlyCollection<T> snapshot of the current list state after every changeset. /// Maintains an internal list updated by cloning each changeset. /// /// The type of items in the list. - /// The source to project on each change. - /// An observable emitting the full list snapshot as after each change. + /// The source IObservable<IChangeSet<T>> to project on each change. + /// An observable emitting the full list snapshot as IReadOnlyCollection<T> after each change. /// is . /// /// This is a non-changeset operator. It emits the entire collection state on each change, not incremental diffs. - /// Worth noting: A new snapshot is emitted on every changeset, which can be chatty. The collection is rebuilt by cloning each changeset into an internal list. For sorted output, use . + /// Worth noting: A new snapshot is emitted on every changeset, which can be chatty. The collection is rebuilt by cloning each changeset into an internal list. For sorted output, use ToSortedCollection<TObject, TSortKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TSortKey>, SortDirection). /// - /// - /// - /// + /// QueryWhenChanged<TObject, TDestination>(IObservable<IChangeSet<TObject>>, Func<IReadOnlyCollection<TObject>, TDestination>) + /// ToCollection<TObject>(IObservable<IChangeSet<TObject>>) + /// ToSortedCollection<TObject, TSortKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TSortKey>, SortDirection) public static IObservable> QueryWhenChanged(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new QueryWhenChanged(source).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.RefCount.cs b/src/DynamicData/List/ObservableListEx.RefCount.cs index 4e8f03a10..656150e2f 100644 --- a/src/DynamicData/List/ObservableListEx.RefCount.cs +++ b/src/DynamicData/List/ObservableListEx.RefCount.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,21 +22,21 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Reference-counted materialization of the source changeset stream into an . + /// Reference-counted materialization of the source changeset stream into an IObservableList<T>. /// The shared list is created on the first subscriber and disposed when the last subscriber unsubscribes. /// /// The type of the item. - /// The source to share via reference counting. - /// A list changeset stream backed by a shared, reference-counted . + /// The source IObservable<IChangeSet<T>> to share via reference counting. + /// A list changeset stream backed by a shared, reference-counted IObservableList<T>. /// is . /// /// Equivalent to Publish().RefCount() for changeset streams. The underlying list is created lazily on first subscription. /// - /// + /// AsObservableList<T>(IObservable<IChangeSet<T>>) public static IObservable> RefCount(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new RefCount(source).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.RemoveIndex.cs b/src/DynamicData/List/ObservableListEx.RemoveIndex.cs index 9f0e434f7..22da76bb1 100644 --- a/src/DynamicData/List/ObservableListEx.RemoveIndex.cs +++ b/src/DynamicData/List/ObservableListEx.RemoveIndex.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,20 +15,20 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Strips index information from all changes in the stream. + /// Strips mutation indices, omits moves, and preserves the required source index of Refresh notifications. /// /// The type of the object. - /// The source to strip index information. - /// A list changeset stream with all index values removed from changes. + /// The source IObservable<IChangeSet<T>> to strip index information. + /// A list changeset stream with mutation indices removed and Refresh source indices retained. /// is . /// - /// Removes index positions from every change in each changeset. This is useful when downstream operators do not require or support index-based operations. + /// Refresh indices refer to the original source positions. Other mutation indices are removed, and moves are omitted because they require index positions. /// - /// + /// ChangeSetEx.YieldWithoutIndex<T>(IEnumerable<Change<T>>) public static IObservable> RemoveIndex(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Select(changes => new ChangeSet(changes.YieldWithoutIndex())); } diff --git a/src/DynamicData/List/ObservableListEx.Reverse.cs b/src/DynamicData/List/ObservableListEx.Reverse.cs index 757954e35..c56cca121 100644 --- a/src/DynamicData/List/ObservableListEx.Reverse.cs +++ b/src/DynamicData/List/ObservableListEx.Reverse.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Linq; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,18 +25,18 @@ public static partial class ObservableListEx /// Reverses the order of items in the changeset stream by transforming all indices: new_index = length - old_index - 1. /// /// The type of the item. - /// The source to reverse. + /// The source IObservable<IChangeSet<T>> to reverse. /// A list changeset stream with all index positions reversed. /// is . /// /// This is a pure index transformation. The items themselves are unchanged; only their positional indices are inverted. /// - /// + /// Sort<T>(IObservable<IChangeSet<T>>, IComparer<T>, SortOptions, IObservable<Unit>?, IObservable<IComparer<T>>?, int) public static IObservable> Reverse(this IObservable> source) where T : notnull { var reverser = new Reverser(); - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.Select(changes => new ChangeSet(reverser.Reverse(changes))); } diff --git a/src/DynamicData/List/ObservableListEx.SkipInitial.cs b/src/DynamicData/List/ObservableListEx.SkipInitial.cs index a7d50fbf0..107bdb1d8 100644 --- a/src/DynamicData/List/ObservableListEx.SkipInitial.cs +++ b/src/DynamicData/List/ObservableListEx.SkipInitial.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,7 +19,7 @@ public static partial class ObservableListEx /// Internally defers until loaded, then skips the first emission. /// /// The type of the object. - /// The source to skip the initial changeset. + /// The source IObservable<IChangeSet<T>> to skip the initial changeset. /// A list changeset stream that omits the initial snapshot. /// is . /// @@ -37,15 +28,15 @@ public static partial class ObservableListEx /// initial snapshot, those items are silently dropped while downstream consumers remain unaware of them. /// Any later Refresh, Replace, Remove, or Moved change targeting one of those /// dropped items will throw because the downstream collection has no record of them. Only use this against - /// a source you know starts empty (for example, a that has not yet been populated). + /// a source you know starts empty (for example, a ISourceList<T> that has not yet been populated). /// /// - /// - /// + /// DeferUntilLoaded<T>(IObservable<IChangeSet<T>>) + /// StartWithEmpty<T>(IObservable<IChangeSet<T>>) public static IObservable> SkipInitial(this IObservable> source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.DeferUntilLoaded().Skip(1); } diff --git a/src/DynamicData/List/ObservableListEx.Sort.cs b/src/DynamicData/List/ObservableListEx.Sort.cs index c0c67e484..710cb2d1d 100644 --- a/src/DynamicData/List/ObservableListEx.Sort.cs +++ b/src/DynamicData/List/ObservableListEx.Sort.cs @@ -1,22 +1,25 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; +#endif +#if REACTIVE_SHIM +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,11 +30,11 @@ public static partial class ObservableListEx /// Sorts the list using the specified comparer, maintaining a sorted output that incrementally updates as items change. /// /// The type of the item. - /// The source to sort. - /// The used for sorting. + /// The source IObservable<IChangeSet<T>> to sort. + /// The IComparer<T> used for sorting. /// The for improved performance when sorted values are immutable. - /// An optional of that forces a full re-sort when it fires. Required when sorted property values are mutable. - /// An optional of that replaces the comparer, triggering a full re-sort. + /// An optional IObservable<Unit> of that forces a full re-sort when it fires. Required when sorted property values are mutable. + /// An optional IObservable<IComparer<T>> of IComparer<T> that replaces the comparer, triggering a full re-sort. /// When the number of changes exceeds this threshold, a full reset is performed instead of incremental updates. Default is 50. /// A list changeset stream with items in sorted order. /// or is . @@ -49,38 +52,40 @@ public static partial class ObservableListEx /// Comparer changedFull re-sort of all items. /// Re-sort signalFull re-sort using the current comparer. /// - /// Worth noting: is faster but requires that the values being sorted on never mutate. If they do, use the signal or . + /// Worth noting: is faster but requires that the values being sorted on never mutate. If they do, use the signal or AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?). /// - /// - /// - /// - /// + /// Sort<T>(IObservable<IChangeSet<T>>, IObservable<IComparer<T>>, SortOptions, IObservable<Unit>?, int) + /// Page<T>(IObservable<IChangeSet<T>>, IObservable<IPageRequest>) + /// Bind<T>(IObservable<IChangeSet<T>>, IObservableCollection<T>, BindingOptions) + /// ObservableCacheEx.Sort<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IComparer<TObject>, SortOptimisations, int) public static IObservable> Sort(this IObservable> source, IComparer comparer, SortOptions options = SortOptions.None, IObservable? resort = null, IObservable>? comparerChanged = null, int resetThreshold = 50) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparer.ThrowArgumentNullExceptionIfNull(nameof(comparer)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparer); return new Sort(source, comparer, options, resort, comparerChanged, resetThreshold).Run(); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Sorts the list using an observable comparer. The initial comparer is taken from the first emission; subsequent emissions trigger a full re-sort. /// + /// The type of the T value. + /// The resulting observable sequence. /// - /// Until emits its first comparer, items are sorted using . Downstream still receives changesets immediately; the initial ordering is whatever produces, then a full re-sort happens once the first comparer arrives. + /// Until emits its first comparer, items are sorted using Comparer<T>.Default. Downstream still receives changesets immediately; the initial ordering is whatever Comparer<T>.Default produces, then a full re-sort happens once the first comparer arrives. /// - /// The source to sort. - /// An of that emits comparers. The first emission provides the initial sort order; subsequent emissions trigger re-sorts. + /// The source IObservable<IChangeSet<T>> to sort. + /// An IObservable<IComparer<T>> of IComparer<T> that emits comparers. The first emission provides the initial sort order; subsequent emissions trigger re-sorts. /// for controlling sort behavior. - /// An optional of to force a re-sort with the current comparer. + /// An optional IObservable<Unit> of to force a re-sort with the current comparer. /// The threshold for triggering a full reset instead of incremental updates. public static IObservable> Sort(this IObservable> source, IObservable> comparerChanged, SortOptions options = SortOptions.None, IObservable? resort = null, int resetThreshold = 50) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - comparerChanged.ThrowArgumentNullExceptionIfNull(nameof(comparerChanged)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(comparerChanged); return new Sort(source, null, options, resort, comparerChanged, resetThreshold).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.StartWithEmpty.cs b/src/DynamicData/List/ObservableListEx.StartWithEmpty.cs index 91c7100e0..d92f1ce2f 100644 --- a/src/DynamicData/List/ObservableListEx.StartWithEmpty.cs +++ b/src/DynamicData/List/ObservableListEx.StartWithEmpty.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,11 +18,16 @@ public static partial class ObservableListEx /// Prepends an empty changeset to the source stream. Useful for initializing downstream consumers that expect an initial emission. /// /// The type of item. - /// The source to prepend an empty changeset to. + /// The source IObservable<IChangeSet<T>> to prepend an empty changeset to. /// A list changeset stream that begins with an empty changeset. - /// - /// - /// + /// DeferUntilLoaded<T>(IObservable<IChangeSet<T>>) + /// SkipInitial<T>(IObservable<IChangeSet<T>>) + /// ObservableCacheEx.StartWithEmpty<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable> StartWithEmpty(this IObservable> source) - where T : notnull => source.StartWith(ChangeSet.Empty); + where T : notnull + { + ArgumentExceptionHelper.ThrowIfNull(source); + + return source.StartWith(ChangeSet.Empty); + } } diff --git a/src/DynamicData/List/ObservableListEx.SubscribeMany.cs b/src/DynamicData/List/ObservableListEx.SubscribeMany.cs index 6f4745a2a..01d1f3d37 100644 --- a/src/DynamicData/List/ObservableListEx.SubscribeMany.cs +++ b/src/DynamicData/List/ObservableListEx.SubscribeMany.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,7 +27,7 @@ public static partial class ObservableListEx /// The changeset is forwarded downstream unmodified. /// /// The type of the object. - /// The source to create a subscription for each item in. + /// The source IObservable<IChangeSet<T>> to create a subscription for each item in. /// A function that creates an for each item. /// A continuation of the source changeset stream with per-item subscriptions managed as a side effect. /// or is . @@ -43,15 +41,15 @@ public static partial class ObservableListEx /// OnError/OnCompleted/DisposalAll active subscriptions are disposed. /// /// - /// - /// - /// - /// + /// MergeMany<T, TDestination>(IObservable<IChangeSet<T>>, Func<T, IObservable<TDestination>>) + /// DisposeMany<T>(IObservable<IChangeSet<T>>) + /// OnItemRemoved<T>(IObservable<IChangeSet<T>>, Action<T>, bool) + /// ObservableCacheEx.SubscribeMany<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, Func<TObject, IDisposable>) public static IObservable> SubscribeMany(this IObservable> source, Func subscriptionFactory) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - subscriptionFactory.ThrowArgumentNullExceptionIfNull(nameof(subscriptionFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(subscriptionFactory); return new SubscribeMany(source, subscriptionFactory).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.SuppressRefresh.cs b/src/DynamicData/List/ObservableListEx.SuppressRefresh.cs index ac040d07f..0e71455a3 100644 --- a/src/DynamicData/List/ObservableListEx.SuppressRefresh.cs +++ b/src/DynamicData/List/ObservableListEx.SuppressRefresh.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,10 +18,10 @@ public static partial class ObservableListEx /// Suppresses all changes from the stream. All other change reasons pass through. /// /// The type of the object. - /// The source to strip refresh events. + /// The source IObservable<IChangeSet<T>> to strip refresh events. /// A list changeset stream with Refresh changes removed. - /// - /// + /// WhereReasonsAreNot<T>(IObservable<IChangeSet<T>>, ListChangeReason[]) + /// AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) public static IObservable> SuppressRefresh(this IObservable> source) where T : notnull => source.WhereReasonsAreNot(ListChangeReason.Refresh); } diff --git a/src/DynamicData/List/ObservableListEx.Switch.cs b/src/DynamicData/List/ObservableListEx.Switch.cs index c4de93f57..c7f266926 100644 --- a/src/DynamicData/List/ObservableListEx.Switch.cs +++ b/src/DynamicData/List/ObservableListEx.Switch.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,21 +22,21 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Subscribes to the latest inner , switching to each new source and clearing the result when switching. - /// This is the changeset-aware equivalent of Rx's , which cannot be applied directly to changeset streams. + /// Subscribes to the latest inner IObservableList<T>, switching to each new source and clearing the result when switching. + /// This is the changeset-aware equivalent of Rx's Observable.Switch<TSource>(IObservable<IObservable<TSource>>), which cannot be applied directly to changeset streams. /// /// The type of the object. - /// An observable that emits instances. Each emission triggers a switch to the new list. + /// An observable that emits IObservableList<T> instances. Each emission triggers a switch to the new list. /// A list changeset stream reflecting the most recently received inner list. /// is . /// - /// Convenience overload that calls Connect() on each inner list, then delegates to . + /// Convenience overload that calls Connect() on each inner list, then delegates to Switch<T>(IObservable<IObservable<IChangeSet<T>>>). /// - /// + /// Switch<T>(IObservable<IObservable<IChangeSet<T>>>) public static IObservable> Switch(this IObservable> sources) where T : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return sources.Select(cache => cache.Connect()).Switch(); } @@ -48,18 +46,18 @@ public static IObservable> Switch(this IObservable /// The type of the object. - /// An of changeset streams. The operator subscribes to the latest inner stream. + /// An IObservable<T> of IObservable<T> changeset streams. The operator subscribes to the latest inner stream. /// A list changeset stream reflecting the most recently received inner changeset stream. /// is . /// /// Worth noting: Each switch clears the entire downstream list before populating from the new source. Subscribers see a full remove-then-add reset on every switch. /// Also worth noting:This operator intentionally shadows the native operator, as downstream listeners will generally become corrupt when the native operator is used. This is due to its lack of the automatic-clearing behavior mentioned above. /// - /// + /// Switch<T>(IObservable<IObservableList<T>>) public static IObservable> Switch(this IObservable>> sources) where T : notnull { - sources.ThrowArgumentNullExceptionIfNull(nameof(sources)); + ArgumentExceptionHelper.ThrowIfNull(sources); return new Switch(sources).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.ToCollection.cs b/src/DynamicData/List/ObservableListEx.ToCollection.cs index 072451c92..2c43ab29f 100644 --- a/src/DynamicData/List/ObservableListEx.ToCollection.cs +++ b/src/DynamicData/List/ObservableListEx.ToCollection.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,14 +22,14 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Emits the full collection as an after every changeset. Equivalent to QueryWhenChanged(items => items). + /// Emits the full collection as an IReadOnlyCollection<T> after every changeset. Equivalent to QueryWhenChanged(items => items). /// /// The type of items in the list. - /// The source to materialize into a collection on each change. + /// The source IObservable<IChangeSet<TObject>> to materialize into a collection on each change. /// An observable emitting the full collection snapshot after each change. - /// - /// - /// + /// QueryWhenChanged<T>(IObservable<IChangeSet<T>>) + /// ToSortedCollection<TObject, TSortKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TSortKey>, SortDirection) + /// ObservableCacheEx.ToCollection<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>) public static IObservable> ToCollection(this IObservable> source) where TObject : notnull => source.QueryWhenChanged(items => items); } diff --git a/src/DynamicData/List/ObservableListEx.ToObservableChangeSet.cs b/src/DynamicData/List/ObservableListEx.ToObservableChangeSet.cs index 1c465dddc..a6a09890f 100644 --- a/src/DynamicData/List/ObservableListEx.ToObservableChangeSet.cs +++ b/src/DynamicData/List/ObservableListEx.ToObservableChangeSet.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,11 +15,11 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Bridges an into the DynamicData world by converting each emitted item into a list changeset. + /// Bridges an IObservable<T> into the DynamicData world by converting each emitted item into a list changeset. /// Each emission becomes an Add operation in the resulting changeset stream. /// /// The type of the object. - /// The source to convert into a changeset stream. + /// The source IObservable<T> to convert into a changeset stream. /// An optional for time-based operations (expiry, size limiting). /// A list changeset stream where each source emission is an Add. /// is . @@ -40,8 +31,8 @@ public static partial class ObservableListEx /// /// Worth noting: Source completion and errors are propagated. The internal list is disposed on unsubscribe. /// - /// - /// + /// ToObservableChangeSet<T>(IObservable<T>, Func<T, TimeSpan?>, int, IScheduler?) + /// ToObservableChangeSet<T>(IObservable<IEnumerable<T>>, IScheduler?) public static IObservable> ToObservableChangeSet( this IObservable source, IScheduler? scheduler = null) @@ -52,14 +43,16 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: -1, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an into a list changeset stream with per-item time-based expiry. + /// Bridges an IObservable<T> into a list changeset stream with per-item time-based expiry. /// Expired items are automatically removed. /// - /// The source to convert into a changeset stream. - /// A function returning the time-to-live for each item. Return for non-expiring items. + /// The type of the T value. + /// The source IObservable<T> to convert into a changeset stream. + /// A Func<T, TResult> function returning the time-to-live for each item. Return for non-expiring items. /// An optional for expiry timers. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable source, Func expireAfter, @@ -71,14 +64,16 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: -1, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an into a list changeset stream with FIFO size limiting. + /// Bridges an IObservable<T> into a list changeset stream with FIFO size limiting. /// When the list exceeds , the oldest items are removed. /// - /// The source to convert into a changeset stream. + /// The type of the T value. + /// The source IObservable<T> to convert into a changeset stream. /// The maximum list size. Supply -1 to disable size limiting. /// An optional for scheduling removals. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable source, int limitSizeTo, @@ -90,14 +85,16 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: limitSizeTo, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an into a list changeset stream with both time-based expiry and FIFO size limiting. + /// Bridges an IObservable<T> into a list changeset stream with both time-based expiry and FIFO size limiting. /// - /// The source to convert into a changeset stream. - /// A function returning the time-to-live for each item. Return for non-expiring items. + /// The type of the T value. + /// The source IObservable<T> to convert into a changeset stream. + /// A Func<T, TResult> function returning the time-to-live for each item. Return for non-expiring items. /// The maximum list size. Supply -1 to disable size limiting. /// An optional for expiry timers and size-limit checks. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable source, Func? expireAfter, @@ -110,13 +107,15 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: limitSizeTo, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an of batches into a list changeset stream. + /// Bridges an IObservable<T> of IEnumerable<T> batches into a list changeset stream. /// Each emitted batch becomes an AddRange. /// - /// The source of to convert into a changeset stream. + /// The type of the T value. + /// The source IObservable<IEnumerable<T>> of IEnumerable<T> to convert into a changeset stream. /// An optional for time-based operations. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable> source, IScheduler? scheduler = null) @@ -127,13 +126,15 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: -1, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an of batches into a list changeset stream with FIFO size limiting. + /// Bridges an IObservable<T> of IEnumerable<T> batches into a list changeset stream with FIFO size limiting. /// - /// The source of to convert into a changeset stream. + /// The type of the T value. + /// The source IObservable<IEnumerable<T>> of IEnumerable<T> to convert into a changeset stream. /// The maximum list size. Oldest items are removed when the limit is exceeded. /// An optional for scheduling removals. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable> source, int limitSizeTo, @@ -145,13 +146,15 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: limitSizeTo, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an of batches into a list changeset stream with time-based expiry. + /// Bridges an IObservable<T> of IEnumerable<T> batches into a list changeset stream with time-based expiry. /// - /// The source of to convert into a changeset stream. - /// A function returning the time-to-live for each item. Return for non-expiring items. + /// The type of the T value. + /// The source IObservable<IEnumerable<T>> of IEnumerable<T> to convert into a changeset stream. + /// A Func<T, TResult> function returning the time-to-live for each item. Return for non-expiring items. /// An optional for expiry timers. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable> source, Func expireAfter, @@ -163,14 +166,16 @@ public static IObservable> ToObservableChangeSet( limitSizeTo: -1, scheduler: scheduler); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Bridges an of batches into a list changeset stream with both time-based expiry and FIFO size limiting. + /// Bridges an IObservable<T> of IEnumerable<T> batches into a list changeset stream with both time-based expiry and FIFO size limiting. /// - /// The source of to convert into a changeset stream. - /// A function returning the time-to-live for each item. Return for non-expiring items. + /// The type of the T value. + /// The source IObservable<IEnumerable<T>> of IEnumerable<T> to convert into a changeset stream. + /// A Func<T, TResult> function returning the time-to-live for each item. Return for non-expiring items. /// The maximum list size. Oldest items removed when exceeded. /// An optional for expiry timers and size-limit checks. + /// The resulting observable sequence. public static IObservable> ToObservableChangeSet( this IObservable> source, Func? expireAfter, diff --git a/src/DynamicData/List/ObservableListEx.ToSortedCollection.cs b/src/DynamicData/List/ObservableListEx.ToSortedCollection.cs index 860079901..7d6c53e4d 100644 --- a/src/DynamicData/List/ObservableListEx.ToSortedCollection.cs +++ b/src/DynamicData/List/ObservableListEx.ToSortedCollection.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Binding; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,30 +22,30 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Emits a sorted after every changeset, sorted by the value returned by . + /// Emits a sorted IReadOnlyCollection<T> after every changeset, sorted by the value returned by . /// /// The type of items in the list. /// The type of the sort key. - /// The source to materialize into a sorted collection on each change. - /// A function extracting the sort key from each item. + /// The source IObservable<IChangeSet<TObject>> to materialize into a sorted collection on each change. + /// A Func<T, TResult> function extracting the sort key from each item. /// The sort direction. Defaults to ascending. /// An observable emitting a sorted collection snapshot after each change. - /// - /// - /// - /// + /// ToCollection<TObject>(IObservable<IChangeSet<TObject>>) + /// ToSortedCollection<TObject>(IObservable<IChangeSet<TObject>>, IComparer<TObject>) + /// QueryWhenChanged<T>(IObservable<IChangeSet<T>>) + /// ObservableCacheEx.ToSortedCollection<TObject, TKey> public static IObservable> ToSortedCollection(this IObservable> source, Func sort, SortDirection sortOrder = SortDirection.Ascending) where TObject : notnull => source.QueryWhenChanged(query => sortOrder == SortDirection.Ascending ? new ReadOnlyCollectionLight(query.OrderBy(sort)) : new ReadOnlyCollectionLight(query.OrderByDescending(sort))); /// - /// Emits a sorted after every changeset, sorted using the specified . + /// Emits a sorted IReadOnlyCollection<T> after every changeset, sorted using the specified . /// /// The type of items in the list. - /// The source to materialize into a sorted collection on each change. - /// The used for sorting. + /// The source IObservable<IChangeSet<TObject>> to materialize into a sorted collection on each change. + /// The IComparer<TObject> used for sorting. /// An observable emitting a sorted collection snapshot after each change. - /// - /// + /// ToSortedCollection<TObject, TSortKey>(IObservable<IChangeSet<TObject>>, Func<TObject, TSortKey>, SortDirection) + /// ToCollection<TObject>(IObservable<IChangeSet<TObject>>) public static IObservable> ToSortedCollection(this IObservable> source, IComparer comparer) where TObject : notnull => source.QueryWhenChanged( query => diff --git a/src/DynamicData/List/ObservableListEx.Top.cs b/src/DynamicData/List/ObservableListEx.Top.cs index 17a128f99..2e689e986 100644 --- a/src/DynamicData/List/ObservableListEx.Top.cs +++ b/src/DynamicData/List/ObservableListEx.Top.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -27,7 +18,7 @@ public static partial class ObservableListEx /// Takes the first items from the source list. Implemented as Virtualise with a fixed window starting at index 0. /// /// The type of the item. - /// The source to take the top items. + /// The source IObservable<IChangeSet<T>> to take the top items. /// The maximum number of items to include. Must be greater than zero. /// A virtual changeset stream containing at most items from the beginning of the source. /// is . @@ -35,13 +26,13 @@ public static partial class ObservableListEx /// /// The source should ideally be sorted before applying Top, since list order determines which items appear. /// - /// - /// - /// + /// Virtualise<T>(IObservable<IChangeSet<T>>, IObservable<IVirtualRequest>) + /// Page<T>(IObservable<IChangeSet<T>>, IObservable<IPageRequest>) + /// Sort<T>(IObservable<IChangeSet<T>>, IComparer<T>, SortOptions, IObservable<Unit>?, IObservable<IComparer<T>>?, int) public static IObservable> Top(this IObservable> source, int numberOfItems) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); if (numberOfItems <= 0) { diff --git a/src/DynamicData/List/ObservableListEx.Transform.cs b/src/DynamicData/List/ObservableListEx.Transform.cs index 64a856a24..6f201a4d7 100644 --- a/src/DynamicData/List/ObservableListEx.Transform.cs +++ b/src/DynamicData/List/ObservableListEx.Transform.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +26,8 @@ public static partial class ObservableListEx /// /// The type of the source items. /// The type of the destination items. - /// The source to transform. - /// The transform function applied to each item. + /// The source IObservable<IChangeSet<TSource>> to transform. + /// The Func<T, TResult> transform function applied to each item. /// When , Refresh events re-invoke the factory and emit an update. When (the default), Refresh is forwarded without re-transforming. /// A list changeset stream of transformed items. /// @@ -41,7 +39,7 @@ public static partial class ObservableListEx /// EventBehavior /// AddThe factory is called and an Add is emitted at the same index. /// AddRangeThe factory is called for each item. An AddRange is emitted at the same start index. - /// ReplaceThe factory is called for the new item. A Replace is emitted at the same index. The previous transformed value is available to overloads that accept . + /// ReplaceThe factory is called for the new item. A Replace is emitted at the same index. The previous transformed value is available to overloads that accept Optional<TDestination>. /// RemoveA Remove is emitted (no factory call). /// RemoveRangeA RemoveRange is emitted. /// MovedA Moved is emitted with updated indices (no factory call). Throws if the source change has no index information. @@ -52,61 +50,79 @@ public static partial class ObservableListEx /// Worth noting: By default, Refresh does NOT re-transform the item (it just forwards the signal). Set to if you need the factory re-invoked on Refresh. Add operations with out-of-bounds indices silently append to the end. /// /// or is . - /// - /// - /// - /// + /// TransformAsync<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, Task<TDestination>>, bool) + /// TransformMany<TDestination, TSource>(IObservable<IChangeSet<TSource>>, Func<TSource, IEnumerable<TDestination>>, IEqualityComparer<TDestination>?) + /// Convert<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>) + /// ObservableCacheEx.Transform<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, TDestination>, bool) public static IObservable> Transform(this IObservable> source, Func transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((t, _, _) => transformFactory(t), transformOnRefresh); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Projects each item using a transform function that also receives the item's index. /// + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. public static IObservable> Transform(this IObservable> source, Func transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((t, _, idx) => transformFactory(t, idx), transformOnRefresh); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Projects each item using a transform function that also receives the previously transformed value (if any). /// Type arguments must be specified explicitly as type inference fails for this overload. /// - public static IObservable> Transform(this IObservable> source, Func, TDestination> transformFactory, bool transformOnRefresh = false) + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. + public static IObservable> Transform(this IObservable> source, Func, TDestination> transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.Transform((t, previous, _) => transformFactory(t, previous), transformOnRefresh); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Projects each item using a transform function that receives the source item, the previously transformed value, and the index. /// Type arguments must be specified explicitly as type inference fails for this overload. /// - public static IObservable> Transform(this IObservable> source, Func, int, TDestination> transformFactory, bool transformOnRefresh = false) + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. + public static IObservable> Transform(this IObservable> source, Func, int, TDestination> transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new Transformer(source, transformFactory, transformOnRefresh).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.TransformAsync.cs b/src/DynamicData/List/ObservableListEx.TransformAsync.cs index d130fa3b9..3337ff8eb 100644 --- a/src/DynamicData/List/ObservableListEx.TransformAsync.cs +++ b/src/DynamicData/List/ObservableListEx.TransformAsync.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,17 +22,17 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Projects each item to a new form using an async transform function. Behaves like but the factory returns a . + /// Projects each item to a new form using an async transform function. Behaves like Transform<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>, bool) but the factory returns a Task<T>. /// /// The type of the source items. /// The type of the destination items. - /// The source to transform asynchronously. - /// An async function that transforms each source item. + /// The source IObservable<IChangeSet<TSource>> to transform asynchronously. + /// An Func<T, TResult> async function that transforms each source item. /// When , Refresh events re-invoke the factory. /// A list changeset stream of asynchronously transformed items. /// or is . /// - /// Change handling is identical to the synchronous except the factory is awaited. Operations are serialized per changeset via a semaphore. + /// Change handling is identical to the synchronous Transform<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>, bool) except the factory is awaited. Operations are serialized per changeset via a semaphore. /// /// EventBehavior /// Add/AddRangeThe async factory is awaited for each item. An Add/AddRange is emitted with the transformed results. @@ -48,9 +46,9 @@ public static partial class ObservableListEx /// /// Worth noting: All async transforms within a single changeset are serialized (not parallel). Each changeset is fully processed before the next begins. By default, Refresh does NOT re-transform. /// - /// - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] + /// Transform<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>, bool) + /// ObservableCacheEx.TransformAsync<TDestination, TSource, TKey>(IObservable<IChangeSet<TSource, TKey>>, Func<TSource, Task<TDestination>>, IObservable<Func<TSource, TKey, bool>>) + [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync( this IObservable> source, Func> transformFactory, @@ -58,17 +56,23 @@ public static IObservable> TransformAsync((t, _, _) => transformFactory(t), transformOnRefresh); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Async transform overload receiving the source item and its index. /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. + [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync( this IObservable> source, Func> transformFactory, @@ -76,44 +80,56 @@ public static IObservable> TransformAsync((t, _, i) => transformFactory(t, i), transformOnRefresh); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Async transform overload receiving the source item and the previously transformed value. /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. + [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync( this IObservable> source, - Func, Task> transformFactory, + Func, Task> transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return source.TransformAsync((t, d, _) => transformFactory(t, d), transformOnRefresh); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Async transform overload receiving the source item, previously transformed value, and index. /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] + /// The type of the TSource value. + /// The type of the TDestination value. + /// The source value. + /// The transformFactory value. + /// The transformOnRefresh value. + /// The resulting observable sequence. + [SuppressMessage("Roslynator", "RCS1047:Non-asynchronous method name should not end with 'Async'.", Justification = "By Design.")] public static IObservable> TransformAsync( this IObservable> source, - Func, int, Task> transformFactory, + Func, int, Task> transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new TransformAsync(source, (t, d, i, _) => transformFactory(t, d, i), transformOnRefresh).Run(); } @@ -125,13 +141,13 @@ public static IObservable> TransformAsync> TransformAsync( this IObservable> source, - Func, int, CancellationToken, Task> transformFactory, + Func, int, CancellationToken, Task> transformFactory, bool transformOnRefresh = false) where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - transformFactory.ThrowArgumentNullExceptionIfNull(nameof(transformFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(transformFactory); return new TransformAsync(source, transformFactory, transformOnRefresh).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.TransformMany.cs b/src/DynamicData/List/ObservableListEx.TransformMany.cs index 6b3e3e327..416666d8c 100644 --- a/src/DynamicData/List/ObservableListEx.TransformMany.cs +++ b/src/DynamicData/List/ObservableListEx.TransformMany.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -29,9 +27,9 @@ public static partial class ObservableListEx /// /// The type of the destination items. /// The type of the source items. - /// The source to expand each item into multiple children. - /// A function that returns the child items for each source item. - /// An optional used during Replace to determine which child items changed between old and new parent values. + /// The source IObservable<IChangeSet<TSource>> to expand each item into multiple children. + /// A Func<T, TResult> function that returns the child items for each source item. + /// An optional IEqualityComparer<TDestination> used during Replace to determine which child items changed between old and new parent values. /// A list changeset stream of all child items from all source items. /// or is . /// @@ -43,39 +41,57 @@ public static partial class ObservableListEx /// RefreshChildren re-expanded and diffed. /// /// - /// - /// - /// + /// Transform<TSource, TDestination>(IObservable<IChangeSet<TSource>>, Func<TSource, TDestination>, bool) + /// MergeManyChangeSets<TObject, TDestination>(IObservable<IChangeSet<TObject>>, Func<TObject, IObservable<IChangeSet<TDestination>>>, IEqualityComparer<TDestination>?) + /// ObservableCacheEx.TransformMany<TDestination, TDestinationKey, TSource, TSourceKey>(IObservable<IChangeSet<TSource, TSourceKey>>, Func<TSource, IEnumerable<TDestination>>, Func<TDestination, TDestinationKey>) public static IObservable> TransformMany(this IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) where TDestination : notnull where TSource : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - manySelector.ThrowArgumentNullExceptionIfNull(nameof(manySelector)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(manySelector); return new TransformMany(source, manySelector, equalityComparer).Run(); } - /// + /// This overload follows the same core behavior as the related overload. /// - /// Flattens each source item into children from an . The collection is observed for subsequent changes. + /// Flattens each source item into children from an ObservableCollection<T>. The collection is observed for subsequent changes. /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + /// The resulting observable sequence. public static IObservable> TransformMany(this IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) where TDestination : notnull where TSource : notnull => new TransformMany(source, manySelector, equalityComparer).Run(); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Flattens each source item into children from a . The collection is observed for subsequent changes. + /// Flattens each source item into children from a ReadOnlyObservableCollection<T>. The collection is observed for subsequent changes. /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + /// The resulting observable sequence. public static IObservable> TransformMany(this IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) where TDestination : notnull where TSource : notnull => new TransformMany(source, manySelector, equalityComparer).Run(); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Flattens each source item into children from an . The inner list is observed for subsequent changes. + /// Flattens each source item into children from an IObservableList<T>. The inner list is observed for subsequent changes. /// + /// The type of the TDestination value. + /// The type of the TSource value. + /// The source value. + /// The manySelector value. + /// The equalityComparer value. + /// The resulting observable sequence. public static IObservable> TransformMany(this IObservable> source, Func> manySelector, IEqualityComparer? equalityComparer = null) where TDestination : notnull where TSource : notnull => new TransformMany(source, manySelector, equalityComparer).Run(); diff --git a/src/DynamicData/List/ObservableListEx.Virtualise.cs b/src/DynamicData/List/ObservableListEx.Virtualise.cs index a2d2ec09d..69f00ef28 100644 --- a/src/DynamicData/List/ObservableListEx.Virtualise.cs +++ b/src/DynamicData/List/ObservableListEx.Virtualise.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,24 +26,23 @@ public static partial class ObservableListEx /// Only items within the window are included downstream. /// /// The type of the item. - /// The source to virtualize. + /// The source IObservable<IChangeSet<T>> to virtualize. /// An observable of specifying the start index and size of the window. - /// An stream containing only items within the current virtual window. + /// An IVirtualChangeSet<T> stream containing only items within the current virtual window. /// or is . /// /// - /// Like but uses absolute start index and size instead of page number and page size. + /// Like Page<T>(IObservable<IChangeSet<T>>, IObservable<IPageRequest>) but uses absolute start index and size instead of page number and page size. /// Internally maintains the full source list and recalculates the window on each change or request. /// /// - /// - /// + /// Page<T>(IObservable<IChangeSet<T>>, IObservable<IPageRequest>) + /// Top<T>(IObservable<IChangeSet<T>>, int) public static IObservable> Virtualise(this IObservable> source, IObservable requests) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - - requests.ThrowArgumentNullExceptionIfNull(nameof(requests)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(requests); return new Virtualiser(source, requests).Run(); } diff --git a/src/DynamicData/List/ObservableListEx.WhenAnyPropertyChanged.cs b/src/DynamicData/List/ObservableListEx.WhenAnyPropertyChanged.cs index a6529e3f3..95dd20ac8 100644 --- a/src/DynamicData/List/ObservableListEx.WhenAnyPropertyChanged.cs +++ b/src/DynamicData/List/ObservableListEx.WhenAnyPropertyChanged.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -26,24 +24,24 @@ public static partial class ObservableListEx /// /// Watches all items in the source list and emits the item when any of its properties change. /// Requires to implement . - /// This is NOT a changeset operator: it returns a flat . + /// This is NOT a changeset operator: it returns a flat IObservable<T>. /// /// The type of the object. Must implement . - /// The source to observe property changes on items in. + /// The source IObservable<IChangeSet<TObject>> to observe property changes on items in. /// An optional list of property names to monitor. If empty, all property changes are observed. /// An observable emitting the item whenever any monitored property changes. /// is . /// - /// Implemented via . Subscriptions are managed per item: created on add, disposed on remove. + /// Implemented via MergeMany<T, TDestination>(IObservable<IChangeSet<T>>, Func<T, IObservable<TDestination>>). Subscriptions are managed per item: created on add, disposed on remove. /// - /// - /// - /// - /// + /// WhenPropertyChanged<TObject, TValue>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TValue>>, bool) + /// WhenValueChanged<TObject, TValue>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TValue>>, bool) + /// AutoRefresh<TObject>(IObservable<IChangeSet<TObject>>, TimeSpan?, TimeSpan?, IScheduler?) + /// ObservableCacheEx.WhenAnyPropertyChanged<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, string[]) public static IObservable WhenAnyPropertyChanged(this IObservable> source, params string[] propertiesToMonitor) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return source.MergeMany(t => t.WhenAnyPropertyChanged(propertiesToMonitor)); } diff --git a/src/DynamicData/List/ObservableListEx.WhenPropertyChanged.cs b/src/DynamicData/List/ObservableListEx.WhenPropertyChanged.cs index 4a91bd035..e27d42ee4 100644 --- a/src/DynamicData/List/ObservableListEx.WhenPropertyChanged.cs +++ b/src/DynamicData/List/ObservableListEx.WhenPropertyChanged.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -24,28 +22,28 @@ namespace DynamicData; public static partial class ObservableListEx { /// - /// Watches a specific property on all items in the source list and emits a (item + value pair) when it changes. + /// Watches a specific property on all items in the source list and emits a PropertyValue<TObject, TValue> (item + value pair) when it changes. /// Requires to implement . - /// This is NOT a changeset operator: it returns a flat . + /// This is NOT a changeset operator: it returns a flat IObservable<T>. /// /// The type of item. Must implement . /// The type of the property value. - /// The source to observe a specific property on items in. - /// An expression selecting the property to observe. + /// The source IObservable<IChangeSet<TObject>> to observe a specific property on items in. + /// An Expression<TDelegate> expression selecting the property to observe. /// When (default), the current value is emitted immediately upon subscribing to each item. - /// An observable emitting whenever the property changes on any tracked item. + /// An observable emitting PropertyValue<TObject, TValue> whenever the property changes on any tracked item. /// or is . /// - /// Implemented via . + /// Implemented via MergeMany<T, TDestination>(IObservable<IChangeSet<T>>, Func<T, IObservable<TDestination>>). /// - /// - /// - /// + /// WhenValueChanged<TObject, TValue>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TValue>>, bool) + /// WhenAnyPropertyChanged<TObject>(IObservable<IChangeSet<TObject>>, string[]) + /// ObservableCacheEx.WhenPropertyChanged<TObject, TKey, TValue>(IObservable<IChangeSet<TObject, TKey>>, Expression<Func<TObject, TValue>>, bool) public static IObservable> WhenPropertyChanged(this IObservable> source, Expression> propertyAccessor, bool notifyOnInitialValue = true) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); var factory = propertyAccessor.GetFactory(); return source.MergeMany(t => factory(t, notifyOnInitialValue)); diff --git a/src/DynamicData/List/ObservableListEx.WhenValueChanged.cs b/src/DynamicData/List/ObservableListEx.WhenValueChanged.cs index 0328218fc..f11aafdca 100644 --- a/src/DynamicData/List/ObservableListEx.WhenValueChanged.cs +++ b/src/DynamicData/List/ObservableListEx.WhenValueChanged.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; +#if REACTIVE_SHIM +using DynamicData.Reactive.Binding; +#else using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -26,23 +24,23 @@ public static partial class ObservableListEx /// /// Watches a specific property on all items and emits just the property value (without the sender) when it changes. /// Requires to implement . - /// This is NOT a changeset operator: it returns a flat . + /// This is NOT a changeset operator: it returns a flat IObservable<T>. /// /// The type of item. Must implement . /// The type of the property value. - /// The source to observe a specific property value on items in. - /// An expression selecting the property to observe. + /// The source IObservable<IChangeSet<TObject>> to observe a specific property value on items in. + /// An Expression<TDelegate> expression selecting the property to observe. /// When (default), the current value is emitted immediately upon subscribing to each item. /// An observable emitting the property value whenever it changes on any tracked item. /// or is . - /// - /// - /// + /// WhenPropertyChanged<TObject, TValue>(IObservable<IChangeSet<TObject>>, Expression<Func<TObject, TValue>>, bool) + /// WhenAnyPropertyChanged<TObject>(IObservable<IChangeSet<TObject>>, string[]) + /// ObservableCacheEx.WhenValueChanged<TObject, TKey, TValue>(IObservable<IChangeSet<TObject, TKey>>, Expression<Func<TObject, TValue>>, bool) public static IObservable WhenValueChanged(this IObservable> source, Expression> propertyAccessor, bool notifyOnInitialValue = true) where TObject : INotifyPropertyChanged { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - propertyAccessor.ThrowArgumentNullExceptionIfNull(nameof(propertyAccessor)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(propertyAccessor); var factory = propertyAccessor.GetFactory(); return source.MergeMany(t => factory(t, notifyOnInitialValue).Select(pv => pv.Value)); diff --git a/src/DynamicData/List/ObservableListEx.WhereReasonsAre.cs b/src/DynamicData/List/ObservableListEx.WhereReasonsAre.cs index c2e61653d..bdb681aa6 100644 --- a/src/DynamicData/List/ObservableListEx.WhereReasonsAre.cs +++ b/src/DynamicData/List/ObservableListEx.WhereReasonsAre.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -25,25 +16,27 @@ public static partial class ObservableListEx { /// /// Filters the changeset stream to include only changes with the specified values. - /// Index information is stripped from the output because removing some changes invalidates the original index positions. + /// Mutation index information is stripped from the output because removing some changes invalidates the original index positions. + /// Refresh notifications retain their required original source index; moves are omitted. /// /// The type of the item. - /// The source to filter by change reason. + /// The source IObservable<IChangeSet<T>> to filter by change reason. /// The change reasons to include. Must specify at least one. /// A list changeset stream containing only changes with the specified reasons. /// is . /// is empty. /// - /// Filters individual changes within each changeset. If filtering removes all changes from a changeset, the empty changeset is suppressed via . - /// Worth noting: Filtering out Remove changes can cause downstream operators to accumulate items indefinitely (memory leak). Index information is stripped because removing some changes invalidates the original index positions. + /// Filters individual changes within each changeset. If filtering removes all changes from a changeset, the empty changeset is suppressed via NotEmpty<T>(IObservable<IChangeSet<T>>). + /// Worth noting: Filtering out Remove changes can cause downstream operators to accumulate items indefinitely (memory leak). Mutation index information is stripped because removing some changes invalidates the original index positions. /// - /// - /// - /// + /// WhereReasonsAreNot<T>(IObservable<IChangeSet<T>>, ListChangeReason[]) + /// SuppressRefresh<T>(IObservable<IChangeSet<T>>) + /// ChangeSetEx.YieldWithoutIndex<T>(IEnumerable<Change<T>>) public static IObservable> WhereReasonsAre(this IObservable> source, params ListChangeReason[] reasons) where T : notnull { - reasons.ThrowArgumentNullExceptionIfNull(nameof(reasons)); + ArgumentExceptionHelper.ThrowIfNull(reasons); + ArgumentExceptionHelper.ThrowIfNull(source); if (reasons.Length == 0) { diff --git a/src/DynamicData/List/ObservableListEx.WhereReasonsAreNot.cs b/src/DynamicData/List/ObservableListEx.WhereReasonsAreNot.cs index aabb2b3c2..6aba30695 100644 --- a/src/DynamicData/List/ObservableListEx.WhereReasonsAreNot.cs +++ b/src/DynamicData/List/ObservableListEx.WhereReasonsAreNot.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -25,11 +16,12 @@ public static partial class ObservableListEx { /// /// Filters the changeset stream to exclude changes with the specified values. - /// Index information is stripped from the output because removing some changes invalidates the original index positions. + /// Mutation index information is stripped from the output because removing some changes invalidates the original index positions. /// The exception is when only is excluded, since removing Refresh does not affect index calculations. + /// Retained Refresh notifications always keep their required original source index. /// /// The type of the item. - /// The source to filter by excluding change reasons. + /// The source IObservable<IChangeSet<T>> to filter by excluding change reasons. /// The change reasons to exclude. Must specify at least one. /// A list changeset stream with the specified change reasons removed. /// is . @@ -40,13 +32,14 @@ public static partial class ObservableListEx /// indices are preserved, since removing Refresh does not affect index calculations. /// /// - /// - /// - /// + /// WhereReasonsAre<T>(IObservable<IChangeSet<T>>, ListChangeReason[]) + /// SuppressRefresh<T>(IObservable<IChangeSet<T>>) + /// ChangeSetEx.YieldWithoutIndex<T>(IEnumerable<Change<T>>) public static IObservable> WhereReasonsAreNot(this IObservable> source, params ListChangeReason[] reasons) where T : notnull { - reasons.ThrowArgumentNullExceptionIfNull(nameof(reasons)); + ArgumentExceptionHelper.ThrowIfNull(reasons); + ArgumentExceptionHelper.ThrowIfNull(source); if (reasons.Length == 0) { diff --git a/src/DynamicData/List/ObservableListEx.Xor.cs b/src/DynamicData/List/ObservableListEx.Xor.cs index b63b5c6d0..462206421 100644 --- a/src/DynamicData/List/ObservableListEx.Xor.cs +++ b/src/DynamicData/List/ObservableListEx.Xor.cs @@ -1,22 +1,20 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. @@ -28,8 +26,8 @@ public static partial class ObservableListEx /// Items present in exactly one source are included in the result. /// /// The type of the item. - /// The primary source to exclusively combine. - /// The other changeset streams to combine with. + /// The primary source IObservable<IChangeSet<T>> to exclusively combine. + /// The other IObservable<IChangeSet<T>> changeset streams to combine with. /// A list changeset stream containing items that exist in exactly one source. /// is . /// @@ -47,43 +45,55 @@ public static partial class ObservableListEx /// MovedIgnored. /// /// - /// - /// - /// - /// + /// And<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Or<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// Except<T>(IObservable<IChangeSet<T>>, IObservable<IChangeSet<T>>[]) + /// ObservableCacheEx.Xor<TObject, TKey>(IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>[]) public static IObservable> Xor(this IObservable> source, params IObservable>[] others) where T : notnull { - others.ThrowArgumentNullExceptionIfNull(nameof(others)); + ArgumentExceptionHelper.ThrowIfNull(others); return source.Combine(CombineOperator.Xor, others); } - /// + /// This overload follows the same core behavior as the related overload. /// /// Applies a logical XOR between a pre-built collection of list changeset sources. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Xor(this ICollection>> sources) where T : notnull => sources.Combine(CombineOperator.Xor); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Dynamic XOR: sources can be added or removed from the at runtime. + /// Dynamic XOR: sources can be added or removed from the IObservableList<T> at runtime. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Xor(this IObservableList>> sources) where T : notnull => sources.Combine(CombineOperator.Xor); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Dynamic XOR accepting of . Each inner list's Connect() is used as a source. + /// Dynamic XOR accepting IObservableList<T> of IObservableList<T>. Each inner list's Connect() is used as a source. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Xor(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.Xor); - /// + /// This overload follows the same core behavior as the related overload. /// - /// Dynamic XOR accepting of . Each inner list's Connect() is used as a source. + /// Dynamic XOR accepting IObservableList<T> of ISourceList<T>. Each inner list's Connect() is used as a source. /// + /// The type of the T value. + /// The sources value. + /// The resulting observable sequence. public static IObservable> Xor(this IObservableList> sources) where T : notnull => sources.Combine(CombineOperator.Xor); } diff --git a/src/DynamicData/List/ObservableListEx.cs b/src/DynamicData/List/ObservableListEx.cs index ffe07170a..730c4dd8f 100644 --- a/src/DynamicData/List/ObservableListEx.cs +++ b/src/DynamicData/List/ObservableListEx.cs @@ -1,22 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using System.Reactive; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData.Binding; -using DynamicData.Cache.Internal; -using DynamicData.List.Internal; -using DynamicData.List.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Extensions for ObservableList. diff --git a/src/DynamicData/List/PageChangeSet.cs b/src/DynamicData/List/PageChangeSet.cs index c746ca0e3..5ee4e93a3 100644 --- a/src/DynamicData/List/PageChangeSet.cs +++ b/src/DynamicData/List/PageChangeSet.cs @@ -1,42 +1,93 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Collections; +using DynamicData.Reactive.Operators; +#else using DynamicData.Operators; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the PageChangeSet class. +/// +/// The type of the T value. +/// The virtualChangeSet value. +/// The response value. internal sealed class PageChangeSet(IChangeSet virtualChangeSet, IPageResponse response) : IPageChangeSet where T : notnull { + /// + /// The _virtualChangeSet field. + /// private readonly IChangeSet _virtualChangeSet = virtualChangeSet ?? throw new ArgumentNullException(nameof(virtualChangeSet)); + /// + /// Gets the Count value. + /// public int Count => _virtualChangeSet.Count; + /// + /// Gets the Refreshes value. + /// public int Refreshes => _virtualChangeSet.Refreshes; + /// + /// Gets the Response value. + /// public IPageResponse Response { get; } = response ?? throw new ArgumentNullException(nameof(response)); + /// + /// Gets the Adds value. + /// int IChangeSet.Adds => _virtualChangeSet.Adds; + /// + /// Gets or sets the Capacity value. + /// int IChangeSet.Capacity { get => _virtualChangeSet.Capacity; set => _virtualChangeSet.Capacity = value; } + /// + /// Gets the Moves value. + /// int IChangeSet.Moves => _virtualChangeSet.Moves; + /// + /// Gets the Removes value. + /// int IChangeSet.Removes => _virtualChangeSet.Removes; + /// + /// Gets the Replaced value. + /// int IChangeSet.Replaced => _virtualChangeSet.Replaced; + /// + /// Gets the TotalChanges value. + /// int IChangeSet.TotalChanges => _virtualChangeSet.TotalChanges; + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() => _virtualChangeSet.GetEnumerator(); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/List/RangeChange.cs b/src/DynamicData/List/RangeChange.cs index 4abef195e..a9c25491e 100644 --- a/src/DynamicData/List/RangeChange.cs +++ b/src/DynamicData/List/RangeChange.cs @@ -2,10 +2,12 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Multiple change container. @@ -13,6 +15,9 @@ namespace DynamicData; /// The type of the item. public sealed class RangeChange : IEnumerable { + /// + /// The _items field. + /// private readonly List _items; /// @@ -60,6 +65,7 @@ private RangeChange() public void Add(T item) => _items.Add(item); /// + /// The result of the operation. public IEnumerator GetEnumerator() => _items.GetEnumerator(); /// @@ -84,5 +90,6 @@ private RangeChange() public override string ToString() => $"Range<{typeof(T).Name}>. Count={Count}"; /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/List/SortException.cs b/src/DynamicData/List/SortException.cs index 42da97c8a..bd2070abe 100644 --- a/src/DynamicData/List/SortException.cs +++ b/src/DynamicData/List/SortException.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Thrown when an exception occurs within the sort operators. diff --git a/src/DynamicData/List/SortOptions.cs b/src/DynamicData/List/SortOptions.cs index 14beb63d7..25c9fada2 100644 --- a/src/DynamicData/List/SortOptions.cs +++ b/src/DynamicData/List/SortOptions.cs @@ -1,8 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Options for sorting. diff --git a/src/DynamicData/List/SourceList.cs b/src/DynamicData/List/SourceList.cs index a159af490..86dfda6c4 100644 --- a/src/DynamicData/List/SourceList.cs +++ b/src/DynamicData/List/SourceList.cs @@ -3,14 +3,20 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Reactive.Subjects; +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// An editable observable list. @@ -20,33 +26,74 @@ namespace DynamicData; public sealed class SourceList : ISourceList where T : notnull { - private readonly ISubject> _changes = new Subject>(); + /// + /// The _changes field. + /// + private readonly Signal> _changes = new(); - private readonly Subject> _changesPreview = new(); + /// + /// The _changesPreview field. + /// + private readonly Signal> _changesPreview = new(); + /// + /// The _cleanUp field. + /// private readonly IDisposable _cleanUp; - private readonly Lazy> _countChanged = new(() => new Subject()); + /// + /// The _countChanged field. + /// + private readonly Lazy> _countChanged = new(() => new Signal()); -#if NET9_0_OR_GREATER + /// + /// The _locker field. + /// private readonly Lock _locker = new(); -#else - private readonly object _locker = new(); -#endif + /// + /// The _readerWriter field. + /// private readonly ReaderWriter _readerWriter = new(); - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Disposal is superfluous after completion, and causes a bunch of test failures")] - private readonly Lazy> _isEditInProgress; + /// + /// The _notifications field. + /// + private readonly DeliveryQueue _notifications; + + /// + /// The _isEditInProgress field. + /// + [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Completed with _cleanUp and explicit disposal is redundant.")] + private readonly Lazy> _isEditInProgress; + /// + /// The _editLevel field. + /// private int _editLevel; + /// + /// The _currentVersion field. + /// + private long _currentVersion; + + /// + /// The _currentDeliveryVersion field. + /// + private long _currentDeliveryVersion; + + /// + /// The _isDisposed field. + /// + private bool _isDisposed; + /// /// Initializes a new instance of the class. /// /// The source. public SourceList(IObservable>? source = null) { + _notifications = new DeliveryQueue(_locker, new ListUpdateObserver(this)); _isEditInProgress = new(() => new(_editLevel is not 0)); var loader = source is null ? Disposable.Empty : LoadFromSource(source); @@ -55,11 +102,7 @@ public SourceList(IObservable>? source = null) () => { loader.Dispose(); - OnCompleted(); - if (_countChanged.IsValueCreated) - { - _countChanged.Value.OnCompleted(); - } + NotifyCompleted(); }); } @@ -71,124 +114,186 @@ public SourceList(IObservable>? source = null) Observable.Create( observer => { - lock (_locker) + using var readLock = _notifications.AcquireReadLock(); + + if (_isDisposed) { - var source = _countChanged.Value.StartWith(_readerWriter.Count).DistinctUntilChanged(); - return source.SubscribeSafe(observer); + observer.OnNext(_readerWriter.Count); + observer.OnCompleted(); + return Disposable.Empty; } + + var snapshotVersion = _currentVersion; + var countChanged = readLock.HasPending + ? _countChanged.Value.SkipWhile(_ => Volatile.Read(ref _currentDeliveryVersion) <= snapshotVersion) + : _countChanged.Value; + + var source = countChanged.StartWith(_readerWriter.Count).DistinctUntilChanged(); + return source.SubscribeSafe(observer); }); /// public IReadOnlyList Items => _readerWriter.Items; /// + /// The predicate value. + /// The result of the operation. public IObservable> Connect(Func? predicate = null) => Observable.Create>(observer => { lock (_locker) { var observable = _isEditInProgress.IsValueCreated || (_editLevel is not 0) - - // Defer connection until there is no longer an in-progress edit. ? _isEditInProgress.Value .Where(static isEditInProgress => !isEditInProgress) .Take(1) .SelectMany(_ => CreateConnectObservable(predicate)) - - // Otherwise, just connect immediately, and avoid forcing the edit-tracking system to initialize. : CreateConnectObservable(predicate); return observable.SubscribeSafe(observer); } }); + private IObservable> CreateConnectObservable(Func? predicate) + { + var observable = Observable.Create>( + observer => + { + using var readLock = _notifications.AcquireReadLock(); + + if (_readerWriter.Items.Length > 0) + { + observer.OnNext( + new ChangeSet + { + new(ListChangeReason.AddRange, _readerWriter.Items, 0) + }); + } + + if (_isDisposed) + { + observer.OnCompleted(); + return Disposable.Empty; + } + + var snapshotVersion = _currentVersion; + var changes = readLock.HasPending + ? _changes.SkipWhile(_ => Volatile.Read(ref _currentDeliveryVersion) <= snapshotVersion) + : (IObservable>)_changes; + + var source = changes.Finally(observer.OnCompleted); + + return source.SubscribeSafe(observer); + }); + + if (predicate is not null) + { + observable = new FilterStatic(observable, predicate).Run(); + } + + return observable; + } + /// public void Dispose() { + using (var notifications = _notifications.AcquireLock()) + { + if (_isDisposed) + { + return; + } + + _isDisposed = true; + } + _cleanUp.Dispose(); + + if (_notifications.IsDeliveringOnCurrentThread) + { + return; + } + + SpinWait spinner = default; + while (!_notifications.IsTerminated) + { + spinner.SpinOnce(); + } + + _notifications.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 - // we need to rework the lifecycle mechanics of this class, as a whole, but that's probably going to involve - // breaking changes. + _changes.Dispose(); + if (_countChanged.IsValueCreated) + { + _countChanged.Value.Dispose(); + } } /// + /// The updateAction value. public void Edit(Action> updateAction) { - updateAction.ThrowArgumentNullExceptionIfNull(nameof(updateAction)); + ArgumentExceptionHelper.ThrowIfNull(updateAction); - lock (_locker) + using var notifications = _notifications.AcquireLock(); + + if (_isDisposed) { - IChangeSet? changes = null; + throw new ObjectDisposedException(nameof(SourceList)); + } - _editLevel++; - if (_isEditInProgress.IsValueCreated && (_editLevel is 1)) - _isEditInProgress.Value.OnNext(true); - try - { - try - { - if (_editLevel == 1) - { - changes = _changesPreview.HasObservers ? _readerWriter.WriteWithPreview(updateAction, InvokeNextPreview) : _readerWriter.Write(updateAction); - } - else - { - _readerWriter.WriteNested(updateAction); - } - } - finally - { - _editLevel--; - } + IChangeSet? changes = null; - if (changes is not null && (_editLevel is 0)) - { - InvokeNext(changes); - } + _editLevel++; + if (_isEditInProgress.IsValueCreated && (_editLevel is 1)) + { + _isEditInProgress.Value.OnNext(true); + } + + try + { + if (_editLevel == 1) + { + changes = _changesPreview.HasObservers ? _readerWriter.WriteWithPreview(updateAction, InvokeNextPreview) : _readerWriter.Write(updateAction); } - finally + else { - if (_isEditInProgress.IsValueCreated && (_editLevel is 0)) - _isEditInProgress.Value.OnNext(false); + _readerWriter.WriteNested(updateAction); } } - } + finally + { + _editLevel--; - /// - public IObservable> Preview(Func? predicate = null) - { - IObservable> observable = _changesPreview; + if (changes is not null && changes.Count != 0 && _editLevel == 0) + { + notifications.EnqueueNext(new ListUpdate(changes, _readerWriter.Count, ++_currentVersion)); + } - if (predicate is not null) - { - observable = new FilterStatic(observable, predicate).Run(); + if (_isEditInProgress.IsValueCreated && (_editLevel is 0)) + { + _isEditInProgress.Value.OnNext(false); + } } - - return observable; } - private IObservable> CreateConnectObservable(Func? predicate) + /// + /// The predicate value. + /// The result of the operation. + public IObservable> Preview(Func? predicate = null) { var observable = Observable.Create>( observer => { - lock (_locker) + using var readLock = _notifications.AcquireReadLock(); + + if (_isDisposed) { - if (_readerWriter.Items.Length > 0) - { - observer.OnNext( - new ChangeSet - { - new(ListChangeReason.AddRange, _readerWriter.Items, 0) - }); - } - - var source = _changes.Finally(observer.OnCompleted); - - return source.SubscribeSafe(observer); + observer.OnCompleted(); + return Disposable.Empty; } + + return _changesPreview.SubscribeSafe(observer); }); if (predicate is not null) @@ -199,58 +304,136 @@ private IObservable> CreateConnectObservable(Func? predic return observable; } - private void InvokeNext(IChangeSet changes) + /// + /// Executes the InvokeNextPreview operation. + /// + /// The changes value. + private void InvokeNextPreview(IChangeSet changes) { - if (changes.Count == 0) + if (changes.Count == 0 || _notifications.IsTerminated) { return; } lock (_locker) { - _changes.OnNext(changes); + _changesPreview.OnNext(changes); + } + } - if (_countChanged.IsValueCreated) + /// + /// Executes the LoadFromSource operation. + /// + /// The source value. + /// The result of the operation. + private IDisposable LoadFromSource(IObservable> source) => + source.Subscribe( + changes => { - _countChanged.Value.OnNext(_readerWriter.Count); - } - } + using var notifications = _notifications.AcquireLock(); + + if (_isDisposed) + { + return; + } + + var capturedChanges = _readerWriter.Write(changes); + if (capturedChanges.Count != 0) + { + notifications.EnqueueNext(new ListUpdate(capturedChanges, _readerWriter.Count, ++_currentVersion)); + } + }, + NotifyError, + NotifyCompleted); + + /// + /// Executes the NotifyCompleted operation. + /// + private void NotifyCompleted() + { + using var notifications = _notifications.AcquireLock(); + notifications.EnqueueCompleted(); } - private void InvokeNextPreview(IChangeSet changes) + /// + /// Executes the NotifyError operation. + /// + /// The exception value. + private void NotifyError(Exception exception) + { + using var notifications = _notifications.AcquireLock(); + notifications.EnqueueError(exception); + } + + /// + /// The notification payload for list delivery. Null Changes = count-only notification. + /// + /// The Changes value. + /// The Count value. + /// The Version value. + private readonly record struct ListUpdate(IChangeSet? Changes, int Count, long Version = 0); + + /// + /// Observer that dispatches items to the list's downstream subjects. + /// + /// The source list value. + private sealed class ListUpdateObserver(SourceList sourceList) : IObserver { - if (changes.Count == 0) + /// + /// Executes the OnNext operation. + /// + /// The value value. + public void OnNext(ListUpdate value) { - return; + if (value.Changes is not null) + { + Volatile.Write(ref sourceList._currentDeliveryVersion, value.Version); + sourceList._changes.OnNext(value.Changes); + } + + if (sourceList._countChanged.IsValueCreated) + { + sourceList._countChanged.Value.OnNext(value.Count); + } } - lock (_locker) + /// + /// Executes the OnError operation. + /// + /// The error value. + public void OnError(Exception error) { - _changesPreview.OnNext(changes); - } - } + sourceList._changesPreview.OnError(error); + sourceList._changes.OnError(error); - private IDisposable LoadFromSource(IObservable> source) => source.Synchronize(_locker).Finally(OnCompleted).Select(_readerWriter.Write).Subscribe(InvokeNext, OnError, OnCompleted); + if (sourceList._isEditInProgress.IsValueCreated) + { + sourceList._isEditInProgress.Value.OnError(error); + } - private void OnCompleted() - { - lock (_locker) - { - _changesPreview.OnCompleted(); - _changes.OnCompleted(); - if (_isEditInProgress.IsValueCreated) - _isEditInProgress.Value.OnCompleted(); + if (sourceList._countChanged.IsValueCreated) + { + sourceList._countChanged.Value.OnError(error); + } } - } - private void OnError(Exception exception) - { - lock (_locker) + /// + /// Executes the OnCompleted operation. + /// + public void OnCompleted() { - _changesPreview.OnError(exception); - _changes.OnError(exception); - if (_isEditInProgress.IsValueCreated) - _isEditInProgress.Value.OnError(exception); + sourceList._changesPreview.OnCompleted(); + sourceList._changes.OnCompleted(); + + if (sourceList._isEditInProgress.IsValueCreated) + { + sourceList._isEditInProgress.Value.OnCompleted(); + } + + if (sourceList._countChanged.IsValueCreated) + { + sourceList._countChanged.Value.OnCompleted(); + } } } } diff --git a/src/DynamicData/List/SourceListEditConvenienceEx.cs b/src/DynamicData/List/SourceListEditConvenienceEx.cs index 7c08529f8..a3ce89d45 100644 --- a/src/DynamicData/List/SourceListEditConvenienceEx.cs +++ b/src/DynamicData/List/SourceListEditConvenienceEx.cs @@ -1,11 +1,20 @@ // Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +using DynamicData.Reactive.List.Internal; +#else using DynamicData.List.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Convenience methods for a source list. @@ -21,7 +30,7 @@ public static class SourceListEditConvenienceEx public static void Add(this ISourceList source, T item) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.Add(item)); } @@ -35,7 +44,8 @@ public static void Add(this ISourceList source, T item) public static void AddRange(this ISourceList source, IEnumerable items) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(items); source.Edit(list => list.AddRange(items)); } @@ -48,7 +58,7 @@ public static void AddRange(this ISourceList source, IEnumerable items) public static void Clear(this ISourceList source) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.Clear()); } @@ -64,8 +74,8 @@ public static void Clear(this ISourceList source) public static void EditDiff(this ISourceList source, IEnumerable allItems, IEqualityComparer? equalityComparer = null) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - allItems.ThrowArgumentNullExceptionIfNull(nameof(allItems)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(allItems); var editDiff = new EditDiff(source, equalityComparer); editDiff.Edit(allItems); @@ -81,13 +91,13 @@ public static void EditDiff(this ISourceList source, IEnumerable allIte public static void Insert(this ISourceList source, int index, T item) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.Insert(index, item)); } /// - /// Inserts the elements of a collection into the at the specified index. + /// Inserts the elements of a collection into the IExtendedList<T> at the specified index. /// /// The item type. /// The source. @@ -96,7 +106,7 @@ public static void Insert(this ISourceList source, int index, T item) public static void InsertRange(this ISourceList source, IEnumerable items, int index) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.AddRange(items, index)); } @@ -111,7 +121,7 @@ public static void InsertRange(this ISourceList source, IEnumerable ite public static void Move(this ISourceList source, int original, int destination) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.Move(original, destination)); } @@ -127,7 +137,7 @@ public static bool Remove(this ISourceList source, T item) where T : notnull { var removed = false; - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => removed = list.Remove(item)); return removed; @@ -142,7 +152,7 @@ public static bool Remove(this ISourceList source, T item) public static void RemoveAt(this ISourceList source, int index) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.RemoveAt(index)); } @@ -156,24 +166,24 @@ public static void RemoveAt(this ISourceList source, int index) public static void RemoveMany(this ISourceList source, IEnumerable itemsToRemove) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.RemoveMany(itemsToRemove)); } /// - /// Removes a range of elements from the . + /// Removes a range of elements from the ISourceList<T>. /// /// The item type. /// The source. /// The zero-based starting index of the range of elements to remove. /// The number of elements to remove. /// is less than 0.-or- is less than 0. - /// and do not denote a valid range of elements in the . + /// and do not denote a valid range of elements in the List<T>. public static void RemoveRange(this ISourceList source, int index, int count) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.RemoveRange(index, count)); } @@ -188,7 +198,7 @@ public static void RemoveRange(this ISourceList source, int index, int cou public static void Replace(this ISourceList source, T original, T destination) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list.Replace(original, destination)); } @@ -203,7 +213,7 @@ public static void Replace(this ISourceList source, T original, T destinat public static void ReplaceAt(this ISourceList source, int index, T item) where T : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); source.Edit(list => list[index] = item); } diff --git a/src/DynamicData/List/SourceListEx.cs b/src/DynamicData/List/SourceListEx.cs index 78ca4d971..c38b22982 100644 --- a/src/DynamicData/List/SourceListEx.cs +++ b/src/DynamicData/List/SourceListEx.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Source list extensions. @@ -23,8 +27,8 @@ public static IObservable> Cast( where TSource : notnull where TDestination : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); - conversionFactory.ThrowArgumentNullExceptionIfNull(nameof(conversionFactory)); + ArgumentExceptionHelper.ThrowIfNull(source); + ArgumentExceptionHelper.ThrowIfNull(conversionFactory); return source.Connect().Cast(conversionFactory); } diff --git a/src/DynamicData/List/Tests/ChangeSetAggregator.cs b/src/DynamicData/List/Tests/ChangeSetAggregator.cs index afac4458b..2180fdfd3 100644 --- a/src/DynamicData/List/Tests/ChangeSetAggregator.cs +++ b/src/DynamicData/List/Tests/ChangeSetAggregator.cs @@ -2,11 +2,12 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Reactive.Disposables; -using System.Reactive.Linq; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Aggregates all events and statistics for a change set to help assertions when testing. @@ -15,8 +16,14 @@ namespace DynamicData.Tests; public class ChangeSetAggregator : IDisposable where TObject : notnull { + /// + /// The _disposer field. + /// private readonly IDisposable _disposer; + /// + /// The _isDisposed field. + /// private bool _isDisposed; /// @@ -25,6 +32,8 @@ public class ChangeSetAggregator : IDisposable /// The source. public ChangeSetAggregator(IObservable> source) { + ArgumentExceptionHelper.ThrowIfNull(source); + var published = source.Publish(); Data = published.AsObservableList(); diff --git a/src/DynamicData/List/Tests/ListTextEx.cs b/src/DynamicData/List/Tests/ListTextEx.cs index 7913113bf..cb771ee5d 100644 --- a/src/DynamicData/List/Tests/ListTextEx.cs +++ b/src/DynamicData/List/Tests/ListTextEx.cs @@ -1,9 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.Tests; +#else namespace DynamicData.Tests; +#endif /// /// Test extensions. diff --git a/src/DynamicData/List/UnspecifiedIndexException.cs b/src/DynamicData/List/UnspecifiedIndexException.cs index 643fa9f62..21fbab3ef 100644 --- a/src/DynamicData/List/UnspecifiedIndexException.cs +++ b/src/DynamicData/List/UnspecifiedIndexException.cs @@ -3,7 +3,11 @@ // See the LICENSE file in the project root for full license information. // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Thrown when an index is expected but not specified. diff --git a/src/DynamicData/List/VirtualChangeSet.cs b/src/DynamicData/List/VirtualChangeSet.cs index 086490a36..bedaab07f 100644 --- a/src/DynamicData/List/VirtualChangeSet.cs +++ b/src/DynamicData/List/VirtualChangeSet.cs @@ -2,39 +2,85 @@ // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections; - // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif +/// +/// Provides members for the VirtualChangeSet class. +/// +/// The type of the T value. +/// The virtualChangeSet value. +/// The response value. internal sealed class VirtualChangeSet(IChangeSet virtualChangeSet, IVirtualResponse response) : IVirtualChangeSet where T : notnull { + /// + /// The _virtualChangeSet field. + /// private readonly IChangeSet _virtualChangeSet = virtualChangeSet ?? throw new ArgumentNullException(nameof(virtualChangeSet)); + /// + /// Gets the Refreshes value. + /// public int Refreshes => _virtualChangeSet.Refreshes; + /// + /// Gets the Response value. + /// public IVirtualResponse Response { get; } = response ?? throw new ArgumentNullException(nameof(response)); + /// + /// Gets the Adds value. + /// int IChangeSet.Adds => _virtualChangeSet.Adds; + /// + /// Gets or sets the Capacity value. + /// int IChangeSet.Capacity { get => _virtualChangeSet.Capacity; set => _virtualChangeSet.Capacity = value; } + /// + /// Gets the Count value. + /// int IChangeSet.Count => _virtualChangeSet.Count; + /// + /// Gets the Moves value. + /// int IChangeSet.Moves => _virtualChangeSet.Moves; + /// + /// Gets the Removes value. + /// int IChangeSet.Removes => _virtualChangeSet.Removes; + /// + /// Gets the Replaced value. + /// int IChangeSet.Replaced => _virtualChangeSet.Replaced; + /// + /// Gets the TotalChanges value. + /// int IChangeSet.TotalChanges => _virtualChangeSet.TotalChanges; + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. public IEnumerator> GetEnumerator() => _virtualChangeSet.GetEnumerator(); + /// + /// Executes the GetEnumerator operation. + /// + /// The result of the operation. IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } diff --git a/src/DynamicData/ObservableChangeSet.cs b/src/DynamicData/ObservableChangeSet.cs index e9106b3e3..9649ca2ea 100644 --- a/src/DynamicData/ObservableChangeSet.cs +++ b/src/DynamicData/ObservableChangeSet.cs @@ -1,11 +1,13 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM -using System.Reactive.Disposables; -using System.Reactive.Linq; +namespace DynamicData.Reactive; +#else namespace DynamicData; +#endif /// /// Creation methods for observable change sets. @@ -24,8 +26,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Create( cache => @@ -48,14 +50,15 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Observable.Create>( observer => { var cache = new SourceCache(keySelector); var disposable = new SingleAssignmentDisposable(); + var responder = cache.Connect().SubscribeSafe(observer); try { @@ -66,7 +69,7 @@ public static IObservable> Create(Func< observer.OnError(e); } - return new CompositeDisposable(disposable, Disposable.Create(observer.OnCompleted), cache.Connect().SubscribeSafe(observer), cache); + return new CompositeDisposable(disposable, Disposable.Create(observer.OnCompleted), responder, cache); }); } @@ -82,8 +85,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Create(async (cache, _) => await subscribe(cache).ConfigureAwait(false), keySelector); } @@ -100,8 +103,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Observable.Create>( async (observer, ct) => @@ -135,8 +138,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Create((cache, _) => subscribe(cache), keySelector); } @@ -153,8 +156,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Observable.Create>( async (observer, ct) => @@ -197,8 +200,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Observable.Create>( async observer => @@ -231,8 +234,8 @@ public static IObservable> Create(Func< where TObject : notnull where TKey : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); - keySelector.ThrowArgumentNullExceptionIfNull(nameof(keySelector)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); + ArgumentExceptionHelper.ThrowIfNull(keySelector); return Observable.Create>( async (observer, ct) => @@ -262,7 +265,7 @@ public static IObservable> Create(Func< public static IObservable> Create(Func, Action> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Create( list => @@ -281,13 +284,14 @@ public static IObservable> Create(Func, Action> public static IObservable> Create(Func, IDisposable> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Observable.Create>( observer => { var list = new SourceList(); IDisposable? disposeAction = null; + var responder = list.Connect().SubscribeSafe(observer); try { @@ -299,7 +303,7 @@ public static IObservable> Create(Func, IDisposa } return new CompositeDisposable( - list.Connect().SubscribeSafe(observer), + responder, list, Disposable.Create( () => @@ -319,7 +323,7 @@ public static IObservable> Create(Func, IDisposa public static IObservable> Create(Func, Task> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Create((list, _) => subscribe(list)); } @@ -333,7 +337,7 @@ public static IObservable> Create(Func, Task> Create(Func, CancellationToken, Task> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Observable.Create>( async (observer, ct) => @@ -374,7 +378,7 @@ public static IObservable> Create(Func, Cancella public static IObservable> Create(Func, Task> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Create(async (list, _) => await subscribe(list).ConfigureAwait(false)); } @@ -388,7 +392,7 @@ public static IObservable> Create(Func, Task> Create(Func, CancellationToken, Task> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Observable.Create>( async (observer, ct) => @@ -428,7 +432,7 @@ public static IObservable> Create(Func, Cancella public static IObservable> Create(Func, Task> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Observable.Create>( async observer => @@ -458,7 +462,7 @@ public static IObservable> Create(Func, Task> su public static IObservable> Create(Func, CancellationToken, Task> subscribe) where T : notnull { - subscribe.ThrowArgumentNullExceptionIfNull(nameof(subscribe)); + ArgumentExceptionHelper.ThrowIfNull(subscribe); return Observable.Create>( async (observer, ct) => diff --git a/src/DynamicData/Platforms/net45/PFilter.cs b/src/DynamicData/Platforms/net45/PFilter.cs index f4aff797e..33ffe099c 100644 --- a/src/DynamicData/Platforms/net45/PFilter.cs +++ b/src/DynamicData/Platforms/net45/PFilter.cs @@ -3,17 +3,37 @@ // See the LICENSE file in the project root for full license information. #if P_LINQ -using System.Reactive.Linq; +#if REACTIVE_SHIM + +using DynamicData.Reactive.Cache.Internal; +#else using DynamicData.Cache.Internal; +#endif // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - internal sealed class PFilter(IObservable> source, Func filter, ParallelisationOptions parallelisationOptions) +/// +/// Provides members for the PFilter class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The filter value. +/// The parallelisationOptions value. +internal sealed class PFilter(IObservable> source, Func filter, ParallelisationOptions parallelisationOptions) where TObject : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { @@ -21,10 +41,23 @@ public IObservable> Run() => Observable.Create filter, ParallelisationOptions parallelisationOptions) : AbstractFilter(new ChangeAwareCache(), filter) +/// +/// Provides members for the PLinqFilteredUpdater class. +/// +/// The filter value. +/// The parallelisationOptions value. +private sealed class PLinqFilteredUpdater(Func filter, ParallelisationOptions parallelisationOptions) : AbstractFilter(new ChangeAwareCache(), filter) { + /// + /// The _parallelisationOptions field. + /// private readonly ParallelisationOptions _parallelisationOptions = parallelisationOptions; + /// + /// Executes the GetChangesWithFilter operation. + /// + /// The updates value. + /// The result of the operation. protected override IEnumerable GetChangesWithFilter(ChangeSet updates) { if (updates.ShouldParallelise(_parallelisationOptions)) @@ -35,7 +68,13 @@ protected override IEnumerable GetChangesWithFilter(ChangeSet< return updates.Select(u => new UpdateWithFilter(Filter(u.Current), u)).ToArray(); } - protected override IEnumerable> Refresh(IEnumerable> items, Func, Optional>> factory) + /// + /// Executes the Refresh operation. + /// + /// The items value. + /// The factory value. + /// The result of the operation. + protected override IEnumerable> Refresh(IEnumerable> items, Func, ReactiveUI.Primitives.Optional>> factory) { var keyValuePairs = items as KeyValuePair[] ?? items.ToArray(); diff --git a/src/DynamicData/Platforms/net45/PSubscribeMany.cs b/src/DynamicData/Platforms/net45/PSubscribeMany.cs index 4c9e4be35..435c3330c 100644 --- a/src/DynamicData/Platforms/net45/PSubscribeMany.cs +++ b/src/DynamicData/Platforms/net45/PSubscribeMany.cs @@ -3,20 +3,40 @@ // See the LICENSE file in the project root for full license information. #if P_LINQ -using System.Reactive.Disposables; -using System.Reactive.Linq; // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - internal sealed class PSubscribeMany(IObservable> source, Func subscriptionFactory, ParallelisationOptions parallelisationOptions) +/// +/// Provides members for the PSubscribeMany class. +/// +/// The type of the TObject value. +/// The type of the TKey value. +/// The source value. +/// The subscriptionFactory value. +/// The parallelisationOptions value. +internal sealed class PSubscribeMany(IObservable> source, Func subscriptionFactory, ParallelisationOptions parallelisationOptions) where TObject : notnull where TKey : notnull { + /// + /// The _source field. + /// private readonly IObservable> _source = source ?? throw new ArgumentNullException(nameof(source)); + /// + /// The _subscriptionFactory field. + /// private readonly Func _subscriptionFactory = subscriptionFactory ?? throw new ArgumentNullException(nameof(subscriptionFactory)); + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>( observer => { diff --git a/src/DynamicData/Platforms/net45/PTransform.cs b/src/DynamicData/Platforms/net45/PTransform.cs index a9871c335..3bcec44b6 100644 --- a/src/DynamicData/Platforms/net45/PTransform.cs +++ b/src/DynamicData/Platforms/net45/PTransform.cs @@ -3,20 +3,37 @@ // See the LICENSE file in the project root for full license information. #if P_LINQ -using System.Reactive.Linq; // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - internal sealed class PTransform( +/// +/// Provides members for the PTransform class. +/// +/// The type of the TDestination value. +/// The type of the TSource value. +/// The type of the TKey value. +/// The source value. +/// The transformFactory value. +/// The parallelisationOptions value. +/// The exceptionCallback value. +internal sealed class PTransform( IObservable> source, - Func, TKey, TDestination> transformFactory, + Func, TKey, TDestination> transformFactory, ParallelisationOptions parallelisationOptions, Action>? exceptionCallback = null) where TDestination : notnull where TSource : notnull where TKey : notnull { + /// + /// Executes the Run operation. + /// + /// The result of the operation. public IObservable> Run() => Observable.Create>(observer => { @@ -25,7 +42,13 @@ public IObservable> Run() => return transformer.NotEmpty().SubscribeSafe(observer); }); - [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0305:Simplify collection initialization", Justification = "A collection initializer is not equivalent to a .ToArray() call for a ParallelQuery. This change actually introduces a race-condition exception.")] + /// + /// Executes the DoTransform operation. + /// + /// The cache value. + /// The changes value. + /// The result of the operation. + [SuppressMessage("Style", "IDE0305:Simplify collection initialization", Justification = "A collection initializer is not equivalent to a .ToArray() call for a ParallelQuery. This change actually introduces a race-condition exception.")] private ChangeSet DoTransform(ChangeAwareCache cache, IChangeSet changes) { var transformed = changes.ShouldParallelise(parallelisationOptions) @@ -35,6 +58,11 @@ private ChangeSet DoTransform(ChangeAwareCache + /// Executes the ToDestination operation. + /// + /// The change value. + /// The result of the operation. private TransformResult ToDestination(Change change) { try @@ -59,6 +87,12 @@ private TransformResult ToDestination(Change change) } } + /// + /// Executes the ProcessUpdates operation. + /// + /// The cache value. + /// The transformedItems value. + /// The result of the operation. private ChangeSet ProcessUpdates(ChangeAwareCache cache, IEnumerable transformedItems) { foreach (var result in transformedItems) @@ -92,8 +126,16 @@ private ChangeSet ProcessUpdates(ChangeAwareCache +/// Represents the TransformResult value. +/// +private readonly struct TransformResult { + /// + /// Initializes a new instance of the struct. + /// + /// The change value. + /// The destination value. public TransformResult(in Change change, TDestination destination) : this() { @@ -103,15 +145,24 @@ public TransformResult(in Change change, TDestination destination Key = change.Key; } + /// + /// Initializes a new instance of the struct. + /// + /// The change value. public TransformResult(in Change change) : this() { Change = change; - Destination = Optional.None; + Destination = ReactiveUI.Primitives.Optional.None; Success = true; Key = change.Key; } + /// + /// Initializes a new instance of the struct. + /// + /// The change value. + /// The error value. public TransformResult(in Change change, Exception error) : this() { @@ -121,14 +172,29 @@ public TransformResult(in Change change, Exception error) Key = change.Key; } + /// + /// Gets the Change value. + /// public Change Change { get; } + /// + /// Gets the Error value. + /// public Exception? Error { get; } + /// + /// Gets the Success value. + /// public bool Success { get; } - public Optional Destination { get; } + /// + /// Gets the Destination value. + /// + public ReactiveUI.Primitives.Optional Destination { get; } + /// + /// Gets the Key value. + /// public TKey Key { get; } } } diff --git a/src/DynamicData/Platforms/net45/ParallelEx.cs b/src/DynamicData/Platforms/net45/ParallelEx.cs index 3d29d2b96..defde0461 100644 --- a/src/DynamicData/Platforms/net45/ParallelEx.cs +++ b/src/DynamicData/Platforms/net45/ParallelEx.cs @@ -4,13 +4,25 @@ #if P_LINQ // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - /// - /// Parallelisation extensions for DynamicData. - /// - internal static class ParallelEx +/// +/// Parallelisation extensions for DynamicData. +/// +internal static class ParallelEx { + /// + /// Executes the Parallelise operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The option value. + /// The result of the operation. internal static ParallelQuery> Parallelise(this IChangeSet source, ParallelisationOptions option) where TObject : notnull where TKey : notnull => option.Type switch @@ -20,6 +32,14 @@ internal static ParallelQuery> Parallelise( _ => throw new ArgumentException("Should not parallelise! Call ShouldParallelise() first"), }; + /// + /// Executes the Parallelise operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The option value. + /// The result of the operation. internal static ParallelQuery> Parallelise(this IEnumerable> source, ParallelisationOptions option) where TKey : notnull => option.Type switch { @@ -28,6 +48,13 @@ internal static ParallelQuery> Parallelise throw new ArgumentException("Should not parallelise! Call ShouldParallelise() first"), }; + /// + /// Executes the Parallelise operation. + /// + /// The type of the T value. + /// The source value. + /// The option value. + /// The result of the operation. internal static IEnumerable Parallelise(this IEnumerable source, ParallelisationOptions option) { switch (option.Type) @@ -59,10 +86,26 @@ internal static IEnumerable Parallelise(this IEnumerable source, Parall } } + /// + /// Executes the ShouldParallelise operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The option value. + /// The result of the operation. internal static bool ShouldParallelise(this IChangeSet source, ParallelisationOptions option) where TObject : notnull where TKey : notnull => (option.Type == ParallelType.Parallelise || option.Type == ParallelType.Ordered) && (option.Threshold >= 0 && source.Count >= option.Threshold); + /// + /// Executes the ShouldParallelise operation. + /// + /// The type of the TObject value. + /// The type of the TKey value. + /// The source value. + /// The option value. + /// The result of the operation. internal static bool ShouldParallelise(this IEnumerable> source, ParallelisationOptions option) where TKey : notnull => (option.Type == ParallelType.Parallelise || option.Type == ParallelType.Ordered) && (option.Threshold >= 0 && source.Skip(option.Threshold).Any()); } diff --git a/src/DynamicData/Platforms/net45/ParallelOperators.cs b/src/DynamicData/Platforms/net45/ParallelOperators.cs index b79624fca..2003b4d7c 100644 --- a/src/DynamicData/Platforms/net45/ParallelOperators.cs +++ b/src/DynamicData/Platforms/net45/ParallelOperators.cs @@ -5,12 +5,16 @@ #if P_LINQ // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - /// - /// PLinq operators or Net4 and Net45 only. - /// - public static class ParallelOperators +/// +/// PLinq operators or Net4 and Net45 only. +/// +public static class ParallelOperators { /// /// Filters the stream using the specified predicate. @@ -26,7 +30,7 @@ public static IObservable> Filter(this where TObject : notnull where TKey : notnull { - source.ThrowArgumentNullExceptionIfNull(nameof(source)); + ArgumentExceptionHelper.ThrowIfNull(source); return new PFilter(source, filter, parallelisationOptions).Run(); } @@ -50,9 +54,9 @@ public static IObservable> SubscribeMany(source, (t, _) => subscriptionFactory(t), parallelisationOptions).Run(); } @@ -76,9 +80,9 @@ public static IObservable> SubscribeMany(source, subscriptionFactory, parallelisationOptions).Run(); } @@ -103,9 +107,9 @@ public static IObservable> Transform(source, (t, _, k) => transformFactory(t, k), parallelisationOptions).Run(); } @@ -154,10 +158,10 @@ public static IObservable> TransformSafe(source, (t, _, _) => transformFactory(t), parallelisationOptions, errorHandler).Run(); } diff --git a/src/DynamicData/Platforms/net45/ParallelType.cs b/src/DynamicData/Platforms/net45/ParallelType.cs index 1ef290a51..2f0e0da09 100644 --- a/src/DynamicData/Platforms/net45/ParallelType.cs +++ b/src/DynamicData/Platforms/net45/ParallelType.cs @@ -4,12 +4,16 @@ #if P_LINQ // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - /// - /// The type of parallelisation. - /// - public enum ParallelType +/// +/// The type of parallelisation. +/// +public enum ParallelType { /// /// No parallelisation will take place. diff --git a/src/DynamicData/Platforms/net45/ParallelisationOptions.cs b/src/DynamicData/Platforms/net45/ParallelisationOptions.cs index 72011b438..6d6ed4f59 100644 --- a/src/DynamicData/Platforms/net45/ParallelisationOptions.cs +++ b/src/DynamicData/Platforms/net45/ParallelisationOptions.cs @@ -4,18 +4,22 @@ #if P_LINQ // ReSharper disable once CheckNamespace +#if REACTIVE_SHIM +namespace DynamicData.Reactive.PLinq +#else namespace DynamicData.PLinq +#endif { - /// - /// Options to specify parallelisation of stream operations. Only applicable for .Net4 and .Net45 builds. - /// - /// - /// Initializes a new instance of the class. - /// - /// The type of parallel operation. - /// The threshold before making the operation parallel. - /// The maximum degrees of parallelism. - public class ParallelisationOptions(ParallelType type = ParallelType.None, int threshold = 0, int maxDegreeOfParallelisation = 0) +/// +/// Options to specify parallelisation of stream operations. Only applicable for .Net4 and .Net45 builds. +/// +/// +/// Initializes a new instance of the class. +/// +/// The type of parallel operation. +/// The threshold before making the operation parallel. +/// The maximum degrees of parallelism. +public class ParallelisationOptions(ParallelType type = ParallelType.None, int threshold = 0, int maxDegreeOfParallelisation = 0) { /// /// The default parallelisation options. diff --git a/src/DynamicData/Polyfills/AllowNullAttribute.cs b/src/DynamicData/Polyfills/AllowNullAttribute.cs new file mode 100644 index 000000000..b14f9a67d --- /dev/null +++ b/src/DynamicData/Polyfills/AllowNullAttribute.cs @@ -0,0 +1,14 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NETCOREAPP3_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER +namespace System.Diagnostics.CodeAnalysis; + +/// Specifies that is allowed as an input even if the corresponding type disallows it. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property)] +internal sealed class AllowNullAttribute : Attribute; +#endif diff --git a/src/DynamicData/Polyfills/ArgumentExceptionHelper.cs b/src/DynamicData/Polyfills/ArgumentExceptionHelper.cs new file mode 100644 index 000000000..0136871e1 --- /dev/null +++ b/src/DynamicData/Polyfills/ArgumentExceptionHelper.cs @@ -0,0 +1,34 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else + +namespace DynamicData; +#endif + +/// +/// Polyfill for ArgumentNullException.ThrowIfNull on target frameworks (net462-net481) that predate it. +/// On net8.0 and later this type is not compiled; consuming projects alias the ArgumentExceptionHelper +/// identifier directly to so the call sites bind to the BCL method. +/// +[ExcludeFromCodeCoverage] +internal static class ArgumentExceptionHelper +{ + /// Throws an if is . + /// The reference type argument to validate as non-null. + /// The name of the parameter with which corresponds. + public static void ThrowIfNull( + [NotNull] object? argument, + [CallerArgumentExpression(nameof(argument))] string? paramName = null) + { + if (argument is not null) + { + return; + } + + throw new ArgumentNullException(paramName); + } +} diff --git a/src/DynamicData/Polyfills/ArgumentOutOfRangeExceptionHelper.cs b/src/DynamicData/Polyfills/ArgumentOutOfRangeExceptionHelper.cs new file mode 100644 index 000000000..a97f3823f --- /dev/null +++ b/src/DynamicData/Polyfills/ArgumentOutOfRangeExceptionHelper.cs @@ -0,0 +1,83 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. +#if REACTIVE_SHIM + +namespace DynamicData.Reactive; +#else + +namespace DynamicData; +#endif + +/// Polyfill for modern guard helpers on target frameworks that predate them. +[ExcludeFromCodeCoverage] +internal static class ArgumentOutOfRangeExceptionHelper +{ + /// Throws when is negative. + /// The value to validate. + /// The parameter name. + public static void ThrowIfNegative(int value, [CallerArgumentExpression(nameof(value))] string? paramName = null) + { + if (value >= 0) + { + return; + } + + throw new ArgumentOutOfRangeException(paramName, value, null); + } + + /// Throws when is negative or zero. + /// The value to validate. + /// The parameter name. + public static void ThrowIfNegativeOrZero(int value, [CallerArgumentExpression(nameof(value))] string? paramName = null) + { + if (value > 0) + { + return; + } + + throw new ArgumentOutOfRangeException(paramName, value, null); + } + + /// Throws when is less than . + /// The value to validate. + /// The lower bound. + /// The parameter name. + public static void ThrowIfLessThan(int value, int other, [CallerArgumentExpression(nameof(value))] string? paramName = null) + { + if (value >= other) + { + return; + } + + throw new ArgumentOutOfRangeException(paramName, value, null); + } + + /// Throws when is less than . + /// The value to validate. + /// The lower bound. + /// The parameter name. + public static void ThrowIfLessThan(TimeSpan value, TimeSpan other, [CallerArgumentExpression(nameof(value))] string? paramName = null) + { + if (value >= other) + { + return; + } + + throw new ArgumentOutOfRangeException(paramName, value, null); + } + + /// Throws when is less than or equal to . + /// The value to validate. + /// The lower bound. + /// The parameter name. + public static void ThrowIfLessThanOrEqual(TimeSpan value, TimeSpan other, [CallerArgumentExpression(nameof(value))] string? paramName = null) + { + if (value > other) + { + return; + } + + throw new ArgumentOutOfRangeException(paramName, value, null); + } +} diff --git a/src/DynamicData/Polyfills/CallerArgumentExpressionAttribute.cs b/src/DynamicData/Polyfills/CallerArgumentExpressionAttribute.cs new file mode 100644 index 000000000..c89d0cb23 --- /dev/null +++ b/src/DynamicData/Polyfills/CallerArgumentExpressionAttribute.cs @@ -0,0 +1,25 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET5_0_OR_GREATER +using System.Diagnostics; + +namespace System.Runtime.CompilerServices; + +/// Indicates that a parameter captures the expression passed for another parameter as a string. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage(AttributeTargets.Parameter)] +internal sealed class CallerArgumentExpressionAttribute : Attribute +{ + /// Initializes a new instance of the class. + /// The name of the parameter whose expression should be captured. + public CallerArgumentExpressionAttribute(string parameterName) => + ParameterName = parameterName; + + /// Gets the name of the parameter whose expression should be captured. + public string ParameterName { get; } +} +#endif diff --git a/src/DynamicData/Polyfills/CancellationTokenPolyfillExtensions.cs b/src/DynamicData/Polyfills/CancellationTokenPolyfillExtensions.cs new file mode 100644 index 000000000..a98322436 --- /dev/null +++ b/src/DynamicData/Polyfills/CancellationTokenPolyfillExtensions.cs @@ -0,0 +1,37 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NETCOREAPP3_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER +namespace System.Threading; + +/// Polyfill extensions for on frameworks without UnsafeRegister. +internal static class CancellationTokenPolyfillExtensions +{ + /// Polyfill registration operations for a cancellation token. + extension(CancellationToken token) + { + /// Registers a delegate that is invoked when the token is cancelled, without capturing the execution context. + /// The delegate to invoke on cancellation. + /// The state passed to . + /// A registration that can be disposed to remove the callback. + public CancellationTokenRegistration UnsafeRegister(Action callback, object? state) => + token.Register(callback, state, useSynchronizationContext: false); + + /// Registers a delegate that is invoked with the triggering token when the token is cancelled, without capturing the execution context. + /// The delegate to invoke on cancellation, receiving the state and the triggering token. + /// The state passed to . + /// A registration that can be disposed to remove the callback. + public CancellationTokenRegistration UnsafeRegister(Action callback, object? state) => + token.Register( + static boxed => + { + var (inner, innerState, innerToken) = ((Action Callback, object? State, CancellationToken Token))boxed!; + inner(innerState, innerToken); + }, + (callback, state, token), + useSynchronizationContext: false); + } +} +#endif diff --git a/src/DynamicData/Polyfills/CancellationTokenSourcePolyfillExtensions.cs b/src/DynamicData/Polyfills/CancellationTokenSourcePolyfillExtensions.cs new file mode 100644 index 000000000..20974a5c6 --- /dev/null +++ b/src/DynamicData/Polyfills/CancellationTokenSourcePolyfillExtensions.cs @@ -0,0 +1,24 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET8_0_OR_GREATER +namespace System.Threading; + +/// Polyfill extensions for on frameworks without the .NET 8 async cancellation API. +internal static class CancellationTokenSourcePolyfillExtensions +{ + /// Polyfill operations for a cancellation token source. + extension(CancellationTokenSource source) + { + /// Communicates a request for cancellation, completing synchronously (no asynchronous callback draining on this framework). + /// A completed task representing the cancellation request. + public Task CancelAsync() + { + source.Cancel(); + return Task.CompletedTask; + } + } +} +#endif diff --git a/src/DynamicData/Polyfills/CompilerFeatureRequiredAttribute.cs b/src/DynamicData/Polyfills/CompilerFeatureRequiredAttribute.cs index cdcff56c9..ee0ce6737 100644 --- a/src/DynamicData/Polyfills/CompilerFeatureRequiredAttribute.cs +++ b/src/DynamicData/Polyfills/CompilerFeatureRequiredAttribute.cs @@ -1,23 +1,31 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). #if !NET7_0_OR_GREATER +using System.Diagnostics; + namespace System.Runtime.CompilerServices; -// Allows use of the C#11 `required` keyword, internally within this library, when targeting frameworks older than .NET 7. +/// Indicates that compiler support for a particular feature is required for the location where it is applied. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)] -internal sealed class CompilerFeatureRequiredAttribute(string featureName) - : Attribute +internal sealed class CompilerFeatureRequiredAttribute : Attribute { - public const string RefStructs - = nameof(RefStructs); + /// The used for the ref structs C# feature. + public const string RefStructs = nameof(RefStructs); - public const string RequiredMembers - = nameof(RequiredMembers); + /// The used for the required members C# feature. + public const string RequiredMembers = nameof(RequiredMembers); - public string FeatureName { get; } = featureName; + /// Initializes a new instance of the class. + /// The name of the required compiler feature. + public CompilerFeatureRequiredAttribute(string featureName) => + FeatureName = featureName; - public bool IsOptional { get; init; } + /// Gets the name of the required compiler feature. + public string FeatureName { get; } } #endif diff --git a/src/DynamicData/Polyfills/DynamicallyAccessedMembersAttribute.cs b/src/DynamicData/Polyfills/DynamicallyAccessedMembersAttribute.cs index 7c591011b..75aa51ae0 100644 --- a/src/DynamicData/Polyfills/DynamicallyAccessedMembersAttribute.cs +++ b/src/DynamicData/Polyfills/DynamicallyAccessedMembersAttribute.cs @@ -1,39 +1,115 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. #if !NET5_0_OR_GREATER namespace System.Diagnostics.CodeAnalysis; +/// +/// Defines values for the DynamicallyAccessedMemberTypes enumeration. +/// [Flags] internal enum DynamicallyAccessedMemberTypes { + /// + /// The All value. + /// All = -1, + + /// + /// The None value. + /// None = 0, + + /// + /// The PublicParameterlessConstructor value. + /// PublicParameterlessConstructor = 1, + + /// + /// The PublicConstructors value. + /// PublicConstructors = 3, + + /// + /// The NonPublicConstructors value. + /// NonPublicConstructors = 4, + + /// + /// The PublicMethods value. + /// PublicMethods = 8, + + /// + /// The NonPublicMethods value. + /// NonPublicMethods = 16, + + /// + /// The PublicFields value. + /// PublicFields = 32, + + /// + /// The NonPublicFields value. + /// NonPublicFields = 64, + + /// + /// The PublicNestedTypes value. + /// PublicNestedTypes = 128, + + /// + /// The NonPublicNestedTypes value. + /// NonPublicNestedTypes = 256, + + /// + /// The PublicProperties value. + /// PublicProperties = 512, + + /// + /// The NonPublicProperties value. + /// NonPublicProperties = 1024, + + /// + /// The PublicEvents value. + /// PublicEvents = 2048, + + /// + /// The NonPublicEvents value. + /// NonPublicEvents = 4096, + + /// + /// The Interfaces value. + /// Interfaces = 8192 } +/// +/// Provides members for the DynamicallyAccessedMembersAttribute class. +/// [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Parameter | AttributeTargets.ReturnValue | AttributeTargets.GenericParameter, Inherited = false)] internal sealed class DynamicallyAccessedMembersAttribute : Attribute { + /// + /// Initializes a new instance of the class. + /// + /// The member types which are dynamically accessed. public DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes memberTypes) { MemberTypes = memberTypes; } + /// + /// Gets the MemberTypes value. + /// public DynamicallyAccessedMemberTypes MemberTypes { get; } } #endif diff --git a/src/DynamicData/Polyfills/EnumEx.cs b/src/DynamicData/Polyfills/EnumEx.cs index 1e590a8b3..0f70588b6 100644 --- a/src/DynamicData/Polyfills/EnumEx.cs +++ b/src/DynamicData/Polyfills/EnumEx.cs @@ -1,17 +1,33 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. namespace System; +/// +/// Provides members for the EnumEx class. +/// internal static class EnumEx { #if NET5_0_OR_GREATER + + /// + /// Executes the IsDefined operation. + /// + /// The type of the TEnum value. + /// The value value. + /// The result of the operation. public static bool IsDefined(TEnum value) where TEnum : struct, Enum => Enum.IsDefined(value); #else - public static bool IsDefined(TEnum value) + /// + /// Executes the IsDefined operation. + /// + /// The type of the TEnum value. + /// The value value. + /// The result of the operation. +public static bool IsDefined(TEnum value) where TEnum : struct, Enum => Enum.IsDefined(typeof(TEnum), value); #endif diff --git a/src/DynamicData/Polyfills/IsExternalInit.cs b/src/DynamicData/Polyfills/IsExternalInit.cs index 4542c2eed..c36a21ddf 100644 --- a/src/DynamicData/Polyfills/IsExternalInit.cs +++ b/src/DynamicData/Polyfills/IsExternalInit.cs @@ -1,10 +1,19 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -#if !NETCOREAPP +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET5_0_OR_GREATER +using System.Diagnostics; + namespace System.Runtime.CompilerServices; -// Allows use of the C#11 `init` keyword, internally within this library, when targeting frameworks older than .NET 5. -internal sealed class IsExternalInit; +/// Reserved for the compiler to track metadata for -only members; not for use in source. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[SuppressMessage( + "Design", + "SST1436:Add members to this type or remove it; an empty type is rarely intentional", + Justification = "Compiler-recognized marker type for init-only members; it must remain empty.")] +internal static class IsExternalInit; #endif diff --git a/src/DynamicData/Polyfills/ListEnsureCapacity.cs b/src/DynamicData/Polyfills/ListEnsureCapacity.cs index 671b66760..b336215db 100644 --- a/src/DynamicData/Polyfills/ListEnsureCapacity.cs +++ b/src/DynamicData/Polyfills/ListEnsureCapacity.cs @@ -1,13 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. #if !NETCOREAPP namespace System.Collections.Generic; +/// +/// Provides members for the ListEnsureCapacity class. +/// internal static class ListEnsureCapacity { - public static void EnsureCapacity(this List list, int capacity) + /// + /// Executes the EnsureCapacity operation. + /// + /// The type of the T value. + /// The list value. + /// The capacity value. +public static void EnsureCapacity(this List list, int capacity) { if (list.Capacity < capacity) list.Capacity = capacity; diff --git a/src/DynamicData/Polyfills/MemberNotNullWhenAttribute.cs b/src/DynamicData/Polyfills/MemberNotNullWhenAttribute.cs new file mode 100644 index 000000000..1d8b3c08d --- /dev/null +++ b/src/DynamicData/Polyfills/MemberNotNullWhenAttribute.cs @@ -0,0 +1,33 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET5_0_OR_GREATER +namespace System.Diagnostics.CodeAnalysis; + +/// Specifies that the listed members are not when the method returns the given value. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage( + AttributeTargets.Method | AttributeTargets.Property, + Inherited = false, + AllowMultiple = true)] +internal sealed class MemberNotNullWhenAttribute : Attribute +{ + /// Initializes a new instance of the class. + /// The return value condition for which the members are not . + /// The field and property members that are promised to be not-. + public MemberNotNullWhenAttribute(bool returnValue, params string[] members) + { + ReturnValue = returnValue; + Members = members; + } + + /// Gets the return value condition for which the members are not . + public bool ReturnValue { get; } + + /// Gets the field and property member names that are promised to be not-. + public string[] Members { get; } +} +#endif diff --git a/src/DynamicData/Polyfills/NotNullAttribute.cs b/src/DynamicData/Polyfills/NotNullAttribute.cs new file mode 100644 index 000000000..9cce49350 --- /dev/null +++ b/src/DynamicData/Polyfills/NotNullAttribute.cs @@ -0,0 +1,15 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NETCOREAPP3_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER +namespace System.Diagnostics.CodeAnalysis; + +/// Specifies that an output is not even if the corresponding type allows it. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage( + AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)] +internal sealed class NotNullAttribute : Attribute; +#endif diff --git a/src/DynamicData/Polyfills/NotNullWhenAttribute.cs b/src/DynamicData/Polyfills/NotNullWhenAttribute.cs new file mode 100644 index 000000000..75bda35c3 --- /dev/null +++ b/src/DynamicData/Polyfills/NotNullWhenAttribute.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NETCOREAPP3_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER +namespace System.Diagnostics.CodeAnalysis; + +/// Specifies that when a method returns , the parameter is not . +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage(AttributeTargets.Parameter)] +internal sealed class NotNullWhenAttribute : Attribute +{ + /// Initializes a new instance of the class. + /// The return value condition for which the parameter is not . + public NotNullWhenAttribute(bool returnValue) => + ReturnValue = returnValue; + + /// Gets the return value condition for which the parameter is not . + public bool ReturnValue { get; } +} +#endif diff --git a/src/DynamicData/Polyfills/RequiredMemberAttribute.cs b/src/DynamicData/Polyfills/RequiredMemberAttribute.cs index b1bbc836d..80ac1b32b 100644 --- a/src/DynamicData/Polyfills/RequiredMemberAttribute.cs +++ b/src/DynamicData/Polyfills/RequiredMemberAttribute.cs @@ -1,14 +1,22 @@ -// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. // Roland Pheasant licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). #if !NET7_0_OR_GREATER -using System.ComponentModel; +using System.Diagnostics; namespace System.Runtime.CompilerServices; -// Allows use of the C#11 `required` keyword, internally within this library, when targeting frameworks older than .NET 7. -[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Field | AttributeTargets.Property, Inherited = false)] -[EditorBrowsable(EditorBrowsableState.Never)] +/// Indicates that a type or member is required by the compiler and must be initialized. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage( + AttributeTargets.Class | + AttributeTargets.Struct | + AttributeTargets.Field | + AttributeTargets.Property, + AllowMultiple = false, + Inherited = false)] internal sealed class RequiredMemberAttribute : Attribute; #endif diff --git a/src/DynamicData/Polyfills/SetsRequiredMembersAttribute.cs b/src/DynamicData/Polyfills/SetsRequiredMembersAttribute.cs new file mode 100644 index 000000000..a9f18d6b9 --- /dev/null +++ b/src/DynamicData/Polyfills/SetsRequiredMembersAttribute.cs @@ -0,0 +1,14 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET7_0_OR_GREATER +namespace System.Diagnostics.CodeAnalysis; + +/// Specifies that a constructor sets all required members, satisfying the compiler's required-member checks. +[ExcludeFromCodeCoverage] +[DebuggerNonUserCode] +[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)] +internal sealed class SetsRequiredMembersAttribute : Attribute; +#endif diff --git a/src/DynamicData/Polyfills/TaskCompletionSource.cs b/src/DynamicData/Polyfills/TaskCompletionSource.cs new file mode 100644 index 000000000..904202264 --- /dev/null +++ b/src/DynamicData/Polyfills/TaskCompletionSource.cs @@ -0,0 +1,48 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET5_0_OR_GREATER + +namespace System.Threading.Tasks; + +/// Polyfill for the non-generic introduced in .NET 5, backed by a TaskCompletionSource<TResult>. +[SuppressMessage("Performance", "CA1812", Justification = "Broadcast polyfill; not instantiated in every consuming leaf.")] +internal sealed class TaskCompletionSource +{ + /// The underlying generic completion source that backs this non-generic facade. + private readonly TaskCompletionSource _inner; + + /// Initializes a new instance of the class. + public TaskCompletionSource() => _inner = new(); + + /// Transitions the underlying task to the state. + public void SetResult() => _inner.SetResult(true); + + /// Attempts to transition the underlying task to the state. + /// if the operation was successful; otherwise . + public bool TrySetResult() => _inner.TrySetResult(true); + + /// Transitions the underlying task to the state with the specified exception. + /// The exception to bind to the task. + public void SetException(Exception exception) => _inner.SetException(exception); + + /// Attempts to transition the underlying task to the state with the specified exception. + /// The exception to bind to the task. + /// if the operation was successful; otherwise . + public bool TrySetException(Exception exception) => _inner.TrySetException(exception); + + /// Transitions the underlying task to the state. + public void SetCanceled() => _inner.TrySetCanceled(); + + /// Attempts to transition the underlying task to the state. + /// if the operation was successful; otherwise . + public bool TrySetCanceled() => _inner.TrySetCanceled(); + + /// Attempts to transition the underlying task to the state for the specified token. + /// The token associated with the cancellation. + /// if the operation was successful; otherwise . + public bool TrySetCanceled(CancellationToken cancellationToken) => _inner.TrySetCanceled(cancellationToken); +} +#endif diff --git a/src/DynamicData/Polyfills/TaskPolyfillExtensions.cs b/src/DynamicData/Polyfills/TaskPolyfillExtensions.cs new file mode 100644 index 000000000..c97f40bd6 --- /dev/null +++ b/src/DynamicData/Polyfills/TaskPolyfillExtensions.cs @@ -0,0 +1,70 @@ +// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved. +// Roland Pheasant licenses this file to you under the MIT license. +// See the LICENSE file in the project root for full license information. + +// Polyfill implementation adapted from SimonCropp/Polyfill (https://github.com/SimonCropp/Polyfill). +#if !NET6_0_OR_GREATER +namespace System.Threading.Tasks; + +/// Polyfill extensions for on frameworks without the .NET 6 WaitAsync overloads. +internal static class TaskPolyfillExtensions +{ + /// Polyfill awaiting operations for a task. + extension(Task task) + { + /// Gets a task that completes with , or faults when the timeout elapses or the token is cancelled. + /// The timeout after which the returned task faults, or for no timeout. + /// A token that cancels the wait. + /// A task that mirrors subject to the timeout and cancellation. + public async Task WaitAsync(TimeSpan timeout, CancellationToken cancellationToken) + { + await WaitForCompletionAsync(task, timeout, cancellationToken).ConfigureAwait(false); + await task.ConfigureAwait(false); + } + } + + /// Polyfill awaiting operations for a task that produces a result. + extension(Task task) + { + /// Gets a task that completes with the same result as , or faults when the timeout elapses or the token is cancelled. + /// The timeout after which the returned task faults, or for no timeout. + /// A token that cancels the wait. + /// A task that mirrors subject to the timeout and cancellation. + public async Task WaitAsync(TimeSpan timeout, CancellationToken cancellationToken) + { + await WaitForCompletionAsync(task, timeout, cancellationToken).ConfigureAwait(false); + return await task.ConfigureAwait(false); + } + } + + /// Waits for the task to complete, timeout, or cancellation. + /// The task to observe. + /// The timeout after which the wait fails, or for no timeout. + /// A token that cancels the wait. + /// A task that completes when the wait condition is resolved. + private static async Task WaitForCompletionAsync(Task task, TimeSpan timeout, CancellationToken cancellationToken) + { + if (task.IsCompleted) + { + return; + } + + TaskCompletionSource signal = new(TaskCreationOptions.RunContinuationsAsynchronously); + using var linked = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + if (timeout != Timeout.InfiniteTimeSpan) + { + linked.CancelAfter(timeout); + } + + using (linked.Token.Register(static state => ((TaskCompletionSource)state).TrySetResult(true), signal)) + { + var completed = await Task.WhenAny(task, signal.Task).ConfigureAwait(false); + if (completed != task) + { + cancellationToken.ThrowIfCancellationRequested(); + throw new TimeoutException(); + } + } + } +} +#endif diff --git a/src/coverage.config b/src/coverage.config new file mode 100644 index 000000000..6c0847e14 --- /dev/null +++ b/src/coverage.config @@ -0,0 +1,12 @@ + + + false + + + + .*[\\/]DynamicData(\.Reactive)?\.dll$ + + + false + + diff --git a/src/coverlet.xml b/src/coverlet.xml deleted file mode 100644 index 9d3a083f8..000000000 --- a/src/coverlet.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - opencover - [DynamicData]* - Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute - false - - true - false - MissingAll,MissingAny,None - - - - -