Index: test/Common/DelftTools.Tests/Controls/Swf/CSV/CsvImportTest.cs =================================================================== diff -u -rb1728d26142119f9e21c35acb4c390fdae8abcac -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/DelftTools.Tests/Controls/Swf/CSV/CsvImportTest.cs (.../CsvImportTest.cs) (revision b1728d26142119f9e21c35acb4c390fdae8abcac) +++ test/Common/DelftTools.Tests/Controls/Swf/CSV/CsvImportTest.cs (.../CsvImportTest.cs) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Data; using System.Globalization; -using System.Windows.Forms; -using DelftTools.Controls.Swf.Csv; using DelftTools.TestUtils; using DelftTools.Utils.Csv.Importer; using NUnit.Framework; @@ -32,7 +29,7 @@ var csvMapping = new Dictionary { { new CsvRequiredField("Date time", typeof (DateTime)), new CsvColumnInfo(0, customDTFormat) }, - { new CsvRequiredField("Value (m AD)", typeof (double)), new CsvColumnInfo(1, new NumberFormatInfo()) }, + { new CsvRequiredField("Value (m AD)", typeof (double)), new CsvColumnInfo(1, new NumberFormatInfo()) } }; var typedDataTable = csvToDataTableConverter.Extract(dataTable, csvMapping); @@ -58,73 +55,13 @@ var csvMapping = new Dictionary { - { new CsvRequiredField("Value (m AD)", typeof (double)), new CsvColumnInfo(1, new NumberFormatInfo()) }, + { new CsvRequiredField("Value (m AD)", typeof (double)), new CsvColumnInfo(1, new NumberFormatInfo()) } }; var filteredDataTable = csvToDataTableConverter.Extract(dataTable, csvMapping, new[] { new CsvPassIfEqualFilter(0, "14/07/1990") }); Assert.AreEqual(1, filteredDataTable.Columns.Count); Assert.AreEqual(1, filteredDataTable.Rows.Count); Assert.AreEqual(15.0, filteredDataTable.Rows[0][0]); } - - [Test] - [Category(TestCategory.WindowsForms)] - public void ShowDialogWithColumnSelectionAndFiltering() - { - var dataTable = new DataTable(); - - dataTable.Columns.Add(new DataColumn("Time", typeof (string))); - dataTable.Columns.Add(new DataColumn("Info", typeof (string))); - dataTable.Columns.Add(new DataColumn("Value", typeof(string))); - - dataTable.Rows.Add(new object[] {"01-02-2000", "blah", 1.0.ToString()}); - dataTable.Rows.Add(new object[] {"01-03-2000", "blah2", 3.434.ToString()}); - dataTable.Rows.Add(new object[] {"01-04-2000", "blah3", 5.0.ToString()}); - - var selectionControl = new CsvDataSelectionControl {Dock = DockStyle.Fill}; - - selectionControl.SetData(dataTable, new[] - { - new CsvRequiredField("Date time", typeof (DateTime)), - new CsvRequiredField("Water level (m AD)", typeof (double)) - }); - - var mapping = selectionControl.FieldToColumnMapping; - var filters = selectionControl.Filters; - - Assert.IsNotNull(mapping); - Assert.IsNotNull(filters); - - var form = new Form {Width = 600, Height = 800}; - form.Controls.Add(selectionControl); - WindowsFormsTestHelper.ShowModal(form); - } - - [Test] - [Category(TestCategory.WindowsForms)] - public void ShowDialogForActualFile() - { - var csvToDataTableConverter = new CsvImporter(); - - var dataTable = csvToDataTableConverter.SplitToTable(TestHelper.GetTestFilePath("Timeseries.csv"), - new CsvSettings - { - Delimiter = ',', - FirstRowIsHeader = true, - SkipEmptyLines = true - }); - - var pageTwo = new CsvDataSelectionControl(); - pageTwo.SetData(dataTable, new[] - { - new CsvRequiredField("Datetime", typeof (DateTime)), - new CsvRequiredField("Value", typeof (double)) - }); - - pageTwo.Dock = DockStyle.Fill; - var form = new Form { Width = 600, Height = 800 }; - form.Controls.Add(pageTwo); - WindowsFormsTestHelper.ShowModal(form); - } } } Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/CSV/CsvImportWizardDialogTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/Charting/Tools/SelectPointToolTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: test/Common/DelftTools.Tests/Controls/Swf/CustomInputDialogTest.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/DelftTools.Tests/Controls/Swf/CustomInputDialogTest.cs (.../CustomInputDialogTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ test/Common/DelftTools.Tests/Controls/Swf/CustomInputDialogTest.cs (.../CustomInputDialogTest.cs) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Windows.Forms; using DelftTools.Controls.Swf; -using DelftTools.TestUtils; using NUnit.Framework; namespace DelftTools.Tests.Controls.Swf @@ -10,8 +9,7 @@ public class CustomInputDialogTest { [Test] - [Category(TestCategory.WindowsForms)] - public void ShowCustomDialog() + public void CreateCustomDialog() { var dialog = new CustomInputDialog(); dialog.AddInput("Name"); @@ -26,23 +24,18 @@ valueInput.ToolTip = "Value of item"; valueInput.UnitSymbol = "m"; - WindowsFormsTestHelper.ShowModal(dialog); - Assert.AreEqual(10.0, dialog["Value"]); Assert.AreEqual(DialogResult.Retry, dialog["Result"]); } [Test] - [Category(TestCategory.WindowsForms)] - public void ShowCustomDialogWithDropDownBox() + public void CreateCustomDialogWithDropDownBox() { var dialog = new CustomInputDialog(); dialog.AddInput("Name"); dialog.AddChoice("Occupation", new List {"Construction", "IT", "Management", "Finance"}); dialog.AddChoice("Years of experience", new List { 0, 1, 2, 3 }).ToolTip = "Number of years experience, choose 3 if 3 or more year"; - WindowsFormsTestHelper.ShowModal(dialog); - Assert.AreEqual("", dialog["Name"]); Assert.AreEqual("Construction", dialog["Occupation"]); Assert.AreEqual(0, dialog["Years of experience"]); Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/DataEditorGenerator/DataEditorGeneratorSwfTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/DataEditorGenerator/Domain/Car.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: test/Common/DelftTools.Tests/DelftTools.Tests.csproj =================================================================== diff -u -r2a0bc77430323211d808546837ab2be0291e0ad6 -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/DelftTools.Tests/DelftTools.Tests.csproj (.../DelftTools.Tests.csproj) (revision 2a0bc77430323211d808546837ab2be0291e0ad6) +++ test/Common/DelftTools.Tests/DelftTools.Tests.csproj (.../DelftTools.Tests.csproj) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -130,14 +130,10 @@ - - - - Index: test/Common/SharpMap.UI.Tests/Forms/MapControlTest.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/SharpMap.UI.Tests/Forms/MapControlTest.cs (.../MapControlTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ test/Common/SharpMap.UI.Tests/Forms/MapControlTest.cs (.../MapControlTest.cs) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -5,10 +5,8 @@ using GisSharpBlog.NetTopologySuite.Geometries; using NUnit.Framework; using SharpMap.Data.Providers; -using SharpMap.Extensions.Layers; using SharpMap.Layers; using SharpMap.UI.Forms; -using SharpMap.UI.Tools.Zooming; using SharpTestsEx; namespace SharpMap.UI.Tests.Forms @@ -23,58 +21,6 @@ } [Test] - [Category(TestCategory.WindowsForms)] - public void DisablingLayerShouldRefreshMapControlOnce() - { - using (var mapControl = new MapControl()) - { - WindowsFormsTestHelper.Show(mapControl); - - mapControl.Map.Layers.Add(new GroupLayer("group1")); - - while (mapControl.IsProcessing) - { - Application.DoEvents(); - } - - var refreshCount = 0; - mapControl.MapRefreshed += delegate - { - refreshCount++; - }; - - - mapControl.Map.Layers.First().Visible = false; - - while (mapControl.IsProcessing) - { - Application.DoEvents(); - } - - // TODO: currently second refresh can happen because of timer in MapControl - timer must be replaced by local Map / Layer / MapControl custom event - refreshCount.Should("map should be refreshed once when layer property changes").Be.LessThanOrEqualTo(2); - } - } - - [Test] - [Category(TestCategory.WindowsForms)] - public void PanZoomUsingMouseWheelTest() - { - var map = new Map(); - - var layer = new OpenStreetMapLayer(); - map.Layers.Add(layer); - - var mapControl = new MapControl { Map = map }; - - var panZoomUsingMouseWheelTool = mapControl.GetToolByType(); - Assert.IsNotNull(panZoomUsingMouseWheelTool); - Assert.True(panZoomUsingMouseWheelTool.IsActive); - - WindowsFormsTestHelper.ShowModal(mapControl); - } - - [Test] public void SelectToolIsActiveByDefault() { var mapControl = new MapControl(); @@ -83,8 +29,7 @@ } [Test] - [Category(TestCategory.WindowsForms)] - public void ChangingEnvelopeAfterMapControlIsShownWorksCorrectly() + public void ChangingEnvelopeWorksCorrectly() { var layer = new VectorLayer { DataSource = new DataTableFeatureProvider("POINT(1 1)") }; var map = new Map { Layers = { layer } }; @@ -93,11 +38,7 @@ var viewEnvelope = new Envelope(10000, 10010, 10000, 10010); - WindowsFormsTestHelper.Show(mapControl, - delegate - { - map.ZoomToFit(viewEnvelope); - }); + map.ZoomToFit(viewEnvelope); for (var i = 0; i < 10; i++) { @@ -106,8 +47,6 @@ } Assert.IsTrue(map.Envelope.Contains(viewEnvelope)); - - WindowsFormsTestHelper.CloseAll(); } } } Index: test/Common/SharpMap.UI.Tests/Helpers/MapCursorsTest.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/SharpMap.UI.Tests/Helpers/MapCursorsTest.cs (.../MapCursorsTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ test/Common/SharpMap.UI.Tests/Helpers/MapCursorsTest.cs (.../MapCursorsTest.cs) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -1,6 +1,4 @@ -using System.Windows.Forms; -using DelftTools.TestUtils; -using NUnit.Framework; +using NUnit.Framework; using SharpMap.UI.Helpers; namespace SharpMap.UI.Tests.Helpers @@ -9,13 +7,6 @@ public class MapCursorsTest { [Test] - [Category(TestCategory.WindowsForms)] - public void ShowAddPointCursor() - { - WindowsFormsTestHelper.ShowModal(new Form {Cursor = MapCursors.AddPoint}); - } - - [Test] public void CheckNoCopiesAreReturned() { var c1 = MapCursors.AddPoint; Index: test/Common/SharpMap.UI.Tests/ScaleBarTest.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/SharpMap.UI.Tests/ScaleBarTest.cs (.../ScaleBarTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ test/Common/SharpMap.UI.Tests/ScaleBarTest.cs (.../ScaleBarTest.cs) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -181,37 +181,6 @@ } } - [Test,Category(TestCategory.WindowsForms)] - public void ShowScaleBar() - { - var rectangle = new Rectangle(5,5,300,50); - var bar = new ScaleBar(); - bar.BorderVisible = false; - bar.TransparentBackground = true; - bar.BorderVisible = true; - - //bar.BarColor2 = Color.Yellow; - bar.SetScale(20, 40); - // bar.MapUnit = MapUnits.ws_muMeter; - // bar.BarUnit = MapUnits.ws_muMeter; - //bar.SetCustomUnit(4,"test","test"); - // bar.MapUnit = MapUnits.ws_muCustom; - - using (var control = new UserControl()) - { - - - - control.Paint += - delegate(object sender, PaintEventArgs e) - { - // rectangle = new Rectangle(new Point(0, 0), ((Control) sender).Size); - bar.DrawTheControl(e.Graphics, rectangle); - }; - WindowsFormsTestHelper.ShowModal(control); - } - } - [Test] public void ToFormattedString() { Index: test/Common/SharpMap.UI.Tests/SharpMap.UI.Tests.csproj =================================================================== diff -u -r2a0bc77430323211d808546837ab2be0291e0ad6 -rab09427c48519dc9d448764524fab918a08eac7e --- test/Common/SharpMap.UI.Tests/SharpMap.UI.Tests.csproj (.../SharpMap.UI.Tests.csproj) (revision 2a0bc77430323211d808546837ab2be0291e0ad6) +++ test/Common/SharpMap.UI.Tests/SharpMap.UI.Tests.csproj (.../SharpMap.UI.Tests.csproj) (revision ab09427c48519dc9d448764524fab918a08eac7e) @@ -107,10 +107,7 @@ - - - Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/SharpMap.UI.Tests/Tools/LegendToolTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/SharpMap.UI.Tests/Tools/MapToolExample.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ab09427c48519dc9d448764524fab918a08eac7e refers to a dead (removed) revision in file `test/Common/SharpMap.UI.Tests/Tools/ScaleBarToolTest.cs'. Fisheye: No comparison available. Pass `N' to diff?