Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs =================================================================== diff -u -r035ae373244436236249855ead56f3563013babe -r7c55ff5dff0bc4e425e855189c91ee65ac954bfe --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs (.../PipingCalculationValidationHelperTest.cs) (revision 035ae373244436236249855ead56f3563013babe) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs (.../PipingCalculationValidationHelperTest.cs) (revision 7c55ff5dff0bc4e425e855189c91ee65ac954bfe) @@ -502,54 +502,6 @@ } [Test] - public void GetValidationErrors_SaturatedCoverageLayerVolumicWeightLessThanWaterVolumicWeight_ReturnsMessage() - { - // Setup - var coverageLayerInvalidSaturatedVolumicWeight = new PipingSoilLayer(testSurfaceLineTopLevel) - { - IsAquifer = false, - BelowPhreaticLevel = new LogNormalDistribution - { - Mean = (RoundedDouble) 9.81, - StandardDeviation = (RoundedDouble) 2, - Shift = (RoundedDouble) 0 - } - }; - var validLayer = new PipingSoilLayer(5.0) - { - IsAquifer = true, - Permeability = new VariationCoefficientLogNormalDistribution - { - Mean = (RoundedDouble) 1, - CoefficientOfVariation = (RoundedDouble) 0.5 - }, - DiameterD70 = new VariationCoefficientLogNormalDistribution - { - Mean = (RoundedDouble) 0.0002, - CoefficientOfVariation = (RoundedDouble) 0 - } - }; - var profile = new PipingSoilProfile(string.Empty, 0.0, - new[] - { - coverageLayerInvalidSaturatedVolumicWeight, - validLayer - }, - SoilProfileType.SoilProfile1D); - - calculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); - - // Call - IEnumerable messages = PipingCalculationValidationHelper.GetValidationErrors(calculation.InputParameters); - - // Assert - Assert.AreEqual(1, messages.Count()); - Assert.AreEqual( - "Het verzadigd volumetrisch gewicht van de deklaag moet groter zijn dan het volumetrisch gewicht van water.", - messages.ElementAt(0)); - } - - [Test] public void GetValidationErrors_SaturatedCoverageLayerLessThanWaterLayerAndMissingSaturatedParameter_ReturnsMessage() { // Setup Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs =================================================================== diff -u -re7ac79ea00596a0e708be9bf2db46f9354e9f1e7 -r7c55ff5dff0bc4e425e855189c91ee65ac954bfe --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision e7ac79ea00596a0e708be9bf2db46f9354e9f1e7) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 7c55ff5dff0bc4e425e855189c91ee65ac954bfe) @@ -774,72 +774,6 @@ } [Test] - public void Validate_SaturatedCoverageLayerVolumicWeightLessThanWaterVolumicWeight_LogsMessageAndReturnsFalse() - { - // Setup - var failureMechanism = new PipingFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); - mocks.ReplayAll(); - - var coverageLayerInvalidSaturatedVolumicWeight = new PipingSoilLayer(testSurfaceLineTopLevel) - { - IsAquifer = false, - BelowPhreaticLevel = new LogNormalDistribution - { - Mean = (RoundedDouble) 9.81, - StandardDeviation = (RoundedDouble) 2, - Shift = (RoundedDouble) 0 - } - }; - var validLayer = new PipingSoilLayer(5.0) - { - IsAquifer = true, - Permeability = new VariationCoefficientLogNormalDistribution - { - Mean = (RoundedDouble) 1, - CoefficientOfVariation = (RoundedDouble) 0.5 - }, - DiameterD70 = new VariationCoefficientLogNormalDistribution - { - Mean = (RoundedDouble) 0.0002, - CoefficientOfVariation = (RoundedDouble) 0 - } - }; - var profile = new PipingSoilProfile(string.Empty, 0.0, - new[] - { - coverageLayerInvalidSaturatedVolumicWeight, - validLayer - }, - SoilProfileType.SoilProfile1D); - - calculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); - - var isValid = false; - - // Call - void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation, assessmentSection); - - // Assert - TestHelper.AssertLogMessages(Call, messages => - { - string[] msgs = messages.ToArray(); - Assert.AreEqual(3, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]); - Assert.AreEqual( - "Het verzadigd volumetrisch gewicht van de deklaag moet groter zijn dan het volumetrisch gewicht van water.", - msgs[1]); - CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); - }); - - Assert.IsFalse(isValid); - mocks.VerifyAll(); - } - - [Test] public void Validate_SaturatedCoverageLayerLessThanWaterLayerAndMissingSaturatedParameter_LogsMessageOnlyForIncompleteDefinition() { // Setup