Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/StochasticSoilModelTestFactoryTest.cs =================================================================== diff -u -re0ee945d52cc611d081c9a1412e92023a63f91c9 -r73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9 --- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/StochasticSoilModelTestFactoryTest.cs (.../StochasticSoilModelTestFactoryTest.cs) (revision e0ee945d52cc611d081c9a1412e92023a63f91c9) +++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/StochasticSoilModelTestFactoryTest.cs (.../StochasticSoilModelTestFactoryTest.cs) (revision 73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9) @@ -33,7 +33,7 @@ public class StochasticSoilModelTestFactoryTest { [Test] - public void CreateStochasticSoilModelWithGeometry_WithValidParameters_ReturnsStochasticSoilModelWithGeometry() + public void CreateStochasticSoilModelWithGeometry_WithNameAndFailureMechanismTypeAndStochasticSoilProfiles_ReturnsStochasticSoilModelWithExpectedPropertiesSet() { // Setup const string soilModelName = "some name"; @@ -65,5 +65,37 @@ new Point2D(3, 4) }, model.Geometry); } + + [Test] + public void CreateStochasticSoilModelWithGeometry_WithSoilProfilesAndFailureMechanismType_ReturnsStochasticSoilModelWithExpectedPropertiesSet() + { + // Setup + var random = new Random(21); + var failureMechanismType = random.NextEnumValue(); + + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + + var stochasticSoilProfiles = new[] + { + new StochasticSoilProfile(random.NextDouble(), soilProfile) + }; + + // Call + StochasticSoilModel model = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(failureMechanismType, + stochasticSoilProfiles); + + // Assert + Assert.AreEqual("Stochastic Soil Model", model.Name); + Assert.AreEqual(failureMechanismType, model.FailureMechanismType); + CollectionAssert.AreEqual(stochasticSoilProfiles, model.StochasticSoilProfiles); + CollectionAssert.AreEqual(new[] + { + new Point2D(1, 2), + new Point2D(3, 4) + }, model.Geometry); + + } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/StochasticSoilModelTestFactory.cs =================================================================== diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -r73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9 --- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/StochasticSoilModelTestFactory.cs (.../StochasticSoilModelTestFactory.cs) (revision a20f5008f39cfa4fd6f94572fd07a011f76609f4) +++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/StochasticSoilModelTestFactory.cs (.../StochasticSoilModelTestFactory.cs) (revision 73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using Core.Common.Base.Geometry; using Ringtoets.Common.IO.SoilProfile; @@ -39,6 +40,8 @@ /// The failure mechanism type of the stochastic soil model. /// The stochastic soil profiles belonging to the soil model. /// A configured with a predefined geometry. + /// Throw when or + /// is null. public static StochasticSoilModel CreateStochasticSoilModelWithGeometry(string soilModelName, FailureMechanismType failureMechanismType, IEnumerable stochasticSoilProfiles) @@ -55,5 +58,18 @@ return model; } + + /// + /// Creates a with a predefined geometry. + /// + /// The failure mechanism type of the stochastic soil model. + /// The stochastic soil profiles belonging to the soil model. + /// A configured with a predefined geometry. + /// Throw when is null. + public static StochasticSoilModel CreateStochasticSoilModelWithGeometry(FailureMechanismType failureMechanismType, + IEnumerable stochasticSoilProfiles) + { + return CreateStochasticSoilModelWithGeometry("Stochastic Soil Model", failureMechanismType, stochasticSoilProfiles); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs =================================================================== diff -u -raf575930a392dbf1fb1d5073f3df48110af72686 -r73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs (.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs) (revision af575930a392dbf1fb1d5073f3df48110af72686) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs (.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs) (revision 73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9) @@ -103,9 +103,8 @@ public void Transform_StochasticSoilModelWithoutStochasticSoilProfiles_ThrowsImportedDataException() { // Setup - var stochasticSoilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry("name", - FailureMechanismType.Stability, - Enumerable.Empty()); + StochasticSoilModel stochasticSoilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Stability, + Enumerable.Empty()); var transformer = new MacroStabilityInwardsStochasticSoilModelTransformer(); @@ -223,17 +222,15 @@ layer }, Enumerable.Empty()); - StochasticSoilModel soilModel1 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry("some name", - FailureMechanismType.Stability, new[] - { - StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(profile) - }); + StochasticSoilModel soilModel1 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Stability, new[] + { + StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(profile) + }); - StochasticSoilModel soilModel2 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry("some name", - FailureMechanismType.Stability, new[] - { - StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(profile) - }); + StochasticSoilModel soilModel2 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Stability, new[] + { + StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(profile) + }); var transformer = new MacroStabilityInwardsStochasticSoilModelTransformer(); @@ -291,14 +288,12 @@ public void Transform_ValidStochasticSoilModelWithSameProfileInTwoStochasticSoilProfilesAndSumOfProbabilitiesInvalid_ThrowsImportedDataException(ISoilProfile soilProfile) { // Setup - const string soilModelName = "name"; var stochasticSoilProfiles = new[] { new StochasticSoilProfile(0.9, soilProfile), new StochasticSoilProfile(0.9, soilProfile) }; - StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(soilModelName, - FailureMechanismType.Stability, + StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Stability, stochasticSoilProfiles); var transformer = new MacroStabilityInwardsStochasticSoilModelTransformer(); @@ -344,7 +339,6 @@ { // Setup var random = new Random(21); - const string soilModelName = "name"; const string soilProfileName = "SoilProfile"; const double intersectionX = 1.0; @@ -363,12 +357,11 @@ }); var stochasticSoilProfile1D = new StochasticSoilProfile(random.NextDouble(), soilProfile1D); - StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(soilModelName, - FailureMechanismType.Stability, new[] - { - stochasticSoilProfile2D, - stochasticSoilProfile1D - }); + StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Stability, new[] + { + stochasticSoilProfile2D, + stochasticSoilProfile1D + }); var transformer = new MacroStabilityInwardsStochasticSoilModelTransformer(); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilModelTransformerTest.cs =================================================================== diff -u -r5e5695f9f466a0ab54a59b61879f5d7a66e6ffb1 -r73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilModelTransformerTest.cs (.../PipingStochasticSoilModelTransformerTest.cs) (revision 5e5695f9f466a0ab54a59b61879f5d7a66e6ffb1) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilModelTransformerTest.cs (.../PipingStochasticSoilModelTransformerTest.cs) (revision 73249f7fc6ef30fad46c98b2b90d69d1bbfcedf9) @@ -83,7 +83,7 @@ { // Setup var transformer = new PipingStochasticSoilModelTransformer(); - StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry("some name", FailureMechanismType.Piping, new[] + StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, new[] { StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(new TestSoilProfile()) }); @@ -145,8 +145,7 @@ public void Transform_StochasticSoilModelWithoutStochasticSoilProfiles_ThrowsImportedDataException() { // Setup - StochasticSoilModel stochasticSoilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry("name", - FailureMechanismType.Piping, + StochasticSoilModel stochasticSoilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, Enumerable.Empty()); var transformer = new PipingStochasticSoilModelTransformer(); @@ -214,7 +213,6 @@ public void Transform_ValidTwoStochasticSoilModelWithSameProfile_ReturnsExpectedPipingStochasticSoilModel() { // Setup - const string name = "name"; const double intersectionX = 1.0; SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer(); @@ -227,12 +225,12 @@ }; var transformer = new PipingStochasticSoilModelTransformer(); - StochasticSoilModel soilModel1 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(name, FailureMechanismType.Piping, new[] + StochasticSoilModel soilModel1 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, new[] { StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(profile) }); - StochasticSoilModel soilModel2 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(name, FailureMechanismType.Piping, new[] + StochasticSoilModel soilModel2 = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, new[] { StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(profile) }); @@ -299,14 +297,12 @@ [TestCaseSource(nameof(GetSupportedStochasticSoilProfilesWithInvalidProbabilities))] public void Transform_ValidStochasticSoilModelWithStochasticProfileInvalidProbability_ThrowsImportedDataException(StochasticSoilProfile profile) { - const string soilModelName = "name"; + // Setup + StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, new[] + { + profile + }); - StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(soilModelName, - FailureMechanismType.Piping, new[] - { - profile - }); - var transformer = new PipingStochasticSoilModelTransformer(); // Call @@ -325,9 +321,7 @@ public void Transform_ValidStochasticSoilModelWithSameProfileProbabilityExceedingValidRange_ThrowsImportedDataException(ISoilProfile profile) { // Setup - const string soilModelName = "name"; - - StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(soilModelName, FailureMechanismType.Piping, new[] + StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, new[] { new StochasticSoilProfile(0.9, profile), new StochasticSoilProfile(0.9, profile) @@ -351,7 +345,6 @@ // Setup var random = new Random(21); - const string soilModelName = "name"; const string soilProfileName = "SoilProfile"; const double intersectionX = 1.0; @@ -371,7 +364,7 @@ var stochasticSoilProfile1D = new StochasticSoilProfile(random.NextDouble(), soilProfile1D); var transformer = new PipingStochasticSoilModelTransformer(); - StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(soilModelName, FailureMechanismType.Piping, new[] + StochasticSoilModel soilModel = StochasticSoilModelTestFactory.CreateStochasticSoilModelWithGeometry(FailureMechanismType.Piping, new[] { stochasticSoilProfile2D, stochasticSoilProfile1D