Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r03707d5a0ca6b2d83563bc5f407bd4a327d22c0e
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e)
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using DelftTools.TestUtils;
 using DelftTools.Utils;
 using DelftTools.Utils.Collections.Generic;
@@ -21,69 +20,6 @@
     {
         [Test]
         [NUnit.Framework.Category(TestCategory.WindowsForms)]
-        public void Show()
-        {
-            var features = new []
-                                {
-                                    new City {Name = "Amsterdam", Population = 1000000},
-                                    new City {Name = "The Hague", Population = 90000, Attributes = new DictionaryFeatureAttributeCollection() }
-                                };
-
-            features[1].Attributes["a1"] = 1;
-            features[1].Attributes["a2"] = "test";
-
-            var layer = new VectorLayer { DataSource = new FeatureCollection { Features = features } };
-
-            var view = new VectorLayerAttributeTableView { Data = layer };
-
-            WindowsFormsTestHelper.ShowModal(view);
-        }
-
-        [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
-        public void ShowWithCustomAttributesAndFilteringTools19891()
-        {
-            var features = new[]
-                                {
-                                    new City {Name = "Amsterdam", Population = 1000000},
-                                    new City {Name = "The Hague", Population = 90000, Attributes = new DictionaryFeatureAttributeCollection() }
-                                };
-
-            features[1].Attributes["a1"] = 1;
-            features[1].Attributes["a2"] = "test";
-
-            var layer = new VectorLayer { DataSource = new FeatureCollection { Features = features } };
-
-            var view = new VectorLayerAttributeTableView { Data = layer };
-            
-            WindowsFormsTestHelper.ShowModal(view, f =>
-                {
-                    var columnA2 = view.TableView.Columns.First(c => c.Name == "a2");
-                    columnA2.FilterString = "[a2] = ''";
-
-                    // manual replication here..
-                });
-        }
-
-        [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
-        public void ShowWithCustomRowObject()
-        {
-            var features = new []
-                                {
-                                    new City {Name = "Amsterdam", Population = 1000000},
-                                    new City {Name = "The Hague", Population = 90000}
-                                };
-
-            var layer = new VectorLayer { DataSource = new FeatureCollection { Features = features } };
-
-            var view = new VectorLayerAttributeTableView { Data = layer };
-            view.SetCreateFeatureRowFunction(feature => new CityProperties((City)feature));
-            WindowsFormsTestHelper.ShowModal(view);
-        }
-
-        [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
         public void DeleteOfCustomRowObjectMustDeleteOriginalFeature()
         {   
             var features = new List<City>
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/SharpMapGisGuiPluginTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r03707d5a0ca6b2d83563bc5f407bd4a327d22c0e
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/SharpMapGisGuiPluginTest.cs	(.../SharpMapGisGuiPluginTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/SharpMapGisGuiPluginTest.cs	(.../SharpMapGisGuiPluginTest.cs)	(revision 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e)
@@ -1,20 +1,11 @@
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
 using DelftTools.Shell.Core;
 using DelftTools.Shell.Gui;
-using DelftTools.TestUtils;
 using DeltaShell.Gui.Forms.ViewManager;
 using DeltaShell.Plugins.SharpMapGis.Gui;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.MapLegendView;
 using NUnit.Framework;
 using Rhino.Mocks;
-using SharpMap;
-using SharpMap.Data.Providers;
 using SharpMap.Layers;
 
 namespace DeltaShell.Plugins.SharpMapGis.Tests
@@ -26,11 +17,9 @@
         [SetUp]
         public void Setup()
         {
-            mocks= new MockRepository();    
+            mocks= new MockRepository();
         }
-        
 
-
         /// <summary>
         /// Returns a contextmenu in case the data is a vectorlayer.
         /// </summary>
@@ -68,67 +57,6 @@
         }
 
         [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
-        public void EventBubbling()
-        {
-            var mapView = new MapView();
-
-            var gui = (IGui)mocks.Stub(typeof(IGui));
-
-            var guiPlugin = new SharpMapGisGuiPlugin() {Gui = gui};
-            Expect.Call(gui.Plugins).Return(new[] { guiPlugin }).Repeat.Any();
-
-            mocks.ReplayAll();
-            //         var gisGuiService = (IGisGuiService)mocks.Stub(typeof(IGisGuiService));
-            
-            var mapLegendView = new MapLegendView(gui);
-
-            var map = new Map(new Size(2, 1));
-
-            var propertyGrid = new PropertyGrid { SelectedObject = gui };
- 
-            mapView.Map = map;
-            mapLegendView.Map = map;
-
-            const string path = @"..\..\..\..\..\test-data\DeltaShell\DeltaShell.Plugins.SharpMapGis.Tests\roads.shp";
-            var shapeFile = new ShapeFile(path, false);
-            var vectorLayer = new VectorLayer(Path.GetFileNameWithoutExtension(path), shapeFile);
-/*
-            VectorStyle style = new VectorStyle();
-            vectorLayer.Style = style;
-*/
-            map.Layers.Add(vectorLayer);
-
-            propertyGrid.SelectedObject = new VectorLayerProperties { Data = map.Layers[0] };
-
-            int changeCount = 0;
-
-            ((INotifyPropertyChanged)map).PropertyChanged +=
-                delegate
-                    {
-                        // Assert.AreEqual(e.PropertyName, "Line");
-                        changeCount++;
-                    };
-
-
-            var form1 = new Form();
-            mapView.Dock = DockStyle.Fill;
-            form1.Controls.Add(mapView);
-
-            var form2 = new Form();
-            mapLegendView.Dock = DockStyle.Fill;
-            form2.Controls.Add(mapLegendView);
-
-            var form3 = new Form();
-            propertyGrid.Dock = DockStyle.Fill;
-            form3.Controls.Add(propertyGrid);
-
-            WindowsFormsTestHelper.ShowModal(form1);
-            WindowsFormsTestHelper.ShowModal(form2);
-            WindowsFormsTestHelper.ShowModal(form3);
-        }
-
-        [Test]
         public void Activate()
         {
             //just a check to make sure activation does not crash..can very well because of the ammount of depencies
Index: test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r03707d5a0ca6b2d83563bc5f407bd4a327d22c0e
--- test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj	(.../DeltaShell.Tests.csproj)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj	(.../DeltaShell.Tests.csproj)	(revision 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e)
@@ -123,27 +123,19 @@
       <DependentUpon>AvalonDockingTestForm.xaml</DependentUpon>
     </Compile>
     <Compile Include="Gui\Forms\AvalonDockDockingManagerTest.cs" />
-    <Compile Include="Gui\Forms\HelpAboutBoxTest.cs" />
-    <Compile Include="Gui\Forms\MessageWindow\MessageWindowTest.cs" />
     <Compile Include="Gui\Forms\ProgressBarDialogTest.cs" />
     <Compile Include="Gui\Forms\PropertyGrid\PropertyGridTest.cs" />
-    <Compile Include="Gui\Forms\SplashScreenTest.cs" />
     <Compile Include="Gui\Forms\ProgressDialog\TestStringBasedProgressingActivity.cs" />
     <Compile Include="Gui\GuiExportHandlerTest.cs" />
-    <Compile Include="Gui\ViewPropertyEditorTest.cs" />
     <Compile Include="TestObjects\TestActivityRunner.cs" />
     <Compile Include="TestObjects\TestExporter.cs" />
     <Compile Include="Gui\DelftShellGuiTests.cs" />
-    <Compile Include="Gui\Forms\ProgressDialog\ProgressDialogTest.cs" />
     <Compile Include="Gui\Forms\ProgressDialog\TestActivity.cs" />
-    <Compile Include="Gui\Forms\SelectItemDialogTest.cs" />
-    <Compile Include="Gui\Forms\SelectViewDialogTest.cs" />
     <Compile Include="Gui\GuiCommandHandlerTest.cs" />
     <Compile Include="Gui\ImportActivityTest.cs" />
     <Compile Include="Gui\Log4netTest.cs" />
     <Compile Include="Gui\MenuManagerTest.cs">
     </Compile>
-    <Compile Include="Gui\Forms\OptionsDialogTest.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/HelpAboutBoxTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/MessageWindow/MessageWindowTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/OptionsDialogTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/DeltaShell/DeltaShell.Tests/Gui/Forms/ProgressBarDialogTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r03707d5a0ca6b2d83563bc5f407bd4a327d22c0e
--- test/DeltaShell/DeltaShell.Tests/Gui/Forms/ProgressBarDialogTest.cs	(.../ProgressBarDialogTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Tests/Gui/Forms/ProgressBarDialogTest.cs	(.../ProgressBarDialogTest.cs)	(revision 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e)
@@ -1,7 +1,6 @@
 using System.Threading;
 using System.Windows.Forms;
 using DelftTools.Controls.Swf;
-using DelftTools.TestUtils;
 using NUnit.Framework;
 
 namespace DeltaShell.Tests.Gui.Forms
@@ -22,14 +21,12 @@
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void EmptyTaskDoesNotHang()
         {
             ProgressBarDialog.PerformTask("Doing stuff", () => { });
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void ShowProgress()
         {
             ProgressBarDialog.PerformTask("Doing stuff", ()=> Thread.Sleep(200));
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/ProgressDialog/ProgressDialogTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/SelectItemDialogTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/SelectViewDialogTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/Forms/SplashScreenTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/DeltaShell/DeltaShell.Tests/Gui/ViewListTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r03707d5a0ca6b2d83563bc5f407bd4a327d22c0e
--- test/DeltaShell/DeltaShell.Tests/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Tests/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e)
@@ -18,28 +18,6 @@
     public class ViewListTest
     {
         [Test]
-        [Category(TestCategory.WindowsForms)]
-        public void ClearAllDocumentViews()
-        {
-            var form = new AvalonDockingTestForm();
-
-            var dockLocations = new [] { ViewLocation.Document };
-            var dockingManager = new AvalonDockDockingManager(form.dockingManager, dockLocations);
-
-            var documentViews = new ViewList(dockingManager, ViewLocation.Document)
-                {
-                    new ToolWindowTestControl {Text = "text1"},
-                    new ToolWindowTestControl {Text = "text2"},
-                    new ToolWindowTestControl {Text = "text3"}
-                };
-            
-            WindowsFormsTestHelper.Show(new ElementHost { Child = form });
-
-            documentViews.Clear();
-            Assert.AreEqual(0, documentViews.Count());
-        }
-
-        [Test]
         public void CollectionChangedEvent()
         {
             var dockingManager = new TestDockingManager();
@@ -209,23 +187,6 @@
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
-        public void TestDocumentViews()
-        {
-            var form = new AvalonDockingTestForm();
-            var dockingManager = new AvalonDockDockingManager(form.dockingManager, new [] { ViewLocation.Document, ViewLocation.Floating });
-
-            var toolWindowViewManager = new ViewList(dockingManager, ViewLocation.Document)
-                {
-                    new ToolWindowTestControl {Text = "text1"},
-                    new ToolWindowTestControl {Text = "text2"},
-                    new ToolWindowTestControl {Text = "text3"}
-                };
-
-            WindowsFormsTestHelper.ShowModal(new ElementHost { Child = form });
-        }
-
-        [Test]
         public void OpeningViewForDataTwiceShouldOnlySetActiveView()
         {
             var url = new Url("Deltares", "www.deltares.nl");
@@ -244,29 +205,6 @@
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
-        public void TestToolWindowWithView()
-        {
-            var form = new AvalonDockingTestForm();
-
-            var docksites = new []
-                {
-                    ViewLocation.Left,
-                    ViewLocation.Right,
-                    ViewLocation.Top,
-                    ViewLocation.Bottom
-                };
-
-            var dockingManager = new AvalonDockDockingManager(form.dockingManager, docksites);
-            var toolWindowViewManager = new ViewList(dockingManager, ViewLocation.Left)
-                {
-                    new ToolWindowTestControl {Text = "text"}
-                };
-
-            WindowsFormsTestHelper.ShowModal(new ElementHost { Child = form });
-        }
-
-        [Test]
         public void GetViewsForDataWithCustomData()
         {
             var viewList = new ViewList(new TestDockingManager(), ViewLocation.Left);
Fisheye: Tag 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/ViewPropertyEditorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?