Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs =================================================================== diff -u -ra90c7f22f8c5b259603c7015c1b182f3dcd11331 -r59bb55c3103574906353fbfb3ef3026f0086b6be --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision a90c7f22f8c5b259603c7015c1b182f3dcd11331) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision 59bb55c3103574906353fbfb3ef3026f0086b6be) @@ -278,7 +278,7 @@ ClosingStructure.ConstructionProperties differentInflowModelTypeConstructionProperties = CreateTestClosingStructureConstructionProperties(); - differentInflowModelTypeConstructionProperties.InflowModelType = random.NextEnumValue(); + differentInflowModelTypeConstructionProperties.InflowModelType = ClosingStructureInflowModelType.LowSill; yield return new TestCaseData(new ClosingStructure(differentInflowModelTypeConstructionProperties)) .SetName($"{targetName}_DifferentInflowModelType_{testResultDescription}"); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/StabilityPointStructurePermutationHelperTest.cs =================================================================== diff -u -r1e5300a95a25677488384a87ac159288529f3751 -r59bb55c3103574906353fbfb3ef3026f0086b6be --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/StabilityPointStructurePermutationHelperTest.cs (.../StabilityPointStructurePermutationHelperTest.cs) (revision 1e5300a95a25677488384a87ac159288529f3751) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/StabilityPointStructurePermutationHelperTest.cs (.../StabilityPointStructurePermutationHelperTest.cs) (revision 59bb55c3103574906353fbfb3ef3026f0086b6be) @@ -39,7 +39,7 @@ List testCaseDatas = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructures(targetName, testResultDescription).ToList(); // Assert - Assert.AreEqual(47, testCaseDatas.Count); + Assert.AreEqual(46, testCaseDatas.Count); AssertTestNames(testCaseDatas, targetName, testResultDescription); AssertParameters(testCaseDatas, true, true, true); } @@ -55,7 +55,7 @@ List testCaseDatas = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructuresWithSameId(targetName, testResultDescription).ToList(); // Assert - Assert.AreEqual(46, testCaseDatas.Count); + Assert.AreEqual(45, testCaseDatas.Count); AssertTestNames(testCaseDatas, targetName, testResultDescription); AssertParameters(testCaseDatas, false, true, true); } @@ -71,7 +71,7 @@ List testCaseDatas = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructuresWithSameIdNameAndLocation(targetName, testResultDescription).ToList(); // Assert - Assert.AreEqual(44, testCaseDatas.Count); + Assert.AreEqual(43, testCaseDatas.Count); AssertTestNames(testCaseDatas, targetName, testResultDescription); AssertParameters(testCaseDatas, false, false, false); } @@ -161,7 +161,6 @@ differentStructures.Add(structures.Single(s => !s.LevellingCount.Equals(referenceStructure.LevellingCount))); differentStructures.Add(structures.Single(s => !s.ProbabilityCollisionSecondaryStructure.Equals(referenceStructure.ProbabilityCollisionSecondaryStructure))); differentStructures.Add(structures.Single(s => !s.FlowVelocityStructureClosable.Mean.Equals(referenceStructure.FlowVelocityStructureClosable.Mean))); - differentStructures.Add(structures.Single(s => !s.FlowVelocityStructureClosable.CoefficientOfVariation.Equals(referenceStructure.FlowVelocityStructureClosable.CoefficientOfVariation))); differentStructures.Add(structures.Single(s => !s.StabilityLinearLoadModel.Mean.Equals(referenceStructure.StabilityLinearLoadModel.Mean))); differentStructures.Add(structures.Single(s => !s.StabilityLinearLoadModel.CoefficientOfVariation.Equals(referenceStructure.StabilityLinearLoadModel.CoefficientOfVariation))); differentStructures.Add(structures.Single(s => !s.StabilityQuadraticLoadModel.Mean.Equals(referenceStructure.StabilityQuadraticLoadModel.Mean))); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs =================================================================== diff -u -r04d81d1eb0414f621c706d8541804f6434e6c3d2 -r59bb55c3103574906353fbfb3ef3026f0086b6be --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs (.../StabilityPointStructurePermutationHelper.cs) (revision 04d81d1eb0414f621c706d8541804f6434e6c3d2) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs (.../StabilityPointStructurePermutationHelper.cs) (revision 59bb55c3103574906353fbfb3ef3026f0086b6be) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -394,14 +395,6 @@ yield return new TestCaseData(new TestStabilityPointStructure { - FlowVelocityStructureClosable = - { - CoefficientOfVariation = random.NextRoundedDouble() - } - }).SetName($"{targetName}_DifferentFlowVelocityStructureClosableCoefficientOfVariation_{testResultDescription}"); - - yield return new TestCaseData(new TestStabilityPointStructure - { StabilityLinearLoadModel = { Mean = random.NextRoundedDouble() @@ -450,7 +443,7 @@ StabilityPointStructure.ConstructionProperties differentInflowModelTypeConstructionProperties = CreateTestStabilityPointStructureConstructionProperties(); - differentInflowModelTypeConstructionProperties.InflowModelType = random.NextEnumValue(); + differentInflowModelTypeConstructionProperties.InflowModelType = StabilityPointStructureInflowModelType.LowSill; yield return new TestCaseData(new StabilityPointStructure(differentInflowModelTypeConstructionProperties)) .SetName($"{targetName}_DifferentInflowModelType_{testResultDescription}"); }