Index: Core/Common/test/Core.Common.Utils.Test/Extensions/EnumerableExtensionsTest.cs =================================================================== diff -u -ra163c5f082694baf5cd491ea36baf6fb040fe868 -rda57945a7b1346cbd6cedb57477e4329d75b02c8 --- Core/Common/test/Core.Common.Utils.Test/Extensions/EnumerableExtensionsTest.cs (.../EnumerableExtensionsTest.cs) (revision a163c5f082694baf5cd491ea36baf6fb040fe868) +++ Core/Common/test/Core.Common.Utils.Test/Extensions/EnumerableExtensionsTest.cs (.../EnumerableExtensionsTest.cs) (revision da57945a7b1346cbd6cedb57477e4329d75b02c8) @@ -172,11 +172,27 @@ } [Test] - public void HasMultipleUniqueValues_WithUniqueItems_ReturnsFalse() + public void HasMultipleUniqueValues_WithSingleUniqueItem_ReturnsFalse() { // Setup var items = new List { + 1 + }; + + // Call + bool hasNonDistinct = items.HasMultipleUniqueValues(t => t); + + // Assert + Assert.IsFalse(hasNonDistinct); + } + + [Test] + public void HasMultipleUniqueValues_WithMultipleItemsOneUnique_ReturnsFalse() + { + // Setup + var items = new List + { 1, 1, 1 @@ -197,6 +213,7 @@ { 1, 2, + 2, 3 }; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs =================================================================== diff -u -rf288f9ccb9ac465f017170a59279909d8431fdc7 -rda57945a7b1346cbd6cedb57477e4329d75b02c8 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs (.../RingtoetsStackChartDataFactoryTest.cs) (revision f288f9ccb9ac465f017170a59279909d8431fdc7) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs (.../RingtoetsStackChartDataFactoryTest.cs) (revision da57945a7b1346cbd6cedb57477e4329d75b02c8) @@ -79,7 +79,7 @@ var beta = (RoundedDouble) 3.14; var controlItems = new[] { - new IllustrationPointControlItem(new TestTopLevelIllustrationPoint(), + new IllustrationPointControlItem(new TestTopLevelIllustrationPoint(), "WindDirectionName1", closingSituation, Enumerable.Empty(), @@ -108,12 +108,37 @@ } [Test] + public void CreateColumns_SingleClosingSituationsSingleIllustrationPoint_ColumnsAddedToStackChartData() + { + // Setup + var stackChartData = new StackChartData(); + + const string closingSituation = "Regular"; + var beta = (RoundedDouble) 3.14; + var controlItems = new[] + { + new IllustrationPointControlItem(new TestTopLevelIllustrationPoint(), + "WindDirectionName1", + closingSituation, + Enumerable.Empty(), + beta) + }; + + // Call + RingtoetsStackChartDataFactory.CreateColumns(controlItems, stackChartData); + + // Assert + string[] columns = stackChartData.Columns.ToArray(); + Assert.AreEqual(1, columns.Length); + Assert.AreEqual(controlItems[0].WindDirectionName, columns[0]); + } + + [Test] public void CreateColumns_DifferentClosingSituations_ColumnsAddedToStackChartData() { // Setup const string closingSituationRegular = "Regular"; const string closingSituationClosed = "Closed"; - const string closingSituationOpen = "Open"; var beta = (RoundedDouble) 3.14; var stackChartData = new StackChartData(); @@ -131,7 +156,7 @@ beta), new IllustrationPointControlItem(new TestTopLevelIllustrationPoint(), "WindDirection 3", - closingSituationOpen, + closingSituationClosed, Enumerable.Empty(), beta) }; @@ -144,7 +169,7 @@ Assert.AreEqual(3, columns.Length); Assert.AreEqual($"{controlItems[0].WindDirectionName} ({closingSituationRegular})", columns[0]); Assert.AreEqual($"{controlItems[1].WindDirectionName} ({closingSituationClosed})", columns[1]); - Assert.AreEqual($"{controlItems[2].WindDirectionName} ({closingSituationOpen})", columns[2]); + Assert.AreEqual($"{controlItems[2].WindDirectionName} ({closingSituationClosed})", columns[2]); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs =================================================================== diff -u -r566265eddf560e1a0cde3805907760745cb4b830 -rda57945a7b1346cbd6cedb57477e4329d75b02c8 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs (.../IllustrationPointsTableControlTest.cs) (revision 566265eddf560e1a0cde3805907760745cb4b830) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs (.../IllustrationPointsTableControlTest.cs) (revision da57945a7b1346cbd6cedb57477e4329d75b02c8) @@ -112,7 +112,7 @@ DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "DataGridView"); DataGridViewRowCollection rows = dataGridView.Rows; - Assert.AreEqual(2, rows.Count); + Assert.AreEqual(3, rows.Count); DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); @@ -128,6 +128,13 @@ Assert.AreEqual("1/4", cells[calculatedProbabilityColumnIndex].FormattedValue); Assert.AreEqual("0,70000", cells[calculatedReliabilityColumnIndex].FormattedValue); + cells = rows[2].Cells; + Assert.AreEqual(4, cells.Count); + Assert.AreEqual("NE", cells[windDirectionColumnIndex].FormattedValue); + Assert.AreEqual("Open", cells[closingScenarioColumnIndex].FormattedValue); + Assert.AreEqual("1/5", cells[calculatedProbabilityColumnIndex].FormattedValue); + Assert.AreEqual("0,80000", cells[calculatedReliabilityColumnIndex].FormattedValue); + Assert.IsTrue(dataGridView.Columns[closingScenarioColumnIndex].Visible); } @@ -189,7 +196,7 @@ DataGridViewRowCollection rows = dataGridView.Rows; // Precondition - Assert.AreEqual(2, rows.Count); + Assert.AreEqual(3, rows.Count); // Call control.Data = null; @@ -296,7 +303,12 @@ "SSE", "Open", Enumerable.Empty(), - new RoundedDouble(5, 0.7)) + new RoundedDouble(5, 0.7)), + new IllustrationPointControlItem(new TestTopLevelIllustrationPoint(), + "NE", + "Open", + Enumerable.Empty(), + new RoundedDouble(5, 0.8)) }; } }