Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs =================================================================== diff -u -ra052ef305da88c4a564d90fecc447519387ce1d0 -r7b668a4bcdebad4df255dd80606334480d8d73de --- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs (.../MapLineDataProperties.cs) (revision a052ef305da88c4a564d90fecc447519387ce1d0) +++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs (.../MapLineDataProperties.cs) (revision 7b668a4bcdebad4df255dd80606334480d8d73de) @@ -121,7 +121,7 @@ [DynamicVisible] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Categories_DisplayName))] - public LineCategoryThemeProperties[] LineCategoryThemes + public LineCategoryThemeProperties[] CategoryThemes { get { Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs =================================================================== diff -u -ra052ef305da88c4a564d90fecc447519387ce1d0 -r7b668a4bcdebad4df255dd80606334480d8d73de --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs (.../MapLineDataPropertiesTest.cs) (revision a052ef305da88c4a564d90fecc447519387ce1d0) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs (.../MapLineDataPropertiesTest.cs) (revision 7b668a4bcdebad4df255dd80606334480d8d73de) @@ -45,7 +45,7 @@ private const int widthPropertyIndex = 7; private const int stylePropertyIndex = 8; - private const int mapThemeCategoriesPropertyIndex = 8; + private const int categoryThemesPropertyIndex = 6; [Test] public void Constructor_ExpectedValues() @@ -119,14 +119,14 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(9, dynamicProperties.Count); + Assert.AreEqual(7, dynamicProperties.Count); const string styleCategory = "Stijl"; - PropertyDescriptor widthProperty = dynamicProperties[mapThemeCategoriesPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty, + PropertyDescriptor categoryThemesProperty = dynamicProperties[categoryThemesPropertyIndex]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(categoryThemesProperty, styleCategory, "Categorieën", - "De dikte van de lijnen waarmee deze kaartlaag wordt weergegeven.", + string.Empty, true); } @@ -157,7 +157,7 @@ Assert.AreEqual(width, properties.Width); Assert.AreEqual(dashStyle, properties.DashStyle); - CollectionAssert.IsEmpty(properties.LineCategoryThemes); + CollectionAssert.IsEmpty(properties.CategoryThemes); } [Test] @@ -181,8 +181,8 @@ Assert.IsEmpty(properties.SelectedMetaDataAttribute.MetaDataAttribute); Assert.AreEqual(mapLineData.MetaData, properties.GetAvailableMetaDataAttributes()); - Assert.AreEqual(1, properties.LineCategoryThemes); - Assert.AreEqual(lineCategoryTheme, properties.LineCategoryThemes.First().Data); + Assert.AreEqual(1, properties.CategoryThemes.Length); + Assert.AreEqual(lineCategoryTheme, properties.CategoryThemes.First().Data); } [Test] @@ -292,8 +292,8 @@ var properties = new MapLineDataProperties(mapLineData, Enumerable.Empty()); // Call - bool isMapThemeCategoriesVisible = properties.DynamicVisibleValidationMethod( - nameof(MapLineDataProperties.LineCategoryThemes)); + bool isCategoryThemesVisible = properties.DynamicVisibleValidationMethod( + nameof(MapLineDataProperties.CategoryThemes)); bool isLineColorStyleVisible = properties.DynamicVisibleValidationMethod( nameof(MapLineDataProperties.Color)); bool isLineWidthVisible = properties.DynamicVisibleValidationMethod( @@ -302,7 +302,7 @@ nameof(MapLineDataProperties.Color)); // Assert - Assert.AreEqual(hasMapTheme, isMapThemeCategoriesVisible); + Assert.AreEqual(hasMapTheme, isCategoryThemesVisible); Assert.AreNotEqual(hasMapTheme, isLineColorStyleVisible); Assert.AreNotEqual(hasMapTheme, isLineWidthVisible); Assert.AreNotEqual(hasMapTheme, isLineDashStyleVisible);