Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTabControlTest.cs =================================================================== diff -u -r5401a1d5d90f6000c2bfb8d9240752473fe1855a -r5fc71a385897af92ccb092f2f969b5709afab85a --- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTabControlTest.cs (.../MapViewTabControlTest.cs) (revision 5401a1d5d90f6000c2bfb8d9240752473fe1855a) +++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTabControlTest.cs (.../MapViewTabControlTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) @@ -49,24 +49,6 @@ Assert.IsFalse(weakRef.IsAlive); } - private static WeakReference AddRemoveView(MapViewTabControl mapTabControl) - { - var view = new TestLayerEditorView(); - var weakRef = new WeakReference(view); - mapTabControl.AddView(view); - mapTabControl.RemoveView(view); - return weakRef; - } - - private static WeakReference AddViewDispose(MapViewTabControl mapTabControl) - { - var view = new TestLayerEditorView(); - var weakRef = new WeakReference(view); - mapTabControl.AddView(view); - mapTabControl.Dispose(); - return weakRef; - } - [Test] public void OpeningSecondViewCallsDeactivateAndActivate() { @@ -165,35 +147,59 @@ Assert.AreEqual(1, view2Deactivated); } + private static WeakReference AddRemoveView(MapViewTabControl mapTabControl) + { + var view = new TestLayerEditorView(); + var weakRef = new WeakReference(view); + mapTabControl.AddView(view); + mapTabControl.RemoveView(view); + return weakRef; + } + + private static WeakReference AddViewDispose(MapViewTabControl mapTabControl) + { + var view = new TestLayerEditorView(); + var weakRef = new WeakReference(view); + mapTabControl.AddView(view); + mapTabControl.Dispose(); + return weakRef; + } + private class TestLayerEditorView : UserControl, ILayerEditorView { + public event EventHandler SelectedFeaturesChanged; + + public event EventHandler OnActivatedCalled; + public event EventHandler OnDeactivatedCalled; public object Data { get; set; } public string Text { get; set; } public Image Image { get; set; } - public void EnsureVisible(object item) - { - throw new NotImplementedException(); - } public bool Visible { get; private set; } public ViewInfo ViewInfo { get; set; } public IEnumerable SelectedFeatures { get; set; } - public event EventHandler SelectedFeaturesChanged; public ILayer Layer { set; get; } + + public void EnsureVisible(object item) + { + throw new NotImplementedException(); + } + public void OnActivated() { if (OnActivatedCalled != null) + { OnActivatedCalled(this, EventArgs.Empty); + } } public void OnDeactivated() { if (OnDeactivatedCalled != null) + { OnDeactivatedCalled(this, EventArgs.Empty); + } } - - public event EventHandler OnActivatedCalled; - public event EventHandler OnDeactivatedCalled; } } } \ No newline at end of file