Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs =================================================================== diff -u -r86320df646dfe8564940e686a98d6199b9c3b470 -rec201316303aa676976655dcdfd9285dcc3ec4f1 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs (.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs) (revision 86320df646dfe8564940e686a98d6199b9c3b470) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs (.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs) (revision ec201316303aa676976655dcdfd9285dcc3ec4f1) @@ -93,7 +93,7 @@ { new StochasticSoilProfile(1, new SoilProfile1D(2, "test", 3, new[] { - SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming(top) + SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer(top) })) } }; @@ -132,7 +132,7 @@ { new StochasticSoilProfile(1, new SoilProfile2D(2, "test", new[] { - SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming() + SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer() })) } }; @@ -174,7 +174,7 @@ public void Transform_TwoStochasticSoilModelsWithSameProfile_ReturnExpectedMacroStabilityInwardsStochasticSoilModel() { // Setup - SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming(); + SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer(); var profile = new SoilProfile2D(2, "test", new[] { layer @@ -221,7 +221,7 @@ const string soilProfileName = "SoilProfile"; const double intersectionX = 1.0; - SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming(); + SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer(); var profile = new SoilProfile2D(0, soilProfileName, new[] { layer @@ -279,19 +279,16 @@ }; var transformer = new MacroStabilityInwardsStochasticSoilModelTransformer(); - MacroStabilityInwardsStochasticSoilModel transformed = null; // Call - TestDelegate call = () => transformed = transformer.Transform(soilModel); + TestDelegate call = () => transformer.Transform(soilModel); // Assert var exception = Assert.Throws(call); const string expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel " + "moet in het bereik [0,0, 1,0] liggen."; Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsNull(transformed); - mocks.VerifyAll(); } @@ -305,7 +302,7 @@ var soilProfile2D = new SoilProfile2D(0, soilProfileName, new[] { - SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming() + SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer() }) { IntersectionX = intersectionX @@ -314,7 +311,7 @@ var soilProfile1D = new SoilProfile1D(0, soilProfileName, 0, new[] { - SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming() + SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer() }); var stochasticSoilProfile1D = new StochasticSoilProfile(0.7, soilProfile1D);