Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs =================================================================== diff -u -r91458a263d42489cb2033e0bf56372e38a427b27 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision 91458a263d42489cb2033e0bf56372e38a427b27) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -28,7 +28,6 @@ using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.KernelWrapper.SubCalculator; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator; using Ringtoets.Piping.Primitives; @@ -613,7 +612,7 @@ // Setup var input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); var derivedInput = new DerivedPipingInput(input); - input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new [] + input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[] { new PipingSoilLayer(1.0) { @@ -629,13 +628,14 @@ Assert.IsNaN(result.Shift); Assert.IsNaN(result.StandardDeviation); } + [Test] public void SaturatedVolumicWeightOfCoverageLayer_NoAquiferLayers_ReturnsNaNForParameters() { // Setup var input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); var derivedInput = new DerivedPipingInput(input); - input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new [] + input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[] { new PipingSoilLayer(1.0) { @@ -658,7 +658,7 @@ // Setup var input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); var derivedInput = new DerivedPipingInput(input); - input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new [] + input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[] { new PipingSoilLayer(2.0) { @@ -700,7 +700,7 @@ new PipingSoilLayer(0.5) { IsAquifer = true - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call @@ -740,14 +740,14 @@ new PipingSoilLayer(-1.5) { IsAquifer = true - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call var result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; // Assert - Assert.AreEqual((belowPhreaticLevelMeanA * 2.5 + belowPhreaticLevelMeanB * 1.0) / 3.5, result.Mean, result.Mean.GetAccuracy()); + Assert.AreEqual((belowPhreaticLevelMeanA*2.5 + belowPhreaticLevelMeanB*1.0)/3.5, result.Mean, result.Mean.GetAccuracy()); Assert.AreEqual(shift, result.Shift, result.Shift.GetAccuracy()); Assert.AreEqual(deviation, result.StandardDeviation, result.StandardDeviation.GetAccuracy()); } @@ -788,7 +788,7 @@ new PipingSoilLayer(-1.5) { IsAquifer = true - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call @@ -825,18 +825,18 @@ new PipingSoilLayer(-1.5) { IsAquifer = true - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call var result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; // Assert - Assert.AreEqual((belowPhreaticLevelMeanA * 2.5 + belowPhreaticLevelMeanB * 1.0) / 3.5, result.Mean, result.Mean.GetAccuracy()); + Assert.AreEqual((belowPhreaticLevelMeanA*2.5 + belowPhreaticLevelMeanB*1.0)/3.5, result.Mean, result.Mean.GetAccuracy()); Assert.AreEqual((RoundedDouble) 1.01, result.Shift); - Assert.AreEqual((RoundedDouble)1.01, result.StandardDeviation); + Assert.AreEqual((RoundedDouble) 1.01, result.StandardDeviation); } - + [Test] public void SaturatedVolumicWeightOfCoverageLayer_OneLayerWithIncorrectShiftMeanCombination_ReturnsNaNValues() { @@ -849,12 +849,12 @@ { BelowPhreaticLevelDeviation = 2.5, BelowPhreaticLevelShift = 1.01, - BelowPhreaticLevelMean = 1.00 + BelowPhreaticLevelMean = 1.00 }, new PipingSoilLayer(-1.5) { IsAquifer = true - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call @@ -878,18 +878,18 @@ { BelowPhreaticLevelDeviation = 3.5, BelowPhreaticLevelShift = 0.5, - BelowPhreaticLevelMean = 1.00 + BelowPhreaticLevelMean = 1.00 }, new PipingSoilLayer(-0.5) { BelowPhreaticLevelDeviation = 2.5, BelowPhreaticLevelShift = 1.01, - BelowPhreaticLevelMean = 1.00 + BelowPhreaticLevelMean = 1.00 }, new PipingSoilLayer(-1.5) { IsAquifer = true - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Exceptions/RingtoetsPipingSurfaceLineExceptionTest.cs =================================================================== diff -u -rc7c07db38829afdc5965c331844e1d39123944ff -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Exceptions/RingtoetsPipingSurfaceLineExceptionTest.cs (.../RingtoetsPipingSurfaceLineExceptionTest.cs) (revision c7c07db38829afdc5965c331844e1d39123944ff) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Exceptions/RingtoetsPipingSurfaceLineExceptionTest.cs (.../RingtoetsPipingSurfaceLineExceptionTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -88,4 +88,4 @@ Assert.IsNull(exception.TargetSite); } } -} \ No newline at end of file +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/NormDependentFactorCollectionTest.cs =================================================================== diff -u -r7cdb9b163cf993d91a002ed13d17da295a910c6e -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/NormDependentFactorCollectionTest.cs (.../NormDependentFactorCollectionTest.cs) (revision 7cdb9b163cf993d91a002ed13d17da295a910c6e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/NormDependentFactorCollectionTest.cs (.../NormDependentFactorCollectionTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -44,7 +44,7 @@ public void Constructor_WithTooFewPoints_ThrowArgumentException(int pointCount) { // Setup - Tuple[] points = Enumerable.Repeat(Tuple.Create(1,0.2), pointCount).ToArray(); + Tuple[] points = Enumerable.Repeat(Tuple.Create(1, 0.2), pointCount).ToArray(); // Call TestDelegate test = () => new NormDependentFactorCollection(points); @@ -61,7 +61,8 @@ public void GetFactorFromNorm_NormOutsideRange_ThrowArgumentOutOfRangeException(int norm) { // Setup - Tuple[] points = { + Tuple[] points = + { Tuple.Create(1, 0.2), Tuple.Create(30, 0.5) }; @@ -84,9 +85,10 @@ public void GetFactorFromNorm_NormInsideRange_ReturnsInterpolatedValue(int norm, double expectedValue) { // Setup - Tuple[] points = { + Tuple[] points = + { Tuple.Create(1, 0.2), - Tuple.Create(30, 0.5), + Tuple.Create(30, 0.5), Tuple.Create(50, 0.6) }; var collection = new NormDependentFactorCollection(points); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -22,7 +22,6 @@ using System; using Core.Common.Base.Data; using Core.Common.Base.Storage; - using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Piping.KernelWrapper.TestUtil; @@ -85,7 +84,7 @@ public void Probability_PipingOutputSet_ReturnsPipingOutputProbability() { // Setup - var expectedProbability = 1.0 / 49862180; + var expectedProbability = 1.0/49862180; var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs =================================================================== diff -u -rbe9428984d28fcbd8f6089f1c1184cd9763c18bf -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision be9428984d28fcbd8f6089f1c1184cd9763c18bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -41,34 +41,37 @@ var contribution1 = 0.2; var contribution2 = 0.8; - var probability1 = 1.0 / 1000000.0; - var probability2 = 1.0 / 2000000.0; + var probability1 = 1.0/1000000.0; + var probability2 = 1.0/2000000.0; var pipingCalculationScenario1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability1, section); var pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability2, section); var pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.0, section); var pipingCalculationScenario4 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); pipingCalculationScenario1.IsRelevant = true; - pipingCalculationScenario1.Contribution = (RoundedDouble)contribution1; + pipingCalculationScenario1.Contribution = (RoundedDouble) contribution1; pipingCalculationScenario2.IsRelevant = true; - pipingCalculationScenario2.Contribution = (RoundedDouble)contribution2; + pipingCalculationScenario2.Contribution = (RoundedDouble) contribution2; pipingCalculationScenario3.IsRelevant = false; pipingCalculationScenario4.IsRelevant = true; var calculations = new[] { - pipingCalculationScenario1, pipingCalculationScenario2, pipingCalculationScenario3, pipingCalculationScenario4 + pipingCalculationScenario1, + pipingCalculationScenario2, + pipingCalculationScenario3, + pipingCalculationScenario4 }; // Call double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(calculations); // Assert - double expectedProbability = probability1 * contribution1 + probability2 * contribution2; + double expectedProbability = probability1*contribution1 + probability2*contribution2; Assert.AreEqual(expectedProbability, assessmentLayerTwoA, 1e-8); } @@ -80,10 +83,13 @@ var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); - pipingCalculationScenario.Contribution = (RoundedDouble)1.0; + pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; // Call - double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] { pipingCalculationScenario }); + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] + { + pipingCalculationScenario + }); // Assert Assert.IsNaN(assessmentLayerTwoA); @@ -113,7 +119,11 @@ var calculationScenarioMock = PipingCalculationScenarioFactory.CreateIrreleveantPipingCalculationScenario(section); var calculationScenarioMock2 = PipingCalculationScenarioFactory.CreateIrreleveantPipingCalculationScenario(section); - var calculationScenarios = new[] { calculationScenarioMock, calculationScenarioMock2 }; + var calculationScenarios = new[] + { + calculationScenarioMock, + calculationScenarioMock2 + }; // Call double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(calculationScenarios); @@ -132,7 +142,10 @@ var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); // Call - double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] { pipingCalculationScenario }); + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] + { + pipingCalculationScenario + }); // Assert Assert.IsNaN(assessmentLayerTwoA); @@ -146,20 +159,25 @@ var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); - pipingCalculationScenario.Contribution = (RoundedDouble)0.3; + pipingCalculationScenario.Contribution = (RoundedDouble) 0.3; var pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); - pipingCalculationScenario2.Contribution = (RoundedDouble)0.5; + pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5; var pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreateIrreleveantPipingCalculationScenario(section); - var calculationScenarios = new[] { pipingCalculationScenario, pipingCalculationScenario2, pipingCalculationScenario3 }; + var calculationScenarios = new[] + { + pipingCalculationScenario, + pipingCalculationScenario2, + pipingCalculationScenario3 + }; // Call RoundedDouble totalContribution = failureMechanismSectionResult.GetTotalContribution(calculationScenarios); // Assert - Assert.AreEqual((RoundedDouble)0.8, totalContribution); + Assert.AreEqual((RoundedDouble) 0.8, totalContribution); } [Test] @@ -172,7 +190,10 @@ var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] { pipingCalculationScenario }); + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario + }); // Assert Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); @@ -186,10 +207,13 @@ var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); - pipingCalculationScenario.Contribution = (RoundedDouble)1.0; + pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] { pipingCalculationScenario }); + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario + }); // Assert Assert.AreEqual(CalculationScenarioStatus.Failed, status); @@ -206,9 +230,13 @@ pipingCalculationScenario.IsRelevant = true; var pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); - pipingCalculationScenario2.Contribution = (RoundedDouble)1.0; + pipingCalculationScenario2.Contribution = (RoundedDouble) 1.0; - var calculationScenarios = new[] { pipingCalculationScenario, pipingCalculationScenario2 }; + var calculationScenarios = new[] + { + pipingCalculationScenario, + pipingCalculationScenario2 + }; // Call CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(calculationScenarios); @@ -225,10 +253,13 @@ var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); var pipingCalculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.1, section); - pipingCalculationScenario.Contribution = (RoundedDouble)1.0; + pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] { pipingCalculationScenario }); + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario + }); // Assert Assert.AreEqual(CalculationScenarioStatus.Done, status); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -23,7 +23,6 @@ using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Base.Storage; - using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -32,7 +32,6 @@ using Ringtoets.Piping.Data.Properties; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.KernelWrapper.SubCalculator; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator; using Ringtoets.Piping.Primitives; @@ -156,7 +155,7 @@ }; // Call - TestDelegate call = () => pipingInput.ExitPointL = (RoundedDouble)value; + TestDelegate call = () => pipingInput.ExitPointL = (RoundedDouble) value; // Assert var expectedMessage = Resources.PipingInput_EntryPointL_greater_or_equal_to_ExitPointL; @@ -208,7 +207,7 @@ // Setup PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.EntryPointL = (RoundedDouble) double.NaN; - + int originalNumberOfDecimalPlaces = input.ExitPointL.NumberOfDecimalPlaces; // Call @@ -227,11 +226,11 @@ // Setup PipingInput pipingInput = new PipingInput(new GeneralPipingInput()) { - ExitPointL = (RoundedDouble)3.5 + ExitPointL = (RoundedDouble) 3.5 }; // Call - TestDelegate call = () => pipingInput.EntryPointL = (RoundedDouble)value; + TestDelegate call = () => pipingInput.EntryPointL = (RoundedDouble) value; // Assert var expectedMessage = Resources.PipingInput_EntryPointL_greater_or_equal_to_ExitPointL; @@ -245,16 +244,16 @@ [TestCase(-5.4)] public void EntryPointL_EntryPointNotOnSurfaceLine_ThrowsArgumentOutOfRangeException(double value) { - // Setup + // Setup PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.ExitPointL = (RoundedDouble) double.NaN; // Call - TestDelegate call = () => input.EntryPointL = (RoundedDouble)value; + TestDelegate call = () => input.EntryPointL = (RoundedDouble) value; // Assert const string expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0, 1])."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); - } + } [Test] [TestCase(double.NaN)] @@ -266,7 +265,7 @@ { // Setup PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); - input.ExitPointL = (RoundedDouble)double.NaN; + input.ExitPointL = (RoundedDouble) double.NaN; int originalNumberOfDecimalPlaces = input.EntryPointL.NumberOfDecimalPlaces; @@ -750,7 +749,7 @@ Assert.AreEqual(0.5, seepageLength.Mean.Value); Assert.AreEqual(0.05, seepageLength.StandardDeviation.Value); } - + [Test] public void SeepageLength_EntryPointNaN_SeepageLengthNaN() { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs =================================================================== diff -u -r8293556a04e3650c9978df7a50f8f8ad0d792ed8 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs (.../PipingOutputTest.cs) (revision 8293556a04e3650c9978df7a50f8f8ad0d792ed8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs (.../PipingOutputTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -22,7 +22,6 @@ using System; using Core.Common.Base; using Core.Common.Base.Storage; - using NUnit.Framework; using Ringtoets.Common.Data.Calculation; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs (.../PipingSemiProbabilisticOutputTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs (.../PipingSemiProbabilisticOutputTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -20,10 +20,8 @@ // All rights reserved. using System; - using Core.Common.Base.Storage; using Core.Common.TestUtil; - using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; @@ -132,9 +130,9 @@ [Test] [TestCase(double.PositiveInfinity)] [TestCase(double.NegativeInfinity)] - [TestCase(0.0-1e-6)] + [TestCase(0.0 - 1e-6)] [TestCase(-346587.456)] - [TestCase(1.0+1e-6)] + [TestCase(1.0 + 1e-6)] [TestCase(346587.456)] public void RequiredProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double requiredProbability) { @@ -155,19 +153,19 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); + upliftFactorOfSafety, + upliftProbability, + heaveFactorOfSafety, + heaveReliability, + heaveProbability, + sellmeijerFactorOfSafety, + sellmeijerReliability, + sellmeijerProbability, + requiredProbability, + requiredReliability, + pipingProbability, + pipingReliability, + pipingFactorOfSafety); // Assert const string expectedMessage = "Kans moet in het bereik [0, 1] opgegeven worden."; @@ -242,19 +240,19 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); + upliftFactorOfSafety, + upliftProbability, + heaveFactorOfSafety, + heaveReliability, + heaveProbability, + sellmeijerFactorOfSafety, + sellmeijerReliability, + sellmeijerProbability, + requiredProbability, + requiredReliability, + pipingProbability, + pipingReliability, + pipingFactorOfSafety); // Assert const string expectedMessage = "Kans moet in het bereik [0, 1] opgegeven worden."; @@ -329,19 +327,19 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); + upliftFactorOfSafety, + upliftProbability, + heaveFactorOfSafety, + heaveReliability, + heaveProbability, + sellmeijerFactorOfSafety, + sellmeijerReliability, + sellmeijerProbability, + requiredProbability, + requiredReliability, + pipingProbability, + pipingReliability, + pipingFactorOfSafety); // Assert const string expectedMessage = "Kans moet in het bereik [0, 1] opgegeven worden."; @@ -416,19 +414,19 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); + upliftFactorOfSafety, + upliftProbability, + heaveFactorOfSafety, + heaveReliability, + heaveProbability, + sellmeijerFactorOfSafety, + sellmeijerReliability, + sellmeijerProbability, + requiredProbability, + requiredReliability, + pipingProbability, + pipingReliability, + pipingFactorOfSafety); // Assert const string expectedMessage = "Kans moet in het bereik [0, 1] opgegeven worden."; @@ -503,19 +501,19 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); + upliftFactorOfSafety, + upliftProbability, + heaveFactorOfSafety, + heaveReliability, + heaveProbability, + sellmeijerFactorOfSafety, + sellmeijerReliability, + sellmeijerProbability, + requiredProbability, + requiredReliability, + pipingProbability, + pipingReliability, + pipingFactorOfSafety); // Assert const string expectedMessage = "Kans moet in het bereik [0, 1] opgegeven worden."; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilLayerTest.cs =================================================================== diff -u -r2363244674e6b7b97bead9a6855806420d368d80 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision 2363244674e6b7b97bead9a6855806420d368d80) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -54,7 +54,6 @@ Assert.IsNaN(layer.PermeabilityMean); Assert.IsNaN(layer.PermeabilityDeviation); - } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileExtensionsTest.cs =================================================================== diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -ra7ba75d934df79407c6fa412f904289034bc0262 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileExtensionsTest.cs (.../PipingSoilProfileExtensionsTest.cs) (revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileExtensionsTest.cs (.../PipingSoilProfileExtensionsTest.cs) (revision a7ba75d934df79407c6fa412f904289034bc0262) @@ -29,21 +29,24 @@ [TestFixture] public class PipingSoilProfileExtensionsTest { - private readonly PipingSoilLayer[] testCaseOneAquiferLayer = { + private readonly PipingSoilLayer[] testCaseOneAquiferLayer = + { new PipingSoilLayer(2.1) { IsAquifer = true } }; - private readonly PipingSoilLayer[] testCaseOneAquitardLayer = { + private readonly PipingSoilLayer[] testCaseOneAquitardLayer = + { new PipingSoilLayer(2.1) { IsAquifer = false } }; - private readonly PipingSoilLayer[] testCaseOneCoverageLayer = { + private readonly PipingSoilLayer[] testCaseOneCoverageLayer = + { new PipingSoilLayer(2.1) { IsAquifer = false @@ -54,7 +57,8 @@ } }; - private readonly PipingSoilLayer[] testCaseTwoAquitardLayers = { + private readonly PipingSoilLayer[] testCaseTwoAquitardLayers = + { new PipingSoilLayer(2.1) { IsAquifer = false @@ -65,7 +69,8 @@ } }; - private readonly PipingSoilLayer[] testCaseTwoAquiferLayers = { + private readonly PipingSoilLayer[] testCaseTwoAquiferLayers = + { new PipingSoilLayer(2.1) { IsAquifer = true @@ -76,7 +81,8 @@ } }; - private readonly PipingSoilLayer[] testCaseTwoCoverageLayers = { + private readonly PipingSoilLayer[] testCaseTwoCoverageLayers = + { new PipingSoilLayer(2.1) { IsAquifer = false @@ -91,7 +97,8 @@ } }; - private readonly PipingSoilLayer[] testCaseOneAquiferLayerOneAquitardLayer = { + private readonly PipingSoilLayer[] testCaseOneAquiferLayerOneAquitardLayer = + { new PipingSoilLayer(2.1) { IsAquifer = true @@ -102,7 +109,8 @@ } }; - private readonly PipingSoilLayer[] testCaseOneAquitardLayerOneAquiferLayer = { + private readonly PipingSoilLayer[] testCaseOneAquitardLayerOneAquiferLayer = + { new PipingSoilLayer(2.1) { IsAquifer = false @@ -113,7 +121,8 @@ } }; - private readonly PipingSoilLayer[] testCaseTwoAquiferLayersOneAquitardLayerOneAquiferLayer = { + private readonly PipingSoilLayer[] testCaseTwoAquiferLayersOneAquitardLayerOneAquiferLayer = + { new PipingSoilLayer(2.1) { IsAquifer = true @@ -132,7 +141,8 @@ } }; - private readonly PipingSoilLayer[] testCaseTwoCoverageLayersOneAquiferLayerOneAquitardLayer = { + private readonly PipingSoilLayer[] testCaseTwoCoverageLayersOneAquiferLayerOneAquitardLayer = + { new PipingSoilLayer(2.1) { IsAquifer = false @@ -151,6 +161,11 @@ } }; + private PipingSoilProfile CreateTestProfile(PipingSoilLayer[] layers) + { + return new PipingSoilProfile(string.Empty, 0.0, layers, SoilProfileType.SoilProfile1D, 0); + } + #region GetTopmostConsecutiveAquiferLayerThicknessBelowLevel [Test] @@ -362,7 +377,10 @@ IEnumerable result = profile.GetConsecutiveAquiferLayersBelowLevel(2.2); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(0) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(0) + }, result); } [Test] @@ -375,7 +393,10 @@ IEnumerable result = profile.GetConsecutiveAquiferLayersBelowLevel(1.6); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(0) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(0) + }, result); } [Test] @@ -388,7 +409,10 @@ IEnumerable result = profile.GetConsecutiveAquiferLayersBelowLevel(2.1); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(0) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(0) + }, result); } [Test] @@ -453,9 +477,12 @@ IEnumerable result = profile.GetConsecutiveAquiferLayersBelowLevel(0.5); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(1) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(1) + }, result); } - + [Test] public void GetConsecutiveAquiferLayersBelowLevel_BottomAquiferLayerTopEqualToLevel_ReturnCollectionWithBottomAquiferLayer() { @@ -466,7 +493,10 @@ IEnumerable result = profile.GetConsecutiveAquiferLayersBelowLevel(1.1); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(1) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(1) + }, result); } [Test] @@ -639,7 +669,10 @@ IEnumerable result = profile.GetConsecutiveCoverageLayersBelowLevel(0.5); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(1) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(1) + }, result); } [Test] @@ -652,7 +685,10 @@ IEnumerable result = profile.GetConsecutiveCoverageLayersBelowLevel(1.1); // Assert - CollectionAssert.AreEqual(new[] { profile.Layers.ElementAt(1) }, result); + CollectionAssert.AreEqual(new[] + { + profile.Layers.ElementAt(1) + }, result); } [Test] @@ -698,10 +734,5 @@ } #endregion - - private PipingSoilProfile CreateTestProfile(PipingSoilLayer[] layers) - { - return new PipingSoilProfile(string.Empty, 0.0, layers, SoilProfileType.SoilProfile1D, 0); - } } } \ No newline at end of file