Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -0,0 +1,109 @@ +using System; +using System.Linq; +using System.Windows.Forms; + +using Core.Common.Utils.Reflection; +using Core.Components.DotSpatial.TestUtil; +using Core.Components.Gis.Data; + +using DotSpatial.Controls; + +using NUnit.Framework; + +using IMap = Core.Components.Gis.IMap; + +namespace Core.Components.DotSpatial.Forms.Test +{ + [TestFixture] + public class BaseMapTest + { + [Test] + public void DefaultConstructor_DefaultValues() + { + // Call + var map = new BaseMap(); + + // Assert + Assert.IsInstanceOf(map); + Assert.IsInstanceOf(map); + Assert.IsNull(map.Data); + } + + [Test] + public void Data_UnknownMapData_ThrowsNotSupportedException() + { + // Setup + var map = new BaseMap(); + var testData = new TestMapData(); + + // Call + TestDelegate test = () => map.Data = testData; + + // Assert + Assert.Throws(test); + } + + [Test] + public void Data_Null_ReturnsNull() + { + // Setup + var map = new BaseMap(); + + // Call + map.Data = null; + + // Assert + Assert.IsNull(map.Data); + } + + [Test] + public void Data_NotNull_ReturnsData() + { + // Setup + var map = new BaseMap(); + var testData = new MapPointData(Enumerable.Empty>()); + + // Call + map.Data = testData; + + // Assert + Assert.AreSame(testData, map.Data); + } + + [Test] + public void Data_KnownMapData_MapFeatureAdded() + { + // Setup + var map = new BaseMap(); + var testData = new MapPointData(Enumerable.Empty>()); + var mapView = TypeUtils.GetField(map, "map"); + + // Call + map.Data = testData; + + // Assert + Assert.AreEqual(1, mapView.Layers.Count); + } + + [Test] + public void Data_SetToNull_MapFeaturesCleared() + { + // Setup + var map = new BaseMap(); + var testData = new MapPointData(Enumerable.Empty>()); + var mapView = TypeUtils.GetField(map, "map"); + + map.Data = testData; + + // Precondition + Assert.AreEqual(1, mapView.Layers.Count); + + // Call + map.Data = null; + + // Assert + Assert.IsNull(map.Data); + Assert.AreEqual(0, mapView.Layers.Count); + } + } +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -0,0 +1,125 @@ + + + + Debug + x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5} + Library + Properties + Core.Components.DotSpatial.Forms.Test + Core.Components.DotSpatial.Forms.Test + v4.0 + 512 + + + x86 + bin\Debug\ + false + DEBUG;TRACE + full + + + x86 + bin\Release\ + TRACE + true + + + bin\ReleaseForCodeCoverage\ + TRACE + true + x86 + MinimumRecommendedRules.ruleset + pdbonly + + + + ..\..\..\..\packages\DotSpatial.Controls.1.7\lib\net40-Client\DotSpatial.Controls.dll + True + + + ..\..\..\..\packages\DotSpatial.Data.1.7\lib\net40-Client\DotSpatial.Data.dll + True + + + ..\..\..\..\packages\DotSpatial.Data.Forms.1.7\lib\net40-Client\DotSpatial.Data.Forms.dll + True + + + ..\..\..\..\packages\DotSpatial.Extensions.1.7\lib\net40-Client\DotSpatial.Extensions.dll + True + + + ..\..\..\..\packages\DotSpatial.Modeling.Forms.1.7\lib\net40-Client\DotSpatial.Modeling.Forms.dll + True + + + ..\..\..\..\packages\DotSpatial.Mono.1.7\lib\net40-Client\DotSpatial.Mono.dll + True + + + ..\..\..\..\packages\DotSpatial.Projections.1.7\lib\net40-Client\DotSpatial.Projections.dll + True + + + ..\..\..\..\packages\DotSpatial.Projections.Forms.1.7\lib\net40-Client\DotSpatial.Projections.Forms.dll + True + + + ..\..\..\..\packages\DotSpatial.Serialization.1.7\lib\net40-Client\DotSpatial.Serialization.dll + True + + + ..\..\..\..\packages\DotSpatial.Symbology.1.7\lib\net40-Client\DotSpatial.Symbology.dll + True + + + ..\..\..\..\packages\DotSpatial.Symbology.Forms.1.7\lib\net40-Client\DotSpatial.Symbology.Forms.dll + True + + + ..\..\..\..\packages\DotSpatial.Topology.1.7\lib\net40-Client\DotSpatial.Topology.dll + True + + + ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True + + + + + + + + + + + + + + + {f49bd8b2-332a-4c91-a196-8cce0a2c7d98} + Core.Common.Utils + + + {5a91174a-fb95-4c9d-9ca5-81c0b8d4361a} + Core.Components.DotSpatial.Forms + + + {318ba582-88c9-4816-a54a-a7e431461de3} + Core.Components.Gis + + + {9b6f3987-eaf7-4733-80c1-3dcab44d87ae} + Core.Components.DotSpatial.TestUtil + + + + + \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/Properties/AssemblyInfo.cs =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/Properties/AssemblyInfo.cs (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/Properties/AssemblyInfo.cs (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Core.Components.DotSpatial.Forms.Test")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Deltares")] +[assembly: AssemblyProduct("Core.Components.DotSpatial.Forms.Test")] +[assembly: AssemblyCopyright("Copyright © Deltares 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("525c25e0-dcef-4b09-8234-c9d001b47bfa")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/packages.config =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/packages.config (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/packages.config (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag ae34e25064174cb82307bbd514ef3d37bf49586b refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -rae34e25064174cb82307bbd514ef3d37bf49586b --- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj (.../Core.Components.DotSpatial.Test.csproj) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj (.../Core.Components.DotSpatial.Test.csproj) (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -39,26 +39,10 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\packages\DotSpatial.Controls.1.7\lib\net40-Client\DotSpatial.Controls.dll - True - ..\..\..\..\packages\DotSpatial.Data.1.7\lib\net40-Client\DotSpatial.Data.dll True - - ..\..\..\..\packages\DotSpatial.Data.Forms.1.7\lib\net40-Client\DotSpatial.Data.Forms.dll - True - - - ..\..\..\..\packages\DotSpatial.Extensions.1.7\lib\net40-Client\DotSpatial.Extensions.dll - True - - - ..\..\..\..\packages\DotSpatial.Modeling.Forms.1.7\lib\net40-Client\DotSpatial.Modeling.Forms.dll - True - ..\..\..\..\packages\DotSpatial.Mono.1.7\lib\net40-Client\DotSpatial.Mono.dll True @@ -67,22 +51,10 @@ ..\..\..\..\packages\DotSpatial.Projections.1.7\lib\net40-Client\DotSpatial.Projections.dll True - - ..\..\..\..\packages\DotSpatial.Projections.Forms.1.7\lib\net40-Client\DotSpatial.Projections.Forms.dll - True - ..\..\..\..\packages\DotSpatial.Serialization.1.7\lib\net40-Client\DotSpatial.Serialization.dll True - - ..\..\..\..\packages\DotSpatial.Symbology.1.7\lib\net40-Client\DotSpatial.Symbology.dll - True - - - ..\..\..\..\packages\DotSpatial.Symbology.Forms.1.7\lib\net40-Client\DotSpatial.Symbology.Forms.dll - True - ..\..\..\..\packages\DotSpatial.Topology.1.7\lib\net40-Client\DotSpatial.Topology.dll True @@ -93,10 +65,8 @@ - - @@ -106,18 +76,10 @@ - - {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} - Core.Common.Utils - {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil - - {5a91174a-fb95-4c9d-9ca5-81c0b8d4361a} - Core.Components.DotSpatial.Forms - {aa47e858-a2a7-470e-8b2d-c76ae8ed9ccd} Core.Components.DotSpatial Index: Core/Components/test/Core.Components.DotSpatial.Test/packages.config =================================================================== diff -u -r97ecd934817b9e808038f056dc5ae0a7db3455ee -rae34e25064174cb82307bbd514ef3d37bf49586b --- Core/Components/test/Core.Components.DotSpatial.Test/packages.config (.../packages.config) (revision 97ecd934817b9e808038f056dc5ae0a7db3455ee) +++ Core/Components/test/Core.Components.DotSpatial.Test/packages.config (.../packages.config) (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -1,16 +1,9 @@  - - - - - - - \ No newline at end of file Index: Ringtoets.sln =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -rae34e25064174cb82307bbd514ef3d37bf49586b --- Ringtoets.sln (.../Ringtoets.sln) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Ringtoets.sln (.../Ringtoets.sln) (revision ae34e25064174cb82307bbd514ef3d37bf49586b) @@ -237,6 +237,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.DotSpatial.Forms", "Core\Components\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj", "{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.DotSpatial.Forms.Test", "Core\Components\test\Core.Components.DotSpatial.Forms.Test\Core.Components.DotSpatial.Forms.Test.csproj", "{73AB8619-65A0-4CC7-9024-A8D08C76FBF5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CreateInstaller|Any CPU = CreateInstaller|Any CPU @@ -1989,6 +1991,29 @@ {5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}.ReleaseForCodeCoverage|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86 {5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstaller|Any CPU.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstaller|Mixed Platforms.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstaller|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstaller|x86.ActiveCfg = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Debug|Any CPU.ActiveCfg = Debug|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Debug|x86.ActiveCfg = Debug|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Debug|x86.Build.0 = Debug|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Release|Any CPU.ActiveCfg = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Release|Mixed Platforms.Build.0 = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Release|x86.ActiveCfg = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.Release|x86.Build.0 = Release|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.ReleaseForCodeCoverage|Any CPU.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.ReleaseForCodeCoverage|Mixed Platforms.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.ReleaseForCodeCoverage|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2083,6 +2108,7 @@ {E900A014-CA87-4374-87F0-813D653A9698} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} {9B6F3987-EAF7-4733-80C1-3DCAB44D87AE} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} {CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} + {73AB8619-65A0-4CC7-9024-A8D08C76FBF5} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} {594C5C6D-5833-4E1C-9F30-13A202628EEF} = {EE8D5A6C-4871-452A-A69B-F04E374D715E} {555F3460-DD3D-4B1D-8319-0AA454050FF7} = {EC6E52A5-2BB1-4080-9784-5DC8D0B08ED3} {F2C4C4F7-4058-4E71-859B-D704F15D2745} = {555F3460-DD3D-4B1D-8319-0AA454050FF7}