Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs =================================================================== diff -u -rae5c573fb82f4b30350f63cb6f202ae99275f4ff -rb3344603c09970b996a796aedea8bb82b0a28d59 --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision ae5c573fb82f4b30350f63cb6f202ae99275f4ff) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision b3344603c09970b996a796aedea8bb82b0a28d59) @@ -145,8 +145,13 @@ using (var avalonDockViewHost = new AvalonDockViewHost()) { var viewOpenedCounter = 0; - avalonDockViewHost.ViewOpened += (sender, args) => viewOpenedCounter++; + avalonDockViewHost.ViewOpened += (sender, args) => + { + Assert.AreSame(viewList.Last(), args.View); + viewOpenedCounter++; + }; + for (var i = 0; i < numberOfViewsToAdd; i++) { var testView = new TestView(); @@ -593,8 +598,13 @@ using (var avalonDockViewHost = new AvalonDockViewHost()) { var viewOpenedCounter = 0; - avalonDockViewHost.ViewOpened += (sender, args) => viewOpenedCounter++; + avalonDockViewHost.ViewOpened += (sender, args) => + { + Assert.AreSame(testView, args.View); + viewOpenedCounter++; + }; + // Call avalonDockViewHost.AddToolView(testView, toolViewLocation);