Index: Core/Components/src/Core.Components.Stack/Data/StackChartData.cs =================================================================== diff -u -raae43c0b641b260c83bf10c9ef90c948b339d312 -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/src/Core.Components.Stack/Data/StackChartData.cs (.../StackChartData.cs) (revision aae43c0b641b260c83bf10c9ef90c948b339d312) +++ Core/Components/src/Core.Components.Stack/Data/StackChartData.cs (.../StackChartData.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -114,7 +114,7 @@ if (values.Count() != columns.Count) { - throw new ArgumentException("The number of value items must be the same as the number of columns."); + throw new ArgumentException("The number of value items must be the same as the number of columns.", nameof(values)); } rows.Add(new RowChartData(name, values, color)); Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/CategoryPlotViewTest.cs =================================================================== diff -u -r5546276dfbf78b807ade6ffcb6d1e4cbd48f0310 -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/CategoryPlotViewTest.cs (.../CategoryPlotViewTest.cs) (revision 5546276dfbf78b807ade6ffcb6d1e4cbd48f0310) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/CategoryPlotViewTest.cs (.../CategoryPlotViewTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -51,8 +51,16 @@ Assert.AreEqual(1, categoryAxis.MinorStep); Assert.AreEqual(45, categoryAxis.Angle); - Assert.IsInstanceOf(axes[1]); - + Assert.AreEqual(-0.5, categoryAxis.AbsoluteMinimum); + Assert.IsFalse(categoryAxis.IsPanEnabled); + Assert.IsFalse(categoryAxis.IsZoomEnabled); + + LinearAxis linearAxis = axes.OfType().First(); + + Assert.AreEqual(0, linearAxis.MinimumPadding); + Assert.IsFalse(linearAxis.IsPanEnabled); + Assert.IsFalse(linearAxis.IsZoomEnabled); + Assert.AreEqual(0, plotModel.LegendBorderThickness); Assert.AreEqual(LegendOrientation.Horizontal, plotModel.LegendOrientation); Assert.AreEqual(LegendPlacement.Outside, plotModel.LegendPlacement); @@ -61,8 +69,9 @@ [Test] [TestCase("Title")] - [TestCase("Test")] - [TestCase("Label")] + [TestCase("")] + [TestCase(null)] + [TestCase(" ")] public void ModelTitle_Always_SetsNewTitleToModelAndInvalidatesView(string newTitle) { // Setup Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs =================================================================== diff -u -ra00ec37d1f04b52faca7beb43029b94bf801187b -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs (.../ChartControlTest.cs) (revision a00ec37d1f04b52faca7beb43029b94bf801187b) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs (.../ChartControlTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -54,7 +54,7 @@ Assert.IsTrue(chart.IsPanningEnabled); Assert.IsFalse(chart.IsRectangleZoomingEnabled); - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); Assert.AreEqual(Color.White, plotView.BackColor); Assert.IsFalse(plotView.Model.IsLegendVisible); } @@ -66,7 +66,7 @@ // Given using (var chart = new ChartControl()) { - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); var chartPointData = new ChartPointData("Points"); var chartLineData = new ChartLineData("Lines"); var chartAreaData = new ChartAreaData("Areas"); @@ -98,7 +98,7 @@ // Given using (var chart = new ChartControl()) { - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); var chartPointData = new ChartPointData("Points"); var chartLineData = new ChartLineData("Lines"); var chartAreaData = new ChartAreaData("Areas"); @@ -131,7 +131,7 @@ // Given using (var chart = new ChartControl()) { - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); var chartPointData = new ChartPointData("Points"); var chartLineData = new ChartLineData("Lines"); var chartAreaData = new ChartAreaData("Areas"); @@ -164,7 +164,7 @@ // Given using (var chart = new ChartControl()) { - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); var chartPointData = new ChartPointData("Points"); var chartLineData = new ChartLineData("Lines"); var chartAreaData = new ChartAreaData("Areas"); @@ -204,7 +204,7 @@ // Given using (var chart = new ChartControl()) { - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); var chartPointData = new ChartPointData("Points"); var chartLineData = new ChartLineData("Lines"); var chartAreaData = new ChartAreaData("Areas"); @@ -246,7 +246,7 @@ // Given using (var chart = new ChartControl()) { - LinearPlotView plotView = chart.Controls.OfType().First(); + LinearPlotView plotView = chart.Controls.OfType().Single(); var chartPointData = new ChartPointData("Points"); var chartLineData = new ChartLineData("Lines"); var chartAreaData = new ChartAreaData("Areas"); @@ -326,15 +326,16 @@ [Test] [TestCase("Title")] - [TestCase("Test")] - [TestCase("Label")] + [TestCase(null)] + [TestCase("")] + [TestCase(" ")] public void BottomAxisTitle_Always_SetsNewTitleToBottomAxis(string newTitle) { // Setup using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -361,7 +362,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -388,7 +389,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -422,7 +423,7 @@ } }; var collection = new ChartDataCollection("collection"); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); var invalidated = 0; collection.Add(testData); @@ -455,7 +456,7 @@ var chart = new ChartControl(); var testData = new ChartLineData("test data"); var collection = new ChartDataCollection("collection"); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); var invalidated = 0; collection.Add(testData); @@ -486,7 +487,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -547,7 +548,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -608,7 +609,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -646,7 +647,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -691,7 +692,7 @@ using (var form = new Form()) { var chart = new ChartControl(); - LinearPlotView view = chart.Controls.OfType().First(); + LinearPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs =================================================================== diff -u -r03b624caf889c8ad42738b3b8926b47306be0990 -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs (.../StackChartControlTest.cs) (revision 03b624caf889c8ad42738b3b8926b47306be0990) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs (.../StackChartControlTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -47,7 +47,7 @@ Assert.IsNull(chart.Data); - CategoryPlotView plotView = chart.Controls.OfType().First(); + CategoryPlotView plotView = chart.Controls.OfType().Single(); Assert.AreEqual(Color.White, plotView.BackColor); Assert.IsTrue(plotView.Model.IsLegendVisible); } @@ -76,8 +76,9 @@ chart.Data = data; // Then - CategoryPlotView plotView = chart.Controls.OfType().First(); - AssertSeriesAndColumns(plotView); + CategoryPlotView plotView = chart.Controls.OfType().Single(); + AssertColumns(data.Columns.ToList(), plotView); + AssertSeries(data.Rows.Select(r => r.Name).ToList(), plotView); } } @@ -104,8 +105,9 @@ chart.Data = data; // Precondition - CategoryPlotView plotView = chart.Controls.OfType().First(); - AssertSeriesAndColumns(plotView); + CategoryPlotView plotView = chart.Controls.OfType().Single(); + AssertColumns(data.Columns.ToList(), plotView); + AssertSeries(data.Rows.Select(r => r.Name).ToList(), plotView); // When var newData = new StackChartData(); @@ -129,11 +131,14 @@ Assert.AreEqual("Row 3", series[0].Title); Assert.AreEqual("Row 4", series[1].Title); - CategoryAxis axis = plotView.Model.Axes.OfType().First(); + CategoryAxis axis = plotView.Model.Axes.OfType().Single(); Assert.AreEqual(2, axis.Labels.Count); Assert.AreEqual("Column 3", axis.Labels[0]); Assert.AreEqual("Column 4", axis.Labels[1]); + + AssertColumns(newData.Columns.ToList(), plotView); + AssertSeries(newData.Rows.Select(r => r.Name).ToList(), plotView); } } @@ -160,8 +165,9 @@ chart.Data = data; // Precondition - CategoryPlotView plotView = chart.Controls.OfType().First(); - AssertSeriesAndColumns(plotView); + CategoryPlotView plotView = chart.Controls.OfType().Single(); + AssertColumns(data.Columns.ToList(), plotView); + AssertSeries(data.Rows.Select(r => r.Name).ToList(), plotView); // When chart.Data = null; @@ -170,7 +176,7 @@ ElementCollection series = plotView.Model.Series; CollectionAssert.IsEmpty(series); - CategoryAxis axis = plotView.Model.Axes.OfType().First(); + CategoryAxis axis = plotView.Model.Axes.OfType().Single(); CollectionAssert.IsEmpty(axis.Labels); } @@ -198,8 +204,9 @@ chart.Data = data; - CategoryPlotView plotView = chart.Controls.OfType().First(); - AssertSeriesAndColumns(plotView); + CategoryPlotView plotView = chart.Controls.OfType().Single(); + AssertColumns(data.Columns.ToList(), plotView); + AssertSeries(data.Rows.Select(r => r.Name).ToList(), plotView); // When data.Clear(); @@ -223,7 +230,7 @@ Assert.AreEqual("New row 1", series[0].Title); Assert.AreEqual("New row 2", series[1].Title); - CategoryAxis axis = plotView.Model.Axes.OfType().First(); + CategoryAxis axis = plotView.Model.Axes.OfType().Single(); Assert.AreEqual(2, axis.Labels.Count); Assert.AreEqual("New column 1", axis.Labels[0]); @@ -233,15 +240,16 @@ [Test] [TestCase("Title")] - [TestCase("Test")] - [TestCase("Label")] + [TestCase(null)] + [TestCase("")] + [TestCase(" ")] public void SetChartTitle_Always_SetsNewTitleToModelAndViewInvalidated(string newTitle) { // Setup using (var form = new Form()) { var chart = new StackChartControl(); - CategoryPlotView view = chart.Controls.OfType().First(); + CategoryPlotView view = chart.Controls.OfType().Single(); form.Controls.Add(chart); form.Show(); @@ -258,18 +266,26 @@ } } - private static void AssertSeriesAndColumns(CategoryPlotView plotView) + private static void AssertSeries(IList expectedSeriesTitles, CategoryPlotView plotView) { ElementCollection series = plotView.Model.Series; - Assert.AreEqual(2, series.Count); - Assert.AreEqual("Row 1", series[0].Title); - Assert.AreEqual("Row 2", series[1].Title); + Assert.AreEqual(expectedSeriesTitles.Count(), series.Count); + for (var i = 0; i < expectedSeriesTitles.Count; i++) + { + Assert.AreEqual(expectedSeriesTitles[i], series[i].Title); + } + } + + private static void AssertColumns(IList expectedColumnTitles, CategoryPlotView plotView) + { CategoryAxis axis = plotView.Model.Axes.OfType().First(); + Assert.AreEqual(expectedColumnTitles.Count, axis.Labels.Count); - Assert.AreEqual(2, axis.Labels.Count); - Assert.AreEqual("Column 1", axis.Labels[0]); - Assert.AreEqual("Column 2", axis.Labels[1]); + for (var i = 0; i < expectedColumnTitles.Count; i++) + { + Assert.AreEqual(expectedColumnTitles[i], axis.Labels[i]); + } } } } \ No newline at end of file Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/Stack/RowChartDataConverterTest.cs =================================================================== diff -u -rad5276a3de54e0a3b0eac0ef112932f12893bb1d -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/Stack/RowChartDataConverterTest.cs (.../RowChartDataConverterTest.cs) (revision ad5276a3de54e0a3b0eac0ef112932f12893bb1d) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/Stack/RowChartDataConverterTest.cs (.../RowChartDataConverterTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Drawing; using System.Linq; using Core.Common.TestUtil; @@ -43,28 +42,30 @@ // Assert const string expectedMessage = "Null data cannot be converted into series data."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual("data", exception.ParamName); } [Test] public void ConvertSeriesData_SeriesNull_ThrowsArgumentNullException() { // Setup - var rowData = new RowChartData("data", new List(), null); + var rowData = new RowChartData("data", new double[0], null); // Call TestDelegate test = () => RowChartDataConverter.ConvertSeriesData(rowData, null); // Assert const string expectedMessage = "Null data cannot be used as conversion target."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual("series", exception.ParamName); } [Test] public void ConvertSeriesData_DataWithValues_ColumnItemsAddedToSeries() { // Setup - var values = new List + var values = new[] { 0.2, 0.7, @@ -89,21 +90,23 @@ // Assert const string expectedMessage = "Null data cannot be converted into series data."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual("data", exception.ParamName); } [Test] public void ConvertSeriesProperties_SeriesNull_ThrowsArgumentNullException() { // Setup - var rowData = new RowChartData("data", new List(), null); + var rowData = new RowChartData("data", new double[0], null); // Call TestDelegate test = () => RowChartDataConverter.ConvertSeriesProperties(rowData, null); // Assert const string expectedMessage = "Null data cannot be used as conversion target."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual("series", exception.ParamName); } [Test] @@ -117,7 +120,7 @@ ? (Color?) Color.Red : null; - var rowData = new RowChartData(name, new List(), color); + var rowData = new RowChartData(name, new double[0], color); var series = new ColumnSeries(); // Call Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Stack/RowChartDataSeriesTest.cs =================================================================== diff -u -r913c61b285d09c32728540f4380296ea6a5d08be -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Stack/RowChartDataSeriesTest.cs (.../RowChartDataSeriesTest.cs) (revision 913c61b285d09c32728540f4380296ea6a5d08be) +++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Stack/RowChartDataSeriesTest.cs (.../RowChartDataSeriesTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -49,6 +49,7 @@ public void Constructor_ExpectedValues() { // Setup + const string name = "data"; Color color = Color.Blue; var values = new List { @@ -58,10 +59,11 @@ }; // Call - var series = new RowChartDataSeries(new RowChartData("data", values, color)); + var series = new RowChartDataSeries(new RowChartData(name, values, color)); // Assert Assert.IsInstanceOf(series); + Assert.AreEqual(name, series.Title); Assert.IsTrue(series.IsStacked); Assert.AreEqual(1, series.StrokeThickness); Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), series.FillColor); Index: Core/Components/test/Core.Components.Stack.Test/Data/RowChartDataTest.cs =================================================================== diff -u -rf84603903b35f1b130fc86de39dbb8fb8120ac05 -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.Stack.Test/Data/RowChartDataTest.cs (.../RowChartDataTest.cs) (revision f84603903b35f1b130fc86de39dbb8fb8120ac05) +++ Core/Components/test/Core.Components.Stack.Test/Data/RowChartDataTest.cs (.../RowChartDataTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -34,7 +34,7 @@ public void Constructor_NameNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new RowChartData(null, new List(), Color.White); + TestDelegate test = () => new RowChartData(null, new double[0], Color.White); // Assert var exception = Assert.Throws(test); Index: Core/Components/test/Core.Components.Stack.Test/Data/StackChartDataTest.cs =================================================================== diff -u -raae43c0b641b260c83bf10c9ef90c948b339d312 -r9aede2609645a62e929611bb651c2624258f6a6c --- Core/Components/test/Core.Components.Stack.Test/Data/StackChartDataTest.cs (.../StackChartDataTest.cs) (revision aae43c0b641b260c83bf10c9ef90c948b339d312) +++ Core/Components/test/Core.Components.Stack.Test/Data/StackChartDataTest.cs (.../StackChartDataTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -140,7 +140,8 @@ // Assert const string message = "The number of value items must be the same as the number of columns."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + Assert.AreEqual("values", exception.ParamName); } [Test] Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs =================================================================== diff -u -rd98bbe7db9b448a0a61954330f80b1196b2ac760 -r9aede2609645a62e929611bb651c2624258f6a6c --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs (.../RingtoetsDemoProjectRibbonTest.cs) (revision d98bbe7db9b448a0a61954330f80b1196b2ac760) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs (.../RingtoetsDemoProjectRibbonTest.cs) (revision 9aede2609645a62e929611bb651c2624258f6a6c) @@ -104,7 +104,6 @@ mocks.VerifyAll(); } - [Test] [Apartment(ApartmentState.STA)] public void OpenStackChartViewButton_OnClick_ExecutesOpenStackChartViewCommand()