Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs =================================================================== diff -u -rd348f01e2a67e8ceee60a095c7f858d2f8c02081 -r2737a3a45f330d73b3201c474ee75e7e4bfa3b2f --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs (.../FeatureBasedMapDataConverterTest.cs) (revision d348f01e2a67e8ceee60a095c7f858d2f8c02081) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs (.../FeatureBasedMapDataConverterTest.cs) (revision 2737a3a45f330d73b3201c474ee75e7e4bfa3b2f) @@ -196,6 +196,60 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } + [Test] + public void ConvertLayerProperties_MapData_NameSetToLayer() + { + // Setup + var name = ""; + var converter = new TestFeatureBasedMapDataConverter(); + var data = new Class(name); + var layer = new MapPointLayer(); + + // Call + converter.ConvertLayerProperties(data, layer); + + // Assert + Assert.AreEqual(name, layer.Name); + } + + [TestCase(true)] + [TestCase(false)] + public void ConvertLayerProperties_MapData_ShowLabelsSetToLayer(bool showLabels) + { + // Setup + var converter = new TestFeatureBasedMapDataConverter(); + var data = new Class("test") + { + ShowLabels = showLabels + }; + var layer = new MapPointLayer(); + + // Call + converter.ConvertLayerProperties(data, layer); + + // Assert + Assert.AreEqual(showLabels, layer.ShowLabels); + } + + [TestCase(true)] + [TestCase(false)] + public void ConvertLayerProperties_MapData_IsVisibleSetToLayer(bool isVisible) + { + // Setup + var converter = new TestFeatureBasedMapDataConverter(); + var data = new Class("test") + { + IsVisible = isVisible + }; + var layer = new MapPointLayer(); + + // Call + converter.ConvertLayerProperties(data, layer); + + // Assert + Assert.AreEqual(isVisible, layer.IsVisible); + } + private class Class : FeatureBasedMapData { public Class(string name) : base(name) {} Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs =================================================================== diff -u -rb49421d8f8856ac689b6c930654f90bfece33a6e -r2737a3a45f330d73b3201c474ee75e7e4bfa3b2f --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision b49421d8f8856ac689b6c930654f90bfece33a6e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision 2737a3a45f330d73b3201c474ee75e7e4bfa3b2f) @@ -187,9 +187,7 @@ } [Test] - [TestCase(true)] - [TestCase(false)] - public void Convert_RandomLineDataWithoutAttributes_ReturnsNewMapLineLayerWithDefaultLabelLayer(bool showLabels) + public void Convert_RandomLineDataWithoutAttributes_ReturnsNewMapLineLayerWithDefaultLabelLayer() { // Setup var converter = new MapLineDataConverter(); @@ -212,21 +210,13 @@ var lineData = new MapLineData("test data") { - Features = features, - ShowLabels = showLabels + Features = features }; // Call IMapFeatureLayer layer = converter.Convert(lineData); // Assert - Assert.AreEqual(lineData.Features.Length, layer.DataSet.Features.Count); - Assert.IsInstanceOf(layer); - Assert.AreEqual(FeatureType.Line, layer.DataSet.FeatureType); - - IEnumerable points = lineData.Features.First().MapGeometries.First().PointCollections.First(); - CollectionAssert.AreEqual(points.Select(p => new Coordinate(p.X, p.Y)), layer.DataSet.Features[0].Coordinates); - Assert.AreEqual(showLabels, layer.ShowLabels); CollectionAssert.IsEmpty(layer.DataSet.GetColumns()); Assert.IsNotNull(layer.LabelLayer); @@ -235,7 +225,7 @@ } [Test] - public void Convert_RandomLineDataWithAttributesShowLabelsFalse_ReturnsNewMapPointLayerWithDefaultLabelLayer() + public void Convert_RandomLineDataWithAttributes_ReturnsNewMapPointLayerWithDefaultLabelLayer() { // Setup var converter = new MapLineDataConverter(); @@ -261,21 +251,13 @@ var lineData = new MapLineData("test data") { - Features = features, - ShowLabels = false + Features = features }; // Call IMapFeatureLayer layer = converter.Convert(lineData); // Assert - Assert.AreEqual(lineData.Features.Length, layer.DataSet.Features.Count); - Assert.IsInstanceOf(layer); - Assert.AreEqual(FeatureType.Line, layer.DataSet.FeatureType); - IEnumerable points = lineData.Features.First().MapGeometries.First().PointCollections.First(); - CollectionAssert.AreEqual(points.Select(p => new Coordinate(p.X, p.Y)), layer.DataSet.Features[0].Coordinates); - Assert.IsFalse(layer.ShowLabels); - DataColumn[] dataColumns = layer.DataSet.GetColumns(); Assert.AreEqual(2, dataColumns.Length); Assert.AreEqual("1", dataColumns[0].ColumnName); @@ -316,21 +298,13 @@ var lineData = new MapLineData("test data") { Features = features, - ShowLabels = true, SelectedMetaDataAttribute = selectedAttribute }; // Call IMapFeatureLayer layer = converter.Convert(lineData); // Assert - Assert.AreEqual(lineData.Features.Length, layer.DataSet.Features.Count); - Assert.IsInstanceOf(layer); - Assert.AreEqual(FeatureType.Line, layer.DataSet.FeatureType); - IEnumerable points = lineData.Features.First().MapGeometries.First().PointCollections.First(); - CollectionAssert.AreEqual(points.Select(p => new Coordinate(p.X, p.Y)), layer.DataSet.Features[0].Coordinates); - Assert.IsTrue(layer.ShowLabels); - DataColumn[] dataColumns = layer.DataSet.GetColumns(); Assert.AreEqual(2, dataColumns.Length); Assert.AreEqual("1", dataColumns[0].ColumnName); @@ -345,40 +319,6 @@ } [Test] - [TestCase(true)] - [TestCase(false)] - public void Convert_DataIsVisible_LayerIsVisibleSameAsData(bool isVisible) - { - // Setup - var converter = new MapLineDataConverter(); - var data = new MapLineData("test") - { - IsVisible = isVisible - }; - - // Call - IMapFeatureLayer layer = converter.Convert(data); - - // Assert - Assert.AreEqual(isVisible, layer.IsVisible); - } - - [Test] - public void Convert_DataName_LayerNameSameAsData() - { - // Setup - var name = ""; - var converter = new MapLineDataConverter(); - var data = new MapLineData(name); - - // Call - MapLineLayer layer = (MapLineLayer) converter.Convert(data); - - // Assert - Assert.AreEqual(name, layer.Name); - } - - [Test] [TestCase(KnownColor.AliceBlue)] [TestCase(KnownColor.Azure)] [TestCase(KnownColor.Beige)] Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs =================================================================== diff -u -r1391bdb956627a135051387c3bcc0bb0d00f14b3 -r2737a3a45f330d73b3201c474ee75e7e4bfa3b2f --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 1391bdb956627a135051387c3bcc0bb0d00f14b3) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 2737a3a45f330d73b3201c474ee75e7e4bfa3b2f) @@ -276,40 +276,6 @@ } [Test] - [TestCase(true)] - [TestCase(false)] - public void Convert_DataIsVisible_LayerIsVisibleSameAsData(bool isVisible) - { - // Setup - var converter = new MapPointDataConverter(); - var data = new MapPointData("test") - { - IsVisible = isVisible - }; - - // Call - IMapFeatureLayer layer = converter.Convert(data); - - // Assert - Assert.AreEqual(isVisible, layer.IsVisible); - } - - [Test] - public void Convert_DataName_LayerNameSameAsData() - { - // Setup - var name = ""; - var converter = new MapPointDataConverter(); - var data = new MapPointData(name); - - // Call - MapPointLayer layer = (MapPointLayer) converter.Convert(data); - - // Assert - Assert.AreEqual(name, layer.Name); - } - - [Test] [TestCase(KnownColor.AliceBlue)] [TestCase(KnownColor.Azure)] [TestCase(KnownColor.Beige)] Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs =================================================================== diff -u -r1391bdb956627a135051387c3bcc0bb0d00f14b3 -r2737a3a45f330d73b3201c474ee75e7e4bfa3b2f --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 1391bdb956627a135051387c3bcc0bb0d00f14b3) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 2737a3a45f330d73b3201c474ee75e7e4bfa3b2f) @@ -521,40 +521,6 @@ } [Test] - [TestCase(true)] - [TestCase(false)] - public void Convert_DataIsVisible_LayerIsVisibleSameAsData(bool isVisible) - { - // Setup - var converter = new MapPolygonDataConverter(); - var data = new MapPolygonData("test") - { - IsVisible = isVisible - }; - - // Call - IMapFeatureLayer layer = converter.Convert(data); - - // Assert - Assert.AreEqual(isVisible, layer.IsVisible); - } - - [Test] - public void Convert_DataName_LayerNameSameAsData() - { - // Setup - var name = ""; - var converter = new MapPolygonDataConverter(); - var data = new MapPolygonData(name); - - // Call - MapPolygonLayer layer = (MapPolygonLayer) converter.Convert(data); - - // Assert - Assert.AreEqual(name, layer.Name); - } - - [Test] [TestCase(KnownColor.AliceBlue)] [TestCase(KnownColor.Azure)] [TestCase(KnownColor.Beige)]