Index: test/Common/DelftTools.TestUtils/TestCategory.cs
===================================================================
diff -u -re78db153a35565d71fd5662ecf41379f68cb3240 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/DelftTools.TestUtils/TestCategory.cs (.../TestCategory.cs) (revision e78db153a35565d71fd5662ecf41379f68cb3240)
+++ test/Common/DelftTools.TestUtils/TestCategory.cs (.../TestCategory.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -9,20 +9,13 @@
/// Build.Integration ................ general integration tests (many classes, almost no mocks, mix of windows.forms, data access)
/// Build.Performance. ........... integration tests which assert execution time using
/// Build.WindowsForms ........... integration tests which pop-up forms
- /// Build.DataAccess ............. integration tests which focus on reading/writing
///
/// These categories must be always used as mutually exclusive: NEVER USE 2 OF THESE CATEGORIES AT THE SAME TIME!
///
/// Exceptions from the rule above (use of 2 categories at the same time):
///
/// Build.WorkInProgress ......... tests which are currently in development
/// Build.Slow ................... tests which take more than 500 ms but less than 20 s to run
- /// Build.VerySlow ............... tests which take more than 20 s to run, usually run at night
- /// Build.UndoRedo ............... tests that test undo/redo functionality
- /// Build.RequiresLicense ........ tests that requires a license in order to run
- /// Build.Jira ................... tests that reproduce Jira-issues
- /// Build.BackwardCompatibility .. tests that check how new version works with old files or components
- /// Build.MemoryLeak .............
///
public class TestCategory
{
Index: test/Common/DelftTools.Tests/Controls/Swf/Charting/ChartTest.cs
===================================================================
diff -u -re78db153a35565d71fd5662ecf41379f68cb3240 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/DelftTools.Tests/Controls/Swf/Charting/ChartTest.cs (.../ChartTest.cs) (revision e78db153a35565d71fd5662ecf41379f68cb3240)
+++ test/Common/DelftTools.Tests/Controls/Swf/Charting/ChartTest.cs (.../ChartTest.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -1,8 +1,5 @@
using System;
-using System.Collections;
-using System.Data;
using System.IO;
-using System.Windows.Forms;
using DelftTools.Controls.Swf.Charting;
using DelftTools.Controls.Swf.Charting.Series;
using DelftTools.TestUtils;
@@ -15,17 +12,6 @@
public class ChartTest
{
[Test]
- [Category(TestCategory.WindowsForms)]
- public void ChartWithTitle()
- {
- var chartView1 = new ChartView {Title = "TestTitle"};
-
- var form = new Form { Width = 600, Height = 400 };
- form.Controls.Add(chartView1);
- WindowsFormsTestHelper.ShowModal(form);
- }
-
- [Test]
public void AddingSeriesToChartTriggersChartCollectionChanged()
{
var chart = new Chart();
@@ -39,62 +25,6 @@
}
[Test]
- [Category(TestCategory.WindowsForms)]
- public void ChartWithDataTableAsSeriesSource()
- {
- var table = new DataTable();
- table.Columns.Add("x", typeof (double));
- table.Columns.Add("y", typeof (double));
-
- table.Rows.Add(2.5, 33.3);
- table.Rows.Add(0.5, 13.3);
-
- // create chart and add function as a data source using object adapter class FunctionSeriesDataSource
- //IChart chart = new Chart();
-
- IChartSeries series = ChartSeriesFactory.CreateLineSeries();
-
- series.DataSource = table;
- series.XValuesDataMember = "x";
- series.YValuesDataMember = "y";
-
- var chartView1 = new ChartView() ;
-
- chartView1.Chart.Series.Add(series);
-
- var form = new Form {Width = 600, Height = 100};
- form.Controls.Add(chartView1);
- WindowsFormsTestHelper.ShowModal(form);
- }
-
- [Test]
- [Category(TestCategory.WindowsForms)]
- public void ChartWithObjectsAsSeriesSource()
- {
- IList objects = new ArrayList
- {
- new {X = 2.5, Y = 33.3},
- new {X = 0.5, Y = 13.3}
- };
-
- // create chart and add function as a data source using object adapter class FunctionSeriesDataSource
-
- IChartSeries series = ChartSeriesFactory.CreateLineSeries();
- series.DataSource = objects;
- series.XValuesDataMember = "X";
- series.YValuesDataMember = "Y";
-
- var chartView1 = new ChartView();
-
- chartView1.Chart.Series.Add(series);
-
- // show form
- var form = new Form {Width = 600, Height = 100};
- form.Controls.Add(chartView1);
- WindowsFormsTestHelper.ShowModal(form);
- }
-
- [Test]
public void ExportAsImageWorks()
{
SaveDeleteAndAssertExport("test.png");
Fisheye: Tag 2a0bc77430323211d808546837ab2be0291e0ad6 refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/Charting/ChartViewTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 2a0bc77430323211d808546837ab2be0291e0ad6 refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/Charting/Tools/RulerToolTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: test/Common/DelftTools.Tests/DelftTools.Tests.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/DelftTools.Tests/DelftTools.Tests.csproj (.../DelftTools.Tests.csproj) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Tests/DelftTools.Tests.csproj (.../DelftTools.Tests.csproj) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -121,7 +121,6 @@
-
@@ -131,7 +130,6 @@
-
Index: test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicDataItemPropertyBagTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicDataItemPropertyBagTest.cs (.../DynamicDataItemPropertyBagTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicDataItemPropertyBagTest.cs (.../DynamicDataItemPropertyBagTest.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -1,7 +1,6 @@
using System.ComponentModel;
using System.Linq;
using System.Windows.Forms;
-using DelftTools.TestUtils;
using DelftTools.Utils.ComponentModel;
using DelftTools.Utils.PropertyBag;
using DelftTools.Utils.PropertyBag.Dynamic;
@@ -190,25 +189,6 @@
}
[Test]
- [Category(TestCategory.WindowsForms)]
- [Ignore("Only used for visual inspection")]
- public void ShowsInForm()
- {
- var propertyGrid = new PropertyGrid();
-
- var testProperties = new TestProperties();
-
- var dynamicDataItemPropertyBag = new DynamicDataItemPropertyBag(new TestDataItemProperties(new TestDataItem()), testProperties);
- propertyGrid.SelectedObject = dynamicDataItemPropertyBag;
-
- testProperties.PropertyChanged += delegate { propertyGrid.SelectedObject = dynamicDataItemPropertyBag; };
-
- propertyGrid.Dock = DockStyle.Fill;
-
- WindowsFormsTestHelper.ShowModal(propertyGrid);
- }
-
- [Test]
public void PropagatesValueSetterToDataItem()
{
var propertyGrid = new PropertyGrid();
Index: test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -1,10 +1,7 @@
using System;
-using System.Collections;
using System.ComponentModel;
-using System.Drawing.Design;
using System.Linq;
using System.Windows.Forms;
-using DelftTools.TestUtils;
using DelftTools.Utils.ComponentModel;
using DelftTools.Utils.PropertyBag;
using DelftTools.Utils.PropertyBag.Dynamic;
@@ -269,25 +266,6 @@
}
[Test]
- [NUnit.Framework.Category(TestCategory.WindowsForms)]
- [Ignore("Only used for visual inspection")]
- public void DynamicPropertyBagShowsInForm()
- {
- var propertyGrid = new PropertyGrid();
-
- var testProperties = new TestProperties();
-
- var dynamicPropertyBag = new DynamicPropertyBag(testProperties);
- propertyGrid.SelectedObject = dynamicPropertyBag;
-
- testProperties.PropertyChanged += delegate { propertyGrid.SelectedObject = dynamicPropertyBag; };
-
- propertyGrid.Dock = DockStyle.Fill;
-
- WindowsFormsTestHelper.ShowModal(propertyGrid);
- }
-
- [Test]
public void DynamicPropertyBagWrapsNestedPropertyObjects()
{
var subProperties = new TestProperties() {Name = "test"};
Fisheye: Tag 2a0bc77430323211d808546837ab2be0291e0ad6 refers to a dead (removed) revision in file `test/Common/NetTopologySuite.Tests/BufferTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: test/Common/NetTopologySuite.Tests/NetTopologySuite.Tests.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/NetTopologySuite.Tests/NetTopologySuite.Tests.csproj (.../NetTopologySuite.Tests.csproj) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/NetTopologySuite.Tests/NetTopologySuite.Tests.csproj (.../NetTopologySuite.Tests.csproj) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -87,8 +87,6 @@
-
-
Index: test/Common/SharpMap.Extensions.Tests/CoordinateSystems/OgrCoordinateSystemTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/SharpMap.Extensions.Tests/CoordinateSystems/OgrCoordinateSystemTest.cs (.../OgrCoordinateSystemTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.Extensions.Tests/CoordinateSystems/OgrCoordinateSystemTest.cs (.../OgrCoordinateSystemTest.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -1,20 +1,14 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using DelftTools.TestUtils;
-using SharpMap.Extensions.CoordinateSystems;
using log4net;
-using log4net.Core;
using NUnit.Framework;
-using SharpMap.UI.Forms;
namespace SharpMap.Extensions.Tests.CoordinateSystems
{
[TestFixture]
public class OgrCoordinateSystemTest
{
- private static readonly ILog log = LogManager.GetLogger(typeof(OgrCoordinateSystemTest));
-
[Test]
[Ignore("run to convert coordinate systems from GDAL files to ids")]
public void ExtractCoordinateSystemIds()
@@ -35,17 +29,5 @@
.Select(id => int.Parse(id.Split(',')[0]))
.ToArray();
}
-
- [Test]
- [Category(TestCategory.WindowsForms)]
- [Category(TestCategory.WorkInProgress)] // can't find env variable on build server, in progress ...
- [Category("CoordinateSystem")]
- public void AvailableCoordinateSystems()
- {
- LogHelper.ConfigureLogging(Level.Debug);
-
- var control = new SelectCoordinateSystemDialog(Map.CoordinateSystemFactory.SupportedCoordinateSystems, Map.CoordinateSystemFactory.CustomCoordinateSystems);
- WindowsFormsTestHelper.ShowModal(control);
- }
}
}
Index: test/Common/SharpMap.Extensions.Tests/Layers/OpenStreetMapLayerTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/SharpMap.Extensions.Tests/Layers/OpenStreetMapLayerTest.cs (.../OpenStreetMapLayerTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.Extensions.Tests/Layers/OpenStreetMapLayerTest.cs (.../OpenStreetMapLayerTest.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -1,7 +1,5 @@
-using DelftTools.TestUtils;
using NUnit.Framework;
using SharpMap.Extensions.Layers;
-using SharpMap.UI.Forms;
using SharpTestsEx;
namespace SharpMap.Extensions.Tests.Layers
@@ -10,20 +8,6 @@
public class OpenStreetMapLayerTest
{
[Test]
- [Category(TestCategory.WindowsForms)]
- public void ShowWithOsmLayer()
- {
- var map = new Map();
-
- var layer = new OpenStreetMapLayer();
- map.Layers.Add(layer);
-
- var mapControl = new MapControl {Map = map};
-
- WindowsFormsTestHelper.ShowModal(mapControl);
- }
-
- [Test]
public void CacheDirectoryIsDefined()
{
OpenStreetMapLayer.CacheLocation
Index: test/Common/SharpMap.Tests/Layers/VectorLayerTest.cs
===================================================================
diff -u -rb1728d26142119f9e21c35acb4c390fdae8abcac -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/SharpMap.Tests/Layers/VectorLayerTest.cs (.../VectorLayerTest.cs) (revision b1728d26142119f9e21c35acb4c390fdae8abcac)
+++ test/Common/SharpMap.Tests/Layers/VectorLayerTest.cs (.../VectorLayerTest.cs) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -63,38 +63,6 @@
}
[Test]
- [NUnit.Framework.Category(TestCategory.WindowsForms)]
- public void RenderSymbol()
- {
- VectorLayer layer = new VectorLayer();
- layer.DataSource = new DataTableFeatureProvider("LINESTRING(20 20,40 40)");
-
- VectorLayer symbolLayer = new VectorLayer("GPS");
- symbolLayer.DataSource = new DataTableFeatureProvider("POINT(30 30)");
- symbolLayer.Style.Symbol = Properties.Resources.NorthArrow;
- symbolLayer.Style.SymbolRotation = 0;
- symbolLayer.Style.SymbolOffset = new PointF(0, 0);
- symbolLayer.Style.SymbolScale = 0.5f;
-
- //Show layer on form with mapcontrol
- Form form = new Form();
- MapControl mapControl = new MapControl();
- mapControl.Dock = DockStyle.Fill;
- form.Controls.Add(mapControl);
- mapControl.Map = new Map(new Size(600, 600));
-
- mapControl.Map.Layers.Add(symbolLayer);
- mapControl.Map.Layers.Add(layer);
-
- form.Show();
- mapControl.Map.ZoomToExtents();
- mapControl.Refresh();
- form.Hide();
-
- WindowsFormsTestHelper.ShowModal(form);
- }
-
- [Test]
public void NoExceptionShouldBeThrownWhenZoomLevelIsTooLarge()
{
var featureProvider = new FeatureCollection
Fisheye: Tag 2a0bc77430323211d808546837ab2be0291e0ad6 refers to a dead (removed) revision in file `test/Common/SharpMap.UI.Tests/Forms/CoordinateSystemTypeEditorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: test/Common/SharpMap.UI.Tests/SharpMap.UI.Tests.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r2a0bc77430323211d808546837ab2be0291e0ad6
--- test/Common/SharpMap.UI.Tests/SharpMap.UI.Tests.csproj (.../SharpMap.UI.Tests.csproj) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.UI.Tests/SharpMap.UI.Tests.csproj (.../SharpMap.UI.Tests.csproj) (revision 2a0bc77430323211d808546837ab2be0291e0ad6)
@@ -99,7 +99,6 @@
-