Index: Core/Components/src/Core.Components.Chart/Styles/ChartAreaStyle.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/src/Core.Components.Chart/Styles/ChartAreaStyle.cs (.../ChartAreaStyle.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/src/Core.Components.Chart/Styles/ChartAreaStyle.cs (.../ChartAreaStyle.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -27,7 +27,7 @@
namespace Core.Components.Chart.Styles
{
///
- /// This class represents styling of a area on a chart.
+ /// This class represents styling of an area on a chart.
///
public class ChartAreaStyle : ChartStyle
{
Index: Core/Components/src/Core.Components.Chart/Styles/ChartStyle.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/src/Core.Components.Chart/Styles/ChartStyle.cs (.../ChartStyle.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/src/Core.Components.Chart/Styles/ChartStyle.cs (.../ChartStyle.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -27,7 +27,7 @@
public abstract class ChartStyle
{
///
- /// Gets or sets a value indicating whether the is editable in a property panel.
+ /// Gets or sets a value indicating whether the is editable.
///
public bool IsEditable { get; set; }
}
Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartAreaDataTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartAreaDataTest.cs (.../ChartAreaDataTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartAreaDataTest.cs (.../ChartAreaDataTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -44,7 +44,7 @@
Assert.AreEqual(Color.Gray, data.Style.FillColor);
Assert.AreEqual(Color.Black, data.Style.StrokeColor);
Assert.AreEqual(2, data.Style.StrokeThickness);
- Assert.AreEqual(false, data.Style.IsEditable);
+ Assert.IsFalse(data.Style.IsEditable);
}
[Test]
@@ -89,13 +89,7 @@
public void Constructor_WithStyle_ExpectedValue()
{
// Setup
- var style = new ChartAreaStyle
- {
- FillColor = Color.Red,
- StrokeColor = Color.Fuchsia,
- StrokeThickness = 3,
- IsEditable = true
- };
+ var style = new ChartAreaStyle();
// Call
var data = new ChartAreaData("test data", style);
Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartLineDataTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartLineDataTest.cs (.../ChartLineDataTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartLineDataTest.cs (.../ChartLineDataTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -44,7 +44,7 @@
Assert.AreEqual(Color.Black, data.Style.Color);
Assert.AreEqual(2, data.Style.Width);
Assert.AreEqual(ChartLineDashStyle.Solid, data.Style.DashStyle);
- Assert.AreEqual(false, data.Style.IsEditable);
+ Assert.IsFalse(data.Style.IsEditable);
}
[Test]
@@ -89,13 +89,7 @@
public void Constructor_WithStyle_ExpectedValue()
{
// Setup
- var style = new ChartLineStyle
- {
- Color = Color.Red,
- Width = 3,
- DashStyle = ChartLineDashStyle.DashDot,
- IsEditable = true
- };
+ var style = new ChartLineStyle();
// Call
var data = new ChartLineData("test data", style);
Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartMultipleAreaDataTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartMultipleAreaDataTest.cs (.../ChartMultipleAreaDataTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartMultipleAreaDataTest.cs (.../ChartMultipleAreaDataTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -45,7 +45,7 @@
Assert.AreEqual(Color.Gray, data.Style.FillColor);
Assert.AreEqual(Color.Black, data.Style.StrokeColor);
Assert.AreEqual(2, data.Style.StrokeThickness);
- Assert.AreEqual(false, data.Style.IsEditable);
+ Assert.IsFalse(data.Style.IsEditable);
}
[Test]
@@ -90,13 +90,7 @@
public void Constructor_WithStyle_ExpectedValue()
{
// Setup
- var style = new ChartAreaStyle
- {
- FillColor = Color.Red,
- StrokeColor = Color.Fuchsia,
- StrokeThickness = 3,
- IsEditable = true
- };
+ var style = new ChartAreaStyle();
// Call
var data = new ChartMultipleAreaData("test data", style);
Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartMultipleLineDataTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartMultipleLineDataTest.cs (.../ChartMultipleLineDataTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartMultipleLineDataTest.cs (.../ChartMultipleLineDataTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -45,7 +45,7 @@
Assert.AreEqual(Color.Black, data.Style.Color);
Assert.AreEqual(2, data.Style.Width);
Assert.AreEqual(ChartLineDashStyle.Solid, data.Style.DashStyle);
- Assert.AreEqual(false, data.Style.IsEditable);
+ Assert.IsFalse(data.Style.IsEditable);
}
[Test]
@@ -76,13 +76,7 @@
public void Constructor_WithStyle_ExpectedValue()
{
// Setup
- var style = new ChartLineStyle
- {
- Color = Color.Red,
- Width = 3,
- DashStyle = ChartLineDashStyle.DashDot,
- IsEditable = true
- };
+ var style = new ChartLineStyle();
// Call
var data = new ChartMultipleLineData("test data", style);
Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartPointDataTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartPointDataTest.cs (.../ChartPointDataTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartPointDataTest.cs (.../ChartPointDataTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -46,7 +46,7 @@
Assert.AreEqual(ChartPointSymbol.Square, data.Style.Symbol);
Assert.AreEqual(Color.Black, data.Style.StrokeColor);
Assert.AreEqual(1, data.Style.StrokeThickness);
- Assert.AreEqual(false, data.Style.IsEditable);
+ Assert.IsFalse(data.Style.IsEditable);
}
[Test]
@@ -91,15 +91,7 @@
public void Constructor_WithStyle_ExpectedValue()
{
// Setup
- var style = new ChartPointStyle
- {
- Color = Color.Red,
- StrokeColor = Color.Blue,
- Size = 2,
- StrokeThickness = 2,
- Symbol = ChartPointSymbol.Circle,
- IsEditable = true
- };
+ var style = new ChartPointStyle();
// Call
var data = new ChartPointData("test data", style);
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs (.../ChartAreaDataPropertiesTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs (.../ChartAreaDataPropertiesTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -54,12 +54,12 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isEditable)
+ public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isStyleEditable)
{
// Setup
var chartAreaData = new ChartAreaData("Test", new ChartAreaStyle
{
- IsEditable = isEditable
+ IsEditable = isStyleEditable
});
// Call
@@ -80,22 +80,22 @@
styleCategory,
"Kleur",
"De kleur van de vlakken waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
Assert.IsInstanceOf(fillColorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
styleCategory,
"Lijnkleur",
"De kleur van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
styleCategory,
"Lijndikte",
"De dikte van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
}
[Test]
@@ -112,12 +112,10 @@
StrokeColor = strokeColor,
StrokeThickness = strokeThickness
});
+ var properties = new ChartAreaDataProperties();
// Call
- var properties = new ChartAreaDataProperties
- {
- Data = chartAreaData
- };
+ properties.Data = chartAreaData;
// Assert
Assert.AreEqual(fillColor, properties.FillColor);
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs (.../ChartLineDataPropertiesTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs (.../ChartLineDataPropertiesTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -55,12 +55,12 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isEditable)
+ public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isStyleEditable)
{
// Setup
var chartLineData = new ChartLineData("Test", new ChartLineStyle
{
- IsEditable = isEditable
+ IsEditable = isStyleEditable
});
// Call
@@ -81,22 +81,22 @@
styleCategory,
"Kleur",
"De kleur van de lijnen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor widthProperty = dynamicProperties[widthPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
styleCategory,
"Lijndikte",
"De dikte van de lijnen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
Assert.IsInstanceOf(styleProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
styleCategory,
"Lijnstijl",
"De stijl van de lijnen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
}
[Test]
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs (.../ChartMultipleAreaDataPropertiesTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs (.../ChartMultipleAreaDataPropertiesTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -54,12 +54,12 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isEditable)
+ public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isStyleEditable)
{
// Setup
var chartAreaData = new ChartMultipleAreaData("Test", new ChartAreaStyle
{
- IsEditable = isEditable
+ IsEditable = isStyleEditable
});
// Call
@@ -80,22 +80,22 @@
styleCategory,
"Kleur",
"De kleur van de vlakken waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
Assert.IsInstanceOf(strokeColorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
styleCategory,
"Lijnkleur",
"De kleur van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
styleCategory,
"Lijndikte",
"De dikte van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
}
[Test]
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs (.../ChartMultipleLineDataPropertiesTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs (.../ChartMultipleLineDataPropertiesTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -55,12 +55,12 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isEditable)
+ public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isStyleEditable)
{
// Setup
var chartLineData = new ChartMultipleLineData("Test", new ChartLineStyle
{
- IsEditable = isEditable
+ IsEditable = isStyleEditable
});
// Call
@@ -81,22 +81,22 @@
styleCategory,
"Kleur",
"De kleur van de lijnen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor widthProperty = dynamicProperties[widthPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
styleCategory,
"Lijndikte",
"De dikte van de lijnen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
Assert.IsInstanceOf(styleProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
styleCategory,
"Lijnstijl",
"De stijl van de lijnen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
}
[Test]
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs (.../ChartPointDataPropertiesTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs (.../ChartPointDataPropertiesTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -57,12 +57,12 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isEditable)
+ public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isStyleEditable)
{
// Setup
var chartPointData = new ChartPointData("Test", new ChartPointStyle
{
- IsEditable = isEditable
+ IsEditable = isStyleEditable
});
// Call
@@ -83,37 +83,37 @@
styleCategory,
"Kleur",
"De kleur van de symbolen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
Assert.IsInstanceOf(strokeColorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
styleCategory,
"Lijnkleur",
"De kleur van de lijn van de symbolen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
styleCategory,
"Lijndikte",
"De dikte van de lijn van de symbolen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor sizeProperty = dynamicProperties[sizePropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sizeProperty,
styleCategory,
"Grootte",
"De grootte van de symbolen waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
PropertyDescriptor symbolProperty = dynamicProperties[symbolPropertyIndex];
Assert.IsInstanceOf(symbolProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(symbolProperty,
styleCategory,
"Symbool",
"Het symbool waarmee deze gegevensreeks wordt weergegeven.",
- !isEditable);
+ !isStyleEditable);
}
[Test]
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -60,7 +60,8 @@
{
Color = Color.DarkRed,
Width = 3,
- DashStyle = ChartLineDashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid,
+ IsEditable = true
})
{
Points = new[]
@@ -95,7 +96,8 @@
{
Color = Color.DarkSlateBlue,
Width = 2,
- DashStyle = ChartLineDashStyle.DashDot
+ DashStyle = ChartLineDashStyle.DashDot,
+ IsEditable = true
})
{
Points = new[]
@@ -130,7 +132,8 @@
{
FillColor = Color.DarkSeaGreen,
StrokeColor = Color.DarkGreen,
- StrokeThickness = 5
+ StrokeThickness = 5,
+ IsEditable = true
})
{
Points = new[]
@@ -176,7 +179,8 @@
{
FillColor = Color.FromArgb(120, Color.Wheat),
StrokeColor = Color.DarkOrange,
- StrokeThickness = 2
+ StrokeThickness = 2,
+ IsEditable = true
})
{
Points = new[]
@@ -230,7 +234,8 @@
StrokeColor = Color.AntiqueWhite,
Size = 6,
StrokeThickness = 3,
- Symbol = ChartPointSymbol.Circle
+ Symbol = ChartPointSymbol.Circle,
+ IsEditable = true
})
{
Points = new[]
@@ -253,7 +258,8 @@
StrokeColor = Color.DeepSkyBlue,
Size = 7,
StrokeThickness = 2,
- Symbol = ChartPointSymbol.Diamond
+ Symbol = ChartPointSymbol.Diamond,
+ IsEditable = true
})
{
Points = new[]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs (.../RingtoetsChartDataFactoryTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs (.../RingtoetsChartDataFactoryTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -31,31 +31,31 @@
public class RingtoetsChartDataFactoryTest
{
[Test]
- public void CreateForeshoreGeometryChartData_ReturnsChartDataWithEditableStyling()
+ public void CreateForeshoreGeometryChartData_ReturnsChartDataWithExpectedStyling()
{
// Call
ChartLineData data = RingtoetsChartDataFactory.CreateForeshoreGeometryChartData();
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Voorlandprofiel", data.Name);
- AssertEqualStyle(data.Style, Color.DarkOrange, 2, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, Color.DarkOrange, 2, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateSurfaceLineChartData_ReturnsChartLineDataWithEditableStyling()
+ public void CreateSurfaceLineChartData_ReturnsChartLineDataWithExpectedStyling()
{
// Call
ChartLineData data = RingtoetsChartDataFactory.CreateSurfaceLineChartData();
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Profielschematisatie", data.Name);
- AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateSoilProfileChartData_ReturnsChartDataCollectionWithDefaultStyling()
+ public void CreateSoilProfileChartData_ReturnsEmptyChartDataCollection()
{
// Call
ChartDataCollection data = RingtoetsChartDataFactory.CreateSoilProfileChartData();
@@ -66,94 +66,93 @@
}
[Test]
- public void CreateDitchPolderSideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateDitchPolderSideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = RingtoetsChartDataFactory.CreateDitchPolderSideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Insteek sloot polderzijde", data.Name);
- AssertEqualStyle(data.Style, Color.IndianRed, 8, Color.Transparent, 0, ChartPointSymbol.Circle, true);
+ AssertEqualStyle(data.Style, Color.IndianRed, 8, Color.Transparent, 0, ChartPointSymbol.Circle);
}
[Test]
- public void CreateBottomDitchPolderSideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateBottomDitchPolderSideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = RingtoetsChartDataFactory.CreateBottomDitchPolderSideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Slootbodem polderzijde", data.Name);
- AssertEqualStyle(data.Style, Color.Teal, 8, Color.Transparent, 0, ChartPointSymbol.Circle, true);
+ AssertEqualStyle(data.Style, Color.Teal, 8, Color.Transparent, 0, ChartPointSymbol.Circle);
}
[Test]
- public void CreateBottomDitchDikeSideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateBottomDitchDikeSideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = RingtoetsChartDataFactory.CreateBottomDitchDikeSideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Slootbodem dijkzijde", data.Name);
- AssertEqualStyle(data.Style, Color.DarkSeaGreen, 8, Color.Transparent, 0, ChartPointSymbol.Circle, true);
+ AssertEqualStyle(data.Style, Color.DarkSeaGreen, 8, Color.Transparent, 0, ChartPointSymbol.Circle);
}
[Test]
- public void CreateDitchDikeSideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateDitchDikeSideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = RingtoetsChartDataFactory.CreateDitchDikeSideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Insteek sloot dijkzijde", data.Name);
- AssertEqualStyle(data.Style, Color.MediumPurple, 8, Color.Transparent, 0, ChartPointSymbol.Circle, true);
+ AssertEqualStyle(data.Style, Color.MediumPurple, 8, Color.Transparent, 0, ChartPointSymbol.Circle);
}
[Test]
- public void CreateDikeToeAtPolderChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateDikeToeAtPolderChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = RingtoetsChartDataFactory.CreateDikeToeAtPolderChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Teen dijk binnenwaarts", data.Name);
- AssertEqualStyle(data.Style, Color.LightGray, 8, Color.Black, 1, ChartPointSymbol.Square, true);
+ AssertEqualStyle(data.Style, Color.LightGray, 8, Color.Black, 1, ChartPointSymbol.Square);
}
[Test]
- public void CreateDikeToeAtRiverChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateDikeToeAtRiverChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = RingtoetsChartDataFactory.CreateDikeToeAtRiverChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Teen dijk buitenwaarts", data.Name);
- AssertEqualStyle(data.Style, Color.DarkGray, 8, Color.Black, 1, ChartPointSymbol.Square, true);
+ AssertEqualStyle(data.Style, Color.DarkGray, 8, Color.Black, 1, ChartPointSymbol.Square);
}
- private static void AssertEqualStyle(ChartPointStyle pointStyle, Color fillColor, int size,
- Color strokeColor, int strokeThickness, ChartPointSymbol symbol, bool isEditable)
+ private static void AssertEqualStyle(ChartPointStyle pointStyle, Color fillColor, int size, Color strokeColor, int strokeThickness, ChartPointSymbol symbol)
{
Assert.AreEqual(fillColor, pointStyle.Color);
Assert.AreEqual(size, pointStyle.Size);
Assert.AreEqual(strokeColor, pointStyle.StrokeColor);
Assert.AreEqual(strokeThickness, pointStyle.StrokeThickness);
Assert.AreEqual(symbol, pointStyle.Symbol);
- Assert.AreEqual(isEditable, pointStyle.IsEditable);
+ Assert.IsTrue(pointStyle.IsEditable);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style, bool isEditable)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Assert.AreEqual(style, lineStyle.DashStyle);
- Assert.AreEqual(isEditable, lineStyle.IsEditable);
+ Assert.IsTrue(lineStyle.IsEditable);
}
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsChartDataFactoryTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -34,25 +34,25 @@
public class GrassCoverErosionInwardsChartDataFactoryTest
{
[Test]
- public void CreateDikeGeometryChartData_ReturnsChartDataWithEditableStyling()
+ public void CreateDikeGeometryChartData_ReturnsChartDataWithExpectedStyling()
{
// Call
ChartLineData data = GrassCoverErosionInwardsChartDataFactory.CreateDikeGeometryChartData();
// Assert
Assert.AreEqual("Dijkprofiel", data.Name);
- AssertEqualStyle(data.Style, Color.SaddleBrown, 2, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, Color.SaddleBrown, 2, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateDikeHeightChartData_ReturnsChartDataWithEditableStyling()
+ public void CreateDikeHeightChartData_ReturnsChartDataWithExpectedStyling()
{
// Call
ChartLineData data = GrassCoverErosionInwardsChartDataFactory.CreateDikeHeightChartData();
// Assert
Assert.AreEqual("Dijkhoogte", data.Name);
- AssertEqualStyle(data.Style, Color.MediumSeaGreen, 2, ChartLineDashStyle.Dash, true);
+ AssertEqualStyle(data.Style, Color.MediumSeaGreen, 2, ChartLineDashStyle.Dash);
}
[Test]
@@ -150,12 +150,12 @@
Assert.AreEqual(expectedName, chartData.Name);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style, bool isEditable)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Assert.AreEqual(style, lineStyle.DashStyle);
- Assert.AreEqual(isEditable, lineStyle.IsEditable);
+ Assert.IsTrue(lineStyle.IsEditable);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -35,87 +35,87 @@
public class MacroStabilityInwardsChartDataFactoryTest
{
[Test]
- public void CreateShoulderBaseInsideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateShoulderBaseInsideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Insteek binnenberm", data.Name);
- AssertEqualStyle(data.Style, Color.BlueViolet, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle, true);
+ AssertEqualStyle(data.Style, Color.BlueViolet, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle);
}
[Test]
- public void CreateDikeTopAtPolderChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateDikeTopAtPolderChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtPolderChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Kruin binnentalud", data.Name);
- AssertEqualStyle(data.Style, Color.LightSkyBlue, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle, true);
+ AssertEqualStyle(data.Style, Color.LightSkyBlue, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle);
}
[Test]
- public void CreateShoulderTopInsideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateShoulderTopInsideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateShoulderTopInsideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Kruin binnenberm", data.Name);
- AssertEqualStyle(data.Style, Color.DeepSkyBlue, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle, true);
+ AssertEqualStyle(data.Style, Color.DeepSkyBlue, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle);
}
[Test]
- public void CreateSurfaceLevelInsideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateSurfaceLevelInsideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelInsideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Maaiveld binnenwaarts", data.Name);
- AssertEqualStyle(data.Style, Color.ForestGreen, 8, Color.Black, 1, ChartPointSymbol.Square, true);
+ AssertEqualStyle(data.Style, Color.ForestGreen, 8, Color.Black, 1, ChartPointSymbol.Square);
}
[Test]
- public void CreateSurfaceLevelOutsideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateSurfaceLevelOutsideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelOutsideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Maaiveld buitenwaarts", data.Name);
- AssertEqualStyle(data.Style, Color.LightSeaGreen, 8, Color.Black, 1, ChartPointSymbol.Square, true);
+ AssertEqualStyle(data.Style, Color.LightSeaGreen, 8, Color.Black, 1, ChartPointSymbol.Square);
}
[Test]
- public void CreateTrafficLoadInsideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateTrafficLoadInsideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadInsideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Verkeersbelasting kant binnenwaarts", data.Name);
- AssertEqualStyle(data.Style, Color.LightSlateGray, 8, Color.White, 1, ChartPointSymbol.Circle, true);
+ AssertEqualStyle(data.Style, Color.LightSlateGray, 8, Color.White, 1, ChartPointSymbol.Circle);
}
[Test]
- public void CreateTrafficLoadOutsideChartData_ReturnsChartPointDataWithEditableStyling()
+ public void CreateTrafficLoadOutsideChartData_ReturnsChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData();
// Assert
Assert.IsFalse(data.HasData);
Assert.AreEqual("Verkeersbelasting kant buitenwaarts", data.Name);
- AssertEqualStyle(data.Style, Color.DarkSlateGray, 8, Color.White, 1, ChartPointSymbol.Circle, true);
+ AssertEqualStyle(data.Style, Color.DarkSlateGray, 8, Color.White, 1, ChartPointSymbol.Circle);
}
[Test]
@@ -133,7 +133,7 @@
[TestCase("A", 0)]
[TestCase("B", 3)]
[TestCase("Random", 5)]
- public void CreateSoilLayerChartData_ValidSoilProfileAndSoilLayerIndex_ReturnsEmptyChartDataCollectionWithDefaultStyling(string name, int soilLayerIndex)
+ public void CreateSoilLayerChartData_ValidSoilProfileAndSoilLayerIndex_ReturnsEmptyChartDataCollectionWithExpectedStyling(string name, int soilLayerIndex)
{
var surfaceLine = new MacroStabilityInwardsSurfaceLine();
surfaceLine.SetGeometry(new[]
@@ -164,7 +164,7 @@
// Assert
CollectionAssert.IsEmpty(data.Areas);
Assert.AreEqual($"{soilLayerIndex + 1} {name}", data.Name);
- AssertEqualStyle(data.Style, Color.Aquamarine, Color.Black, 1, false);
+ AssertEqualStyle(data.Style, Color.Aquamarine, Color.Black, 1);
}
[Test]
@@ -249,23 +249,22 @@
Assert.AreEqual("soilLayerIndex", paramName);
}
- private static void AssertEqualStyle(ChartPointStyle pointStyle, Color fillColor, int size,
- Color strokeColor, int strokeThickness, ChartPointSymbol symbol, bool isEditable)
+ private static void AssertEqualStyle(ChartPointStyle pointStyle, Color fillColor, int size, Color strokeColor, int strokeThickness, ChartPointSymbol symbol)
{
Assert.AreEqual(fillColor, pointStyle.Color);
Assert.AreEqual(size, pointStyle.Size);
Assert.AreEqual(strokeColor, pointStyle.StrokeColor);
Assert.AreEqual(strokeThickness, pointStyle.StrokeThickness);
Assert.AreEqual(symbol, pointStyle.Symbol);
- Assert.AreEqual(isEditable, pointStyle.IsEditable);
+ Assert.IsTrue(pointStyle.IsEditable);
}
- private static void AssertEqualStyle(ChartAreaStyle areaStyle, Color fillColor, Color strokeColor, int width, bool isEditable)
+ private static void AssertEqualStyle(ChartAreaStyle areaStyle, Color fillColor, Color strokeColor, int width)
{
Assert.AreEqual(fillColor, areaStyle.FillColor);
Assert.AreEqual(strokeColor, areaStyle.StrokeColor);
Assert.AreEqual(width, areaStyle.StrokeThickness);
- Assert.AreEqual(isEditable, areaStyle.IsEditable);
+ Assert.IsFalse(areaStyle.IsEditable);
}
}
}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -35,27 +35,27 @@
public class PipingChartDataFactoryTest
{
[Test]
- public void CreateEntryPointChartData_ReturnsEmptyChartPointDataWithEditableStyling()
+ public void CreateEntryPointChartData_ReturnsEmptyChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = PipingChartDataFactory.CreateEntryPointChartData();
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Intredepunt", data.Name);
- AssertEqualStyle(data.Style, Color.Gold, 8, Color.Transparent, 0, ChartPointSymbol.Triangle, true);
+ AssertEqualStyle(data.Style, Color.Gold, 8, Color.Transparent, 0, ChartPointSymbol.Triangle);
}
[Test]
- public void CreateExitPointChartData_ReturnsEmptyChartPointDataWithEditableStyling()
+ public void CreateExitPointChartData_ReturnsEmptyChartPointDataWithExpectedStyling()
{
// Call
ChartPointData data = PipingChartDataFactory.CreateExitPointChartData();
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Uittredepunt", data.Name);
- AssertEqualStyle(data.Style, Color.Tomato, 8, Color.Transparent, 0, ChartPointSymbol.Triangle, true);
+ AssertEqualStyle(data.Style, Color.Tomato, 8, Color.Transparent, 0, ChartPointSymbol.Triangle);
}
[Test]
@@ -73,7 +73,7 @@
[TestCase("A", 0)]
[TestCase("B", 3)]
[TestCase("Random", 5)]
- public void CreateSoilLayerChartData_ValidSoilProfileAndSoilLayerIndex_ReturnsEmptyChartDataCollectionWithDefaultStyling(string name, int soilLayerIndex)
+ public void CreateSoilLayerChartData_ValidSoilProfileAndSoilLayerIndex_ReturnsEmptyChartDataCollectionWithExpectedStyling(string name, int soilLayerIndex)
{
var surfaceLine = new PipingSurfaceLine();
surfaceLine.SetGeometry(new[]
@@ -101,7 +101,7 @@
// Assert
CollectionAssert.IsEmpty(data.Areas);
Assert.AreEqual($"{soilLayerIndex + 1} {name}", data.Name);
- AssertEqualStyle(data.Style, Color.Aquamarine, Color.Black, 1, false);
+ AssertEqualStyle(data.Style, Color.Aquamarine, Color.Black, 1);
}
[Test]
@@ -186,22 +186,22 @@
Assert.AreEqual("soilLayerIndex", paramName);
}
- private static void AssertEqualStyle(ChartPointStyle pointStyle, Color color, int size, Color strokeColor, int strokeThickness, ChartPointSymbol symbol, bool isEditable)
+ private static void AssertEqualStyle(ChartPointStyle pointStyle, Color color, int size, Color strokeColor, int strokeThickness, ChartPointSymbol symbol)
{
Assert.AreEqual(color, pointStyle.Color);
Assert.AreEqual(size, pointStyle.Size);
Assert.AreEqual(strokeColor, pointStyle.StrokeColor);
Assert.AreEqual(strokeThickness, pointStyle.StrokeThickness);
Assert.AreEqual(symbol, pointStyle.Symbol);
- Assert.AreEqual(isEditable, pointStyle.IsEditable);
+ Assert.IsTrue(pointStyle.IsEditable);
}
- private static void AssertEqualStyle(ChartAreaStyle areaStyle, Color fillColor, Color strokeColor, int width, bool isEditable)
+ private static void AssertEqualStyle(ChartAreaStyle areaStyle, Color fillColor, Color strokeColor, int width)
{
Assert.AreEqual(fillColor, areaStyle.FillColor);
Assert.AreEqual(strokeColor, areaStyle.StrokeColor);
Assert.AreEqual(width, areaStyle.StrokeThickness);
- Assert.AreEqual(isEditable, areaStyle.IsEditable);
+ Assert.IsFalse(areaStyle.IsEditable);
}
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs
===================================================================
diff -u -r3c63884513338c4730c05ae9634f23bfe48293aa -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision 3c63884513338c4730c05ae9634f23bfe48293aa)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788)
@@ -34,7 +34,7 @@
public class WaveConditionsChartDataFactoryTest
{
[Test]
- public void CreateLowerRevetmentBoundaryChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateLowerRevetmentBoundaryChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Setup
Color lineColor = Color.Gray;
@@ -45,11 +45,11 @@
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Ondergrens bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 3, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, lineColor, 3, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateUpperRevetmentBoundaryChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateUpperRevetmentBoundaryChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Setup
Color lineColor = Color.Gray;
@@ -60,11 +60,11 @@
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Bovengrens bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 3, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, lineColor, 3, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateRevetmentChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateRevetmentChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Setup
Color lineColor = Color.Gray;
@@ -75,11 +75,11 @@
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 8, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, lineColor, 8, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateRevetmentBaseChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateRevetmentBaseChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Setup
Color lineColor = Color.FromArgb(120, Color.Gray);
@@ -90,31 +90,31 @@
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Hulplijn bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 8, ChartLineDashStyle.Dash, true);
+ AssertEqualStyle(data.Style, lineColor, 8, ChartLineDashStyle.Dash);
}
[Test]
- public void CreateLowerWaterLevelsBoundaryChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateLowerWaterLevelsBoundaryChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Call
ChartLineData data = WaveConditionsChartDataFactory.CreateLowerWaterLevelsBoundaryChartData();
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Ondergrens waterstanden", data.Name);
- AssertEqualStyle(data.Style, Color.MediumBlue, 3, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, Color.MediumBlue, 3, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateUpperWaterLevelsBoundaryChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateUpperWaterLevelsBoundaryChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Call
ChartLineData data = WaveConditionsChartDataFactory.CreateUpperWaterLevelsBoundaryChartData();
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual("Bovengrens waterstanden", data.Name);
- AssertEqualStyle(data.Style, Color.MediumBlue, 3, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, Color.MediumBlue, 3, ChartLineDashStyle.Solid);
}
[Test]
@@ -129,7 +129,7 @@
}
[Test]
- public void CreateDesignWaterLevelChartData_ReturnsEmptyChartLineDataWithEditableStyling()
+ public void CreateDesignWaterLevelChartData_ReturnsEmptyChartLineDataWithExpectedStyling()
{
// Setup
const string designWaterLevelName = "Toetspeil";
@@ -140,19 +140,19 @@
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual(designWaterLevelName, data.Name);
- AssertEqualStyle(data.Style, Color.LightCoral, 3, ChartLineDashStyle.Solid, true);
+ AssertEqualStyle(data.Style, Color.LightCoral, 3, ChartLineDashStyle.Solid);
}
[Test]
- public void CreateWaterLevelsChartData_ReturnsEmptyChartMultipleLineDataWithEditableStyling()
+ public void CreateWaterLevelsChartData_ReturnsEmptyChartMultipleLineDataWithExpectedStyling()
{
// Call
ChartMultipleLineData data = WaveConditionsChartDataFactory.CreateWaterLevelsChartData();
// Assert
CollectionAssert.IsEmpty(data.Lines);
Assert.AreEqual("Waterstanden in berekening", data.Name);
- AssertEqualStyle(data.Style, Color.DarkTurquoise, 3, ChartLineDashStyle.DashDotDot, true);
+ AssertEqualStyle(data.Style, Color.DarkTurquoise, 3, ChartLineDashStyle.DashDotDot);
}
[Test]
@@ -222,12 +222,12 @@
Assert.AreEqual(expectedName, chartData.Name);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style, bool isEditable)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Assert.AreEqual(style, lineStyle.DashStyle);
- Assert.AreEqual(isEditable, lineStyle.IsEditable);
+ Assert.IsTrue(lineStyle.IsEditable);
}
}
}
\ No newline at end of file