Commit 22d5bb5
authored
Fix intermittient test failures that use Locator, introduced a scope (#4251)
This pull request introduces a new `LocatorScope` helper to safely
isolate and restore the global service locator state (`Locator.Current`)
during tests, and applies it to several test fixtures that modify the
locator. This change ensures better test reliability and prevents state
leakage between tests. Additionally, the documentation is updated to
reflect the new approach.
**Test isolation improvements:**
* Added a new `LocatorScope` class in
`ReactiveUI.Tests.Infrastructure.StaticState` to snapshot and restore
`Locator.Current` during tests, preventing global state leakage and
making tests more reliable.
* Updated test fixtures (`CommandBindingTests`, `MessageBusTest`,
`RoutedViewHostTests`, `ViewModelViewHostTests`) to use `LocatorScope`
in their setup and teardown methods, ensuring the service locator is
properly isolated for each test run.
[[1]](diffhunk://#diff-cb950c3f874cb7e5c5a49fd2bedc2fa3e51511aa6db8462f270eef23f11e0028R13-R48)
[[2]](diffhunk://#diff-f7f03456bd65136087c07d8367d29b062028508f41480f8a69365c4c88bf9f0dR20-R33)
[[3]](diffhunk://#diff-d9dbb1c8d2fee1ef13344fb77470509a36bcb26ae3e9d613b5af99375386f9d0R27-R40)
[[4]](diffhunk://#diff-5580daabcb200c9598e649dfc4cf40d21a8c3600f93763afda29711563b0387cR26-R39)
**Test metadata and documentation:**
* Marked `WhenAnyObservableTests` as `[NotInParallel]` and added XML
documentation explaining the need for test isolation due to reliance on
the service locator.
* Updated using statements to import the new `LocatorScope` where
required.
[[1]](diffhunk://#diff-d9dbb1c8d2fee1ef13344fb77470509a36bcb26ae3e9d613b5af99375386f9d0R8)
[[2]](diffhunk://#diff-5580daabcb200c9598e649dfc4cf40d21a8c3600f93763afda29711563b0387cR8)
**Documentation updates:**
* Removed the outdated `StaticState/README.md` and replaced its guidance
with the new `LocatorScope` approach for managing static state in tests.1 parent 69b64a1 commit 22d5bb5
File tree
8 files changed
+135
-145
lines changed- src/tests
- ReactiveUI.NonParallel.Tests
- CommandBinding
- Platforms/windows-xaml
- WhenAny
- ReactiveUI.Tests/Infrastructure/StaticState
8 files changed
+135
-145
lines changedLines changed: 22 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
17 | 27 | | |
18 | 28 | | |
19 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
20 | 33 | | |
| 34 | + | |
| 35 | + | |
21 | 36 | | |
22 | 37 | | |
23 | 38 | | |
24 | 39 | | |
25 | 40 | | |
26 | 41 | | |
27 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
28 | 49 | | |
29 | 50 | | |
30 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
| 33 | + | |
31 | 34 | | |
32 | 35 | | |
33 | 36 | | |
| |||
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
26 | 41 | | |
27 | 42 | | |
28 | 43 | | |
| |||
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
25 | 40 | | |
26 | 41 | | |
27 | 42 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
10 | 18 | | |
11 | 19 | | |
12 | 20 | | |
| |||
Lines changed: 72 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
Lines changed: 0 additions & 144 deletions
This file was deleted.
0 commit comments