Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/CategoryThemeProperties.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rbbc00f2af5f96980c85a2e04a204affdceff0181 --- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/CategoryThemeProperties.cs (.../CategoryThemeProperties.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/CategoryThemeProperties.cs (.../CategoryThemeProperties.cs) (revision bbc00f2af5f96980c85a2e04a204affdceff0181) @@ -21,9 +21,7 @@ using System; using System.ComponentModel; -using System.Drawing; using Core.Common.Gui.Attributes; -using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.Util.Attributes; using Core.Components.Gis.Theme; @@ -86,19 +84,6 @@ } } - [PropertyOrder(2)] - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.CategoryThemeProperties_Color_Description))] - [TypeConverter(typeof(ColorTypeConverter))] - public Color Color - { - get - { - return data.Color; - } - } - public override string ToString() { return string.Empty; Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/CategoryThemePropertiesTest.cs =================================================================== diff -u -r4c7e3ff3bf5c0a50fd9d208b71400e5dfb6cebd4 -rbbc00f2af5f96980c85a2e04a204affdceff0181 --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/CategoryThemePropertiesTest.cs (.../CategoryThemePropertiesTest.cs) (revision 4c7e3ff3bf5c0a50fd9d208b71400e5dfb6cebd4) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/CategoryThemePropertiesTest.cs (.../CategoryThemePropertiesTest.cs) (revision bbc00f2af5f96980c85a2e04a204affdceff0181) @@ -22,7 +22,6 @@ using System; using System.ComponentModel; using System.Drawing; -using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using Core.Components.Gis.TestUtil; @@ -36,7 +35,6 @@ public class CategoryThemePropertiesTest { private const int criterionPropertyIndex = 0; - private const int colorPropertyIndex = 1; [Test] public void Constructor_AttributeNameNull_ThrowsArgumentNullException() @@ -73,21 +71,20 @@ Assert.AreSame(theme, properties.Data); Assert.IsInstanceOf>(properties); TestHelper.AssertTypeConverter(); - TestHelper.AssertTypeConverter(nameof(CategoryThemeProperties.Color)); } [Test] public void Constructor_Always_PropertiesHaveExpectedAttributesValues() { // Setup - CategoryTheme theme = CategoryThemeTestFactory.CreateCategoryTheme(); + var theme = new TestCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion()); // Call var properties = new CategoryThemeProperties(string.Empty, theme); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(2, dynamicProperties.Count); + Assert.AreEqual(1, dynamicProperties.Count); const string themeCategory = "Stijl"; PropertyDescriptor criterionProperty = dynamicProperties[criterionPropertyIndex]; @@ -96,14 +93,6 @@ "Criterium", "Het criterium van deze categorie.", true); - - PropertyDescriptor colorProperty = dynamicProperties[colorPropertyIndex]; - Assert.IsInstanceOf(colorProperty.Converter); - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty, - themeCategory, - "Kleur", - "De kleur waarmee deze categorie wordt weergegeven.", - true); } [Test] @@ -113,21 +102,18 @@ string formatExpression) { // Setup - var random = new Random(21); const string attributeName = "AttributeName"; const string value = "random value 123"; - Color color = Color.FromKnownColor(random.NextEnumValue()); var criterion = new ValueCriterion(valueOperator, value); - var theme = new CategoryTheme(color, criterion); + var theme = new TestCategoryTheme(criterion); // Call var properties = new CategoryThemeProperties(attributeName, theme); // Assert string expectedValue = string.Format(formatExpression, attributeName, value); Assert.AreEqual(expectedValue, properties.Criterion); - Assert.AreEqual(color, properties.Color); } [Test] @@ -144,5 +130,10 @@ // Assert Assert.IsEmpty(toString); } + + private class TestCategoryTheme : CategoryTheme + { + public TestCategoryTheme(ValueCriterion criterion) : base(criterion) {} + } } } \ No newline at end of file