Fix failing unit tests in debug mode. #7495
Conversation
#7369 introduced a validating layer over `WindowBase.PlatformImpl` that is only enabled in debug mode. This validating layer was causing unit tests to fail in debug mode but not on CI which runs tests in release mode. Fix the problems: - `PopupRoot` was not correctly disposing itself on `Dispose` - make it call `HandleClosed` in order to perform the same steps as when the popup is closed via other means - Some unit tests try to access the `PlatformImpl` to get hold of a mock. Added `ValidatingWindowImpl.Unwrap` to allow this - `ValidatingWindowBaseImpl.Activated` was setting the wrong property on the wrapped `PlatformImpl`.
| @@ -74,7 +74,7 @@ public PopupRoot(TopLevel parent, IPopupImpl impl, IAvaloniaDependencyResolver d | |||
| IStyleHost IStyleHost.StylingParent => Parent; | |||
|
|
|||
| /// <inheritdoc/> | |||
| public void Dispose() => PlatformImpl?.Dispose(); | |||
| public void Dispose() => HandleClosed(); | |||
There was a problem hiding this comment.
Does this actually dispose the PlatformImpl?
There was a problem hiding this comment.
Huh, you know what, it doesn't. I saw it was setting it to null but it doesn't first dispose it, i guess because a Closeing the platform impl is the same as disposing it? Looks like we need to dispose the platform impl and the call HandleClosed to set the pointer to null?
It's all a bit confusing...
There was a problem hiding this comment.
Ok, Window disposes the PlatformImpl in CloseInternal which is called via HandleClosing, i.e. before HandleClosed, so I've made PopupRoot dispose the PlatformImpl before calling HandleClosed -- does that look right now?
There was a problem hiding this comment.
IIRC it was supposed to work like this:
- Disposing WindowBase would close the window and will trigger the usual close sequence but without
Closingand cancellation - During such procedure the platform impl would call
Closedcallback
So HandleClosed should be called by platform impl itself
|
You can test this PR using the following package version. |
|
You can test this PR using the following package version. |
|
You can test this PR using the following package version. |
What does the pull request do?
#7369 introduced a validating layer over
WindowBase.PlatformImplthat is only enabled in debug mode. This validating layer was causing unit tests to fail in debug mode but not on CI which runs tests in release mode.Fix the problems:
PopupRootwas not correctly disposing itself onDispose- make it callHandleClosedin order to perform the same steps as when the popup is closed via other meansPlatformImplto get hold of a mock. AddedValidatingWindowImpl.Unwrapto allow thisValidatingWindowBaseImpl.Activatedwas setting the wrong property on the wrappedPlatformImpl.