Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs =================================================================== diff -u -r36d31be7cd357f771712dce5d134e0aba478042a -r5e1e129f9a4e57a1255b5b1a70a34df434434327 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs (.../ClosingStructurePermutationHelperTest.cs) (revision 36d31be7cd357f771712dce5d134e0aba478042a) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs (.../ClosingStructurePermutationHelperTest.cs) (revision 5e1e129f9a4e57a1255b5b1a70a34df434434327) @@ -39,21 +39,22 @@ List testCaseDatas = ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameId("A", "B").ToList(); // Assert - Assert.AreEqual(16, testCaseDatas.Count); + Assert.AreEqual(17, testCaseDatas.Count); IEnumerable testNames = testCaseDatas .Select(tcd => tcd.TestName) .ToList(); - Assert.AreEqual(16, testNames.Distinct().Count()); + Assert.AreEqual(17, testNames.Distinct().Count()); Assert.IsTrue(testNames.All(tn => tn.StartsWith("A_"))); Assert.IsTrue(testNames.All(tn => tn.EndsWith("_B"))); IEnumerable structures = testCaseDatas .Select(tcd => tcd.Arguments[0]) .OfType() .ToList(); - Assert.AreEqual(16, structures.Count()); + Assert.AreEqual(17, structures.Count()); Assert.IsTrue(structures.All(s => s.Id == structures.First().Id)); differentStructures.Add(structures.Single(s => !s.Name.Equals(referenceStructure.Name))); differentStructures.Add(structures.Single(s => !s.Location.Equals(referenceStructure.Location))); + differentStructures.Add(structures.Single(s => !s.AllowedLevelIncreaseStorage.Equals(referenceStructure.AllowedLevelIncreaseStorage))); differentStructures.Add(structures.Single(s => !s.AreaFlowApertures.Equals(referenceStructure.AreaFlowApertures))); differentStructures.Add(structures.Single(s => !s.CriticalOvertoppingDischarge.Equals(referenceStructure.CriticalOvertoppingDischarge))); differentStructures.Add(structures.Single(s => !s.FlowWidthAtBottomProtection.Equals(referenceStructure.FlowWidthAtBottomProtection))); @@ -68,7 +69,7 @@ differentStructures.Add(structures.Single(s => !s.InflowModelType.Equals(referenceStructure.InflowModelType))); differentStructures.Add(structures.Single(s => !s.ProbabilityOrFrequencyOpenStructureBeforeFlooding.Equals(referenceStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding))); differentStructures.Add(structures.Single(s => !s.StructureNormalOrientation.Equals(referenceStructure.StructureNormalOrientation))); - Assert.AreEqual(16, differentStructures.Distinct().Count()); + Assert.AreEqual(17, differentStructures.Distinct().Count()); } [Test] @@ -82,21 +83,22 @@ List testCaseDatas = ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameIdNameAndLocation("C", "D").ToList(); // Assert - Assert.AreEqual(14, testCaseDatas.Count); + Assert.AreEqual(15, testCaseDatas.Count); IEnumerable testNames = testCaseDatas .Select(tcd => tcd.TestName) .ToList(); - Assert.AreEqual(14, testNames.Distinct().Count()); + Assert.AreEqual(15, testNames.Distinct().Count()); Assert.IsTrue(testNames.All(tn => tn.StartsWith("C_"))); Assert.IsTrue(testNames.All(tn => tn.EndsWith("_D"))); IEnumerable structures = testCaseDatas .Select(tcd => tcd.Arguments[0]) .OfType() .ToList(); - Assert.AreEqual(14, structures.Count()); + Assert.AreEqual(15, structures.Count()); Assert.IsTrue(structures.All(s => s.Id == referenceStructure.Id)); Assert.IsTrue(structures.All(s => s.Name == referenceStructure.Name)); Assert.IsTrue(structures.All(s => s.Location.Equals(referenceStructure.Location))); + differentStructures.Add(structures.Single(s => !s.AllowedLevelIncreaseStorage.Equals(referenceStructure.AllowedLevelIncreaseStorage))); differentStructures.Add(structures.Single(s => !s.AreaFlowApertures.Equals(referenceStructure.AreaFlowApertures))); differentStructures.Add(structures.Single(s => !s.CriticalOvertoppingDischarge.Equals(referenceStructure.CriticalOvertoppingDischarge))); differentStructures.Add(structures.Single(s => !s.FlowWidthAtBottomProtection.Equals(referenceStructure.FlowWidthAtBottomProtection))); @@ -111,7 +113,7 @@ differentStructures.Add(structures.Single(s => !s.InflowModelType.Equals(referenceStructure.InflowModelType))); differentStructures.Add(structures.Single(s => !s.ProbabilityOrFrequencyOpenStructureBeforeFlooding.Equals(referenceStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding))); differentStructures.Add(structures.Single(s => !s.StructureNormalOrientation.Equals(referenceStructure.StructureNormalOrientation))); - Assert.AreEqual(14, differentStructures.Distinct().Count()); + Assert.AreEqual(15, differentStructures.Distinct().Count()); } } } \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs =================================================================== diff -u -r36d31be7cd357f771712dce5d134e0aba478042a -r5e1e129f9a4e57a1255b5b1a70a34df434434327 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision 36d31be7cd357f771712dce5d134e0aba478042a) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision 5e1e129f9a4e57a1255b5b1a70a34df434434327) @@ -89,6 +89,16 @@ yield return new TestCaseData(new TestClosingStructure { + AllowedLevelIncreaseStorage = + { + Mean = (RoundedDouble) random.Next(), + Shift = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() + } + }).SetName($"{targetName}_AllowedLevelIncreaseStorage_{testResultDescription}"); + + yield return new TestCaseData(new TestClosingStructure + { AreaFlowApertures = { Mean = (RoundedDouble) random.Next(), @@ -207,6 +217,12 @@ Name = referenceStructure.Name, Id = referenceStructure.Id, Location = referenceStructure.Location, + AllowedLevelIncreaseStorage = + { + Mean = referenceStructure.AllowedLevelIncreaseStorage.Mean, + Shift = referenceStructure.AllowedLevelIncreaseStorage.Shift, + StandardDeviation = referenceStructure.AllowedLevelIncreaseStorage.StandardDeviation + }, AreaFlowApertures = { Mean = referenceStructure.AreaFlowApertures.Mean,